projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try if this makes nagios happy
[mirror/dsa-puppet.git]
/
modules
/
munin-node
/
templates
/
munin-node.plugin.conf.erb
diff --git
a/modules/munin-node/templates/munin-node.plugin.conf.erb
b/modules/munin-node/templates/munin-node.plugin.conf.erb
index
36c7eca
..
73ffb46
100644
(file)
--- a/
modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/
modules/munin-node/templates/munin-node.plugin.conf.erb
@@
-19,7
+19,7
@@
group adm, maillog
user root
<%=
out = ""
user root
<%=
out = ""
-if mta == "exim4"
+if
has_variable?("mta") and
mta == "exim4"
out="
[exim_mail*]
user Debian-exim
out="
[exim_mail*]
user Debian-exim
@@
-27,7
+27,16
@@
group maillog"
end
out
%>
end
out
%>
-
+<%=
+out = ""
+if has_variable?("vsftpd") and vsftpd == "true"
+ out="
+[vsftpd]
+user root
+"
+end
+out
+%>
[fw_conntrack]
user root
[fw_conntrack]
user root
@@
-46,13
+55,21
@@
user nobody
[ip_*]
user root
[ip_*]
user root
+[ip6_*]
+user root
+
[mysql*]
user root
env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
[mysql*]
user root
env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
+[df*]
+env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs
+env.warning 92
+env.critical 98
+
<%=
out = ""
<%=
out = ""
-if mta == "postfix"
+if
has_variable?("mta") and
mta == "postfix"
out="
[postfix_mailqueue]
user postfix
out="
[postfix_mailqueue]
user postfix
@@
-76,12
+93,16
@@
user root
[spamassassin]
group maillog
[spamassassin]
group maillog
-[bind]
+[bind*]
+group bind
<%=
out = case hostname
<%=
out = case hostname
- when "geo1","geo2","geo3" then "group bind
-env.logfile=/var/log/bind9/geoip-query.log"
- else "group adm"
+ when "geo1","geo2","geo3" then "env.logfile /var/log/bind9/geoip-query.log"
+ else "env.logfile /var/log/bind9/named-query.log"
end
out
%>
end
out
%>
+
+# filter out all the short-lived sbuild/schroot filesystems for diskstats:
+[diskstats]
+env.exclude sbuild,schroot