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 dd41cd95ab8080a13f49cb70c844a230fc572be7..71484c237f5208e4a45b0670dcf851877ebe8787 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -1,5 +1,8 @@
 # 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
 
@@ -34,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 -%>