projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
696875f
)
Halve the number of munin-html jobs, to prevent OOM errors due to fork count.
author
Paul Wise
<pabs@debian.org>
Mon, 29 Sep 2014 04:32:28 +0000
(12:32 +0800)
committer
Paul Wise
<pabs@debian.org>
Tue, 30 Sep 2014 00:44:57 +0000
(08:44 +0800)
Should prevent mails like these:
Cron <munin@menotti> nice /usr/share/munin/munin-html
Killed
Cron <munin@menotti> nice /usr/share/munin/munin-html
fork failed: Cannot allocate memory at /usr/share/perl5/Munin/Master/HTMLOld.pm line 776.
modules/munin/templates/munin.conf.erb
patch
|
blob
|
history
diff --git
a/modules/munin/templates/munin.conf.erb
b/modules/munin/templates/munin.conf.erb
index
80d0c7e
..
21997e4
100644
(file)
--- a/
modules/munin/templates/munin.conf.erb
+++ b/
modules/munin/templates/munin.conf.erb
@@
-10,4
+10,7
@@
rrdcached_socket /var/run/munin/rrdcached.sock/sock
#html_strategy cgi
graph_strategy cgi
+# Reduce memory usage spikes and OOM mails
+max_html_jobs 3
+
includedir /etc/munin/munin-conf.d