X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin.conf.erb;h=e335a00f37d6ac4b9dba1684d5d678d2938d2228;hb=55a5ada6ff6905445fc40420941dd6065a9a0338;hp=35e4bf0d46b2024410d6c963ea426dcf96795c1d;hpb=08e9fd22853f958806191b8d6adc456aef35ea46;p=mirror%2Fdsa-puppet.git

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