Ignore bogus ipmi_temp warnings on G6 machines

[chef.git] / cookbooks / munin / templates / default / munin.conf.erb

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 9bceccd257a6960576e1ea7e6e6833e6f8143864..71484c237f5208e4a45b0670dcf851877ebe8787 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -1,5 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+# Set maximum number of update processes to run at once
+max_processes 64
+
+# Use rrdcached
+rrdcached_socket /var/run/rrdcached.sock
+
 # Configure alert targets
 contact.admins.command mail -s "Munin Notification" admins@openstreetmap.org
 contact.null.command cat > /dev/null
@@ -17,10 +23,10 @@ unknown_limit 144
     update no
 <% end -%>
 <% if client[:networking][:roles][:external][:zone] == "ucl" -%>
-    address <%= client.internal_ipaddress %>
+    address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "ic" -%>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
-<% else -%>
+<% elsif client.external_ipaddress -%>
     address <%= client.external_ipaddress %>
 <% end -%>
     use_node_name yes
@@ -31,6 +37,9 @@ unknown_limit 144
 <% if client[:munin][:plugins][plugin][value][:graph] -%>
     <%= plugin %>.<%= value %>.graph <%= client[:munin][:plugins][plugin][value][:graph] %>
 <% end -%>
+<% if client[:munin][:plugins][plugin][value][:label] -%>
+    <%= plugin %>.<%= value %>.label <%= client[:munin][:plugins][plugin][value][:label] %>
+<% end -%>
 <% if client[:munin][:plugins][plugin][value][:warning] -%>
     <%= plugin %>.<%= value %>.warning <%= client[:munin][:plugins][plugin][value][:warning] %>
 <% end -%>