X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=872ac55c8cc27684930dc7be34989ddada8d3736;hb=3dbdf2dd24fbb7748a3a192411944ad65b002056;hp=73ffb46213fcc65116df46ad33c10a2256daddd6;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;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 73ffb4621..872ac55c8 100644
--- a/modules/munin/templates/munin-node.plugin.conf.erb
+++ b/modules/munin/templates/munin-node.plugin.conf.erb
@@ -19,7 +19,7 @@ group adm, maillog
 user root
 <%=
 out = ""
-if has_variable?("mta") and mta == "exim4"
+if has_variable?("mta") and @mta == "exim4"
   out="
 [exim_mail*]
 user Debian-exim
@@ -27,16 +27,10 @@ group maillog"
 end
 out
 %>
-<%=
-out = ""
-if has_variable?("vsftpd") and vsftpd == "true"
-  out="
+
 [vsftpd]
 user root
-"
-end
-out
-%>
+
 [fw_conntrack]
 user root
 
@@ -69,7 +63,7 @@ env.critical 98
 
 <%=
 out = ""
-if has_variable?("mta") and mta == "postfix"
+if has_variable?("mta") and @mta == "postfix"
   out="
 [postfix_mailqueue]
 user postfix
@@ -96,7 +90,7 @@ group maillog
 [bind*]
 group bind
 <%=
-out = case hostname
+out = case @hostname
   when "geo1","geo2","geo3" then "env.logfile /var/log/bind9/geoip-query.log"
   else "env.logfile /var/log/bind9/named-query.log"
 end
@@ -106,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 %>