projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add {deb,security}.d.o aliases to local-mirror.cdbuilder
[mirror/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
519e033
..
e335a00
100644
(file)
--- a/
modules/munin/templates/munin.conf.erb
+++ b/
modules/munin/templates/munin.conf.erb
@@
-3,26
+3,14
@@
### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
-includedir /etc/munin/munin-conf.d
-
-<% if hostname != "menotti" -%>
+# number of updaters to run
+max_processes 96
+rrdcached_socket /var/run/munin/rrdcached.sock/sock
-dbdir /var/lib/munin
-htmldir /var/cache/munin/www
-logdir /var/log/munin
-rundir /var/run/munin
-tmpldir /etc/munin/templates
+#html_strategy cgi
graph_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 1
-'
- end
- end
-out
-%>
-<% end -%>
+includedir /etc/munin/munin-conf.d