X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=ae8da95b0fc92fc3855403b740b2c3a4f77dbdf4;hb=895a61068b171322d89ff074fa6ed9519dd0cede;hp=87c41decae5445a5c19ab52ba23ea6e57766906b;hpb=fb251f849e842fe0f2cd892c15132375439bb7fd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/templates/munin-node.plugin.conf.erb b/modules/munin/templates/munin-node.plugin.conf.erb
index 87c41deca..ae8da95b0 100644
--- a/modules/munin/templates/munin-node.plugin.conf.erb
+++ b/modules/munin/templates/munin-node.plugin.conf.erb
@@ -100,3 +100,13 @@ out
 # filter out all the short-lived sbuild/schroot filesystems for diskstats:
 [diskstats]
 env.exclude sbuild,schroot
+
+# filter out all the short-lived filesystems for df*:
+[df*]
+env.exclude_re ^/dev$ ^/run/.*$ ^/srv/piuparts-workspace/tmp.*$ ^/sys/.*$ ^/var/lib/schroot/mount/.*$
+
+<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%>
+# Workaround for https://bugs.debian.org/767102
+[df*]
+env.exclude devfs fdescfs linprocfs sysfs noprocfs linsysfs nfs nullfs
+<% end %>