X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=73ffb46213fcc65116df46ad33c10a2256daddd6;hb=a24bed77913f23c0550f6f5d8287cb6c8ba9f4ed;hp=fd3acbe78ba2e411383e836b4f5a9cc8ca6b253e;hpb=dd8b8c3fc5dff5da6bf0f42c2440c0375889d30e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb
index fd3acbe78..73ffb4621 100644
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -55,10 +55,18 @@ user nobody
 [ip_*]
 user root
 
+[ip6_*]
+user root
+
 [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 = ""
 if has_variable?("mta") and mta == "postfix"
@@ -94,3 +102,7 @@ out = case hostname
 end
 out
 %>
+
+# filter out all the short-lived sbuild/schroot filesystems for diskstats:
+[diskstats]
+env.exclude sbuild,schroot