5 files changed, 20 insertions, 8 deletions
diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index 972a674..c6b88ed 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -5,6 +5,11 @@ class munin::plugins::base {
       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 {
@@ -17,7 +22,7 @@ class munin::plugins::base {
     }
   }
         
-  case $virtual {
+  case $::virtual {
     physical: { include munin::plugins::physical }
     xen0: { include munin::plugins::dom0 }
   }
diff --git a/manifests/plugins/gentoo.pp b/manifests/plugins/gentoo.pp
index 25c1626..27d4689 100644
--- a/manifests/plugins/gentoo.pp
+++ b/manifests/plugins/gentoo.pp
@@ -1,5 +1,5 @@
 class munin::plugins::gentoo { 
-    munin::plugin::deploy { 'gentoo_lastupdated':
-      config => "user portage\nenv.logfile /var/log/emerge.log\nenv.tail        /usr/bin/tail\nenv.grep        /bin/grep"
-    }
+  munin::plugin::deploy { 'gentoo_lastupdated':
+    config => "user portage\nenv.logfile /var/log/emerge.log\nenv.tail        /usr/bin/tail\nenv.grep        /bin/grep"
+  }
 }
diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index b2c448b..cc79259 100644
--- a/manifests/plugins/interfaces.pp
+++ b/manifests/plugins/interfaces.pp
@@ -1,19 +1,19 @@
 # handle if_ and if_err_ plugins
 class munin::plugins::interfaces  { 
 
-  $ifs = regsubst(split($interfaces, " |,"), "(.+)", "if_\\1")
+  $ifs = regsubst(split($::interfaces, " |,"), "(.+)", "if_\\1")
   munin::plugin {
     $ifs: ensure => "if_";
   }
   case $::operatingsystem {
     openbsd: {
-      $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
+      $if_errs = regsubst(split($::interfaces, " |,"), "(.+)", "if_errcoll_\\1")
       munin::plugin{
         $if_errs: ensure => "if_errcoll_";
       }
     }
     default: {
-      $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_err_\\1")
+      $if_errs = regsubst(split($::interfaces, " |,"), "(.+)", "if_err_\\1")
       munin::plugin{
         $if_errs: ensure => "if_err_";
       }
diff --git a/manifests/plugins/kvm.pp b/manifests/plugins/kvm.pp
new file mode 100644
index 0000000..7a1430f
--- /dev/null
+++ b/manifests/plugins/kvm.pp
@@ -0,0 +1,7 @@
+class munin::plugins::kvm {
+  munin::plugin::deploy {
+    [ 'kvm_cpu', 'kvm_mem', 'kvm_net' ]:;
+    'kvm_io':
+      config => 'user root';
+  }
+}
diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp
index 30e0af6..a73de63 100644
--- a/manifests/plugins/linux.pp
+++ b/manifests/plugins/linux.pp
@@ -3,6 +3,6 @@ class munin::plugins::linux {
     [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]:
       ensure => present;
     acpi:
-      ensure => $acpi_available;
+      ensure => $::acpi_available;
   }
 }