Merge branch 'immerda/master'

Conflicts:
	files/plugins/xen-cpu
	templates/munin-node.conf.Debian.squeeze

1 files changed, 7 insertions, 3 deletions

diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index bfccae5..c6b88ed 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -1,14 +1,18 @@
 class munin::plugins::base {
-
   # setup basic plugins
   munin::plugin {
     [ df, cpu, interrupts, load, memory, netstat, open_files,
       processes, swap, uptime, users, vmstat ]:
             ensure => present,
   }
+  file{'/etc/munin/plugin-conf.d/df':
+    content => "[df*]\nenv.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs binfmt_misc rpc_pipefs fuse.gvfs-fuse-daemon\n",
+    require => Munin::Plugin[df],
+    owner => root, group => 0, mode => 0644;
+  }
   include munin::plugins::interfaces
 
-  case $kernel {
+  case $::kernel {
     openbsd: { include munin::plugins::openbsd }
     linux: {
       case $vserver {
@@ -18,7 +22,7 @@ class munin::plugins::base {
     }
   }
         
-  case $virtual {
+  case $::virtual {
     physical: { include munin::plugins::physical }
     xen0: { include munin::plugins::dom0 }
   }