Reduce munin-html fork count more

[dsa-puppet.git] / modules / munin / templates / munin.conf.erb

diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index b223bd650cca9f7e89b8033ad4bbe6414a505ca9..a71ec036ff69fa345758fc557f38c96ede61a44a 100644 (file)
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,21 +3,14 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-dbdir   /var/lib/munin
-htmldir /var/cache/munin/www
-logdir  /var/log/munin
-rundir  /var/run/munin
-tmpldir /etc/munin/templates
+# number of updaters to run
+max_processes 96
+rrdcached_socket /var/run/munin/rrdcached.sock/sock
+
+#html_strategy cgi
 graph_strategy cgi
 
-<%= out = ''
-    scope.lookupvar('site::localinfo').keys.sort.each do |node|
-       if not scope.lookupvar('site::localinfo')[node]['no_munin']
-          out += '[' + node + ']
-    address ' + node + '
+# Reduce memory usage spikes and OOM mails
+max_html_jobs 2
 
-'
-       end 
-    end
-out
-%>
+includedir /etc/munin/munin-conf.d