X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6e1a30e28068b34daa9715bd49c93b6a759feff0..0b1d3c0a4d78158641b9a15b0d93f3cf710f753c:/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 7175d6866..e79342b85 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -3,12 +3,22 @@
 # Set maximum number of update processes to run at once
 max_processes 64
 
+# Maximum number of graphs to generate at once
+max_graph_jobs 24
+max_cgi_graph_jobs 24
+
+# Render pages and graphs on demand
+html_strategy cgi
+graph_strategy cgi
+
 # Use rrdcached
 rrdcached_socket /var/run/rrdcached.sock
 
 # Configure alert targets
-contact.admins.command mail -s "Munin Notification" admins@openstreetmap.org
+contact.admins.command mail -s "Munin Notification for ${var:host}" admins@openstreetmap.org
+contact.admins.always_send invalid
 contact.null.command cat > /dev/null
+contact.null.always_send invalid
 
 # Send alerts to the admins by default
 contacts admins
@@ -37,6 +47,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 -%>