Make munin use the node name instead of the FQDN

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 47b7fa09411f791161e770ae8b7a60b7ca95d558..063f4dbc59d24a2060b54f4b29f73063918b80fb 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -45,17 +45,17 @@ munin_plugin "rrdcached"
 
 expiry_time = 14 * 86400
 
 
 expiry_time = 14 * 86400
 

-clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } # ~FC010
-frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010
-backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010
-tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+clients = search(:node, "recipes:munin\\:\\:default").sort_by(&:name) # ~FC010
+frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort # ~FC010
+backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort # ~FC010
+tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
+  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }

 end
 end

-renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
+  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }

 end
 end

-geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
+  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }

 end
 
 template "/etc/munin/munin.conf" do
 end
 
 template "/etc/munin/munin.conf" do

diff --git a/cookbooks/munin/templates/default/munin-node.conf.erb b/cookbooks/munin/templates/default/munin-node.conf.erb
index 0ff07cb3c0f4a82051f59d6062ffe3e12977942f..8c88fd612560beb70ebf675fb11d009136bca39d 100644 (file)
--- a/cookbooks/munin/templates/default/munin-node.conf.erb
+++ b/cookbooks/munin/templates/default/munin-node.conf.erb
@@ -23,7 +23,7 @@ ignore_file \.rpm(save|new)$
 ignore_file \.pod$
 
 # Set the hostname
 ignore_file \.pod$
 
 # Set the hostname

-host_name <%= node[:hostname] -%>.openstreetmap.org
+host_name <%= node.name %>

 
 # List on port 4949 on all interfaces
 host *
 
 # List on port 4949 on all interfaces
 host *

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index dff786b7cab038dfe797031b281b1acef57434e6..322cd0fcfd7d573706a66dca45482b758c0981a3 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -25,10 +25,10 @@ contacts admins
 
 # Ignore uncontactable hosts for twelve hours
 unknown_limit 144
 
 # Ignore uncontactable hosts for twelve hours
 unknown_limit 144

-<% @clients.sort { |a,b| a[:hostname] <=> b[:hostname] }.each do |client| -%>
+<% @clients.sort { |a,b| a.name <=> b.name }.each do |client| -%>

 
 

-# Configure monitoring for <%= client[:fqdn] %>
-[<%= client[:hostname] %>.openstreetmap.org]
+# Configure monitoring for <%= client.name %>
+[<%= client.name %>]

 <% if Time.now - Time.at(client[:ohai_time]) > @expiry_time -%>
     update no
 <% end -%>
 <% if Time.now - Time.at(client[:ohai_time]) > @expiry_time -%>
     update no
 <% end -%>