Merge remote-tracking branch 'immerda/master'

Conflicts:
	manifests/host.pp
	manifests/host/cgi.pp
	manifests/plugin.pp
	manifests/plugin/deploy.pp
	manifests/plugins/apache.pp
	manifests/plugins/base.pp
	manifests/plugins/dom0.pp
	manifests/plugins/gentoo.pp
	manifests/plugins/interfaces.pp
	manifests/plugins/linux.pp
	manifests/plugins/openbsd.pp
	manifests/plugins/physical.pp
	manifests/plugins/selinux.pp
	manifests/plugins/vserver.pp

14 files changed, 69 insertions, 94 deletions

diff --git a/manifests/plugins/apache.pp b/manifests/plugins/apache.pp
index 030e7e6..b3e7634 100644
--- a/manifests/plugins/apache.pp
+++ b/manifests/plugins/apache.pp
@@ -1,8 +1,4 @@
-class munin::plugins::apache inherits munin::plugins::base {
-
-  munin::plugin{ "apache_accesses": }
-  munin::plugin{ "apache_processes": }
-  munin::plugin{ "apache_volume": }
+class munin::plugins::apache {
+  munin::plugin{ [ 'apache_accesses', 'apache_processes',' apache_volume' ]: }
   munin::plugin::deploy { "apache_activity": }
-  
 }
diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index 64756bc..bfccae5 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -1,55 +1,25 @@
 class munin::plugins::base {
 
-  file {
-    [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
-      source => "puppet://$server/modules/common/empty",
-      ignore => [ '\.ignore', 'snmp_*' ],
-      ensure => directory, checksum => mtime,
-      recurse => true, purge => true, force => true,
-      mode => 0755, owner => root, group => 0,
-      notify => Service['munin-node'];
-
-    '/etc/munin/plugin-conf.d/munin-node':
-      ensure => present,
-      mode => 0644, owner => root, group => 0,
-      notify => Service['munin-node'],
-  }
-
+  # setup basic plugins
   munin::plugin {
     [ df, cpu, interrupts, load, memory, netstat, open_files,
-      processes, swap, uptime, vmstat ]:
-        ensure => present,
+      processes, swap, uptime, users, vmstat ]:
+            ensure => present,
   }
-  
   include munin::plugins::interfaces
 
   case $kernel {
-    openbsd: {
-      File['/etc/munin/plugin-conf.d/munin-node']{
-        before => File['/var/run/munin'],
-      }
-    }
-    default: {
-      File['/etc/munin/plugin-conf.d/munin-node']{
-        before => Package['munin-node'],
-      }
-    }
-  }
-  
-  case $kernel {
+    openbsd: { include munin::plugins::openbsd }
     linux: {
       case $vserver {
         guest: { include munin::plugins::vserver }
-        default: {
-          include munin::plugins::linux
-        }
+        default: { include munin::plugins::linux }
       }
     }
   }
-  
+        
   case $virtual {
     physical: { include munin::plugins::physical }
     xen0: { include munin::plugins::dom0 }
   }
-  
 }
diff --git a/manifests/plugins/debian.pp b/manifests/plugins/debian.pp
index 6d2faef..f756150 100644
--- a/manifests/plugins/debian.pp
+++ b/manifests/plugins/debian.pp
@@ -1,2 +1 @@
-class munin::plugins::debian inherits munin::plugins::base {
-}
+class munin::plugins::debian  { }
diff --git a/manifests/plugins/djbdns.pp b/manifests/plugins/djbdns.pp
index 37d8ed6..c0a5163 100644
--- a/manifests/plugins/djbdns.pp
+++ b/manifests/plugins/djbdns.pp
@@ -1,3 +1,3 @@
-class munin::plugins::djbdns inherits munin::plugins::base {
+class munin::plugins::djbdns { 
     munin::plugin::deploy { "tinydns": }
 }
diff --git a/manifests/plugins/dom0.pp b/manifests/plugins/dom0.pp
index 3efc6bd..ed4f62c 100644
--- a/manifests/plugins/dom0.pp
+++ b/manifests/plugins/dom0.pp
@@ -1,10 +1,7 @@
-class munin::plugins::dom0 inherits munin::plugins::physical {
-
-  munin::plugin::deploy { "xen": config => "user root"}
-  munin::plugin::deploy { "xen-cpu": config => "user root"}
-  munin::plugin::deploy { "xen_memory": config => "user root"}
-  munin::plugin::deploy { "xen_mem": config => "user root"}
-  munin::plugin::deploy { "xen_vm": config => "user root"}
-  munin::plugin::deploy { "xen_vbd": config => "user root"}
-  munin::plugin::deploy { "xen_traffic_all": config => "user root"}
+class munin::plugins::dom0 {
+  munin::plugin::deploy {
+    [ 'xen', 'xen-cpu', 'xen_memory', 'xen_mem',
+      'xen_vm', 'xen_vbd', 'xen_traffic_all' ]:
+      config => 'user root';
+  }
 }
diff --git a/manifests/plugins/gentoo.pp b/manifests/plugins/gentoo.pp
index 6d02a24..25c1626 100644
--- a/manifests/plugins/gentoo.pp
+++ b/manifests/plugins/gentoo.pp
@@ -1,5 +1,5 @@
-class munin::plugins::gentoo inherits munin::plugins::base {
-
-  munin::plugin::deploy { "gentoo_lastupdated": config => "user portage\nenv.logfile /var/log/emerge.log\nenv.tail        /usr/bin/tail\nenv.grep        /bin/grep"}
-  
+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"
+    }
 }
diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index 03ed0e7..18a713b 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 inherits munin::plugins::base {
-  
-  $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
-  
-  munin::plugin { $ifs: ensure => "if_"; }
-  
+class munin::plugins::interfaces  { 
+
+  $ifs = regsubst(split($interfaces, " |,"), "(.+)", "if_\\1")
+  munin::plugin {
+    $ifs: ensure => "if_";
+  }
   case $operatingsystem {
     openbsd: {
-      $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
+      $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
       munin::plugin{
         $if_errs: ensure => "if_errcoll_";
       }
     }
     default: {
-      $if_errs = gsub(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/linux.pp b/manifests/plugins/linux.pp
index 5c6afe9..30e0af6 100644
--- a/manifests/plugins/linux.pp
+++ b/manifests/plugins/linux.pp
@@ -1,12 +1,8 @@
-class munin::plugins::linux inherits munin::plugins::base {
-
+class munin::plugins::linux { 
   munin::plugin {
     [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]:
       ensure => present;
     acpi:
       ensure => $acpi_available;
   }
-  
-  include munin::plugins::interfaces
-  
 }
diff --git a/manifests/plugins/muninhost.pp b/manifests/plugins/muninhost.pp
index 2af4897..e4fb87d 100644
--- a/manifests/plugins/muninhost.pp
+++ b/manifests/plugins/muninhost.pp
@@ -1,4 +1,3 @@
-class munin::plugins::muninhost inherits munin::plugins::base {
-    munin::plugin { munin_update: }
-    munin::plugin { munin_graph: }
+class munin::plugins::muninhost  { 
+  munin::plugin { ['munin_update', 'munin_graph']: }
 }
diff --git a/manifests/plugins/openbsd.pp b/manifests/plugins/openbsd.pp
index feb71fb..b549994 100644
--- a/manifests/plugins/openbsd.pp
+++ b/manifests/plugins/openbsd.pp
@@ -1,9 +1,6 @@
-class munin::plugins::openbsd inherits munin::plugins::base {
-
+class munin::plugins::openbsd  { 
   munin::plugin {
-        [ df, cpu, interrupts, load, memory, netstat, open_files,
-          processes, swap, users, vmstat, memory_pools, memory_types ]:
-            ensure => present,
+    [ memory_pools, memory_types ]:
+      ensure => present,
   }
-  
 }
diff --git a/manifests/plugins/physical.pp b/manifests/plugins/physical.pp
index 1bf1465..ac050a5 100644
--- a/manifests/plugins/physical.pp
+++ b/manifests/plugins/physical.pp
@@ -1,7 +1,5 @@
-class munin::plugins::physical inherits munin::plugins::base {
-
+class munin::plugins::physical  { 
   case $kernel {
     linux: { munin::plugin { iostat: } }
   }
-  
 }
diff --git a/manifests/plugins/selinux.pp b/manifests/plugins/selinux.pp
index 847f0b9..faf610a 100644
--- a/manifests/plugins/selinux.pp
+++ b/manifests/plugins/selinux.pp
@@ -1,6 +1,3 @@
-class munin::plugins::selinux inherits munin::plugins::base {
-
-  munin::plugin::deploy { "selinuxenforced": }
-  munin::plugin::deploy { "selinux_avcstats": }
-  
+class munin::plugins::selinux {
+  munin::plugin::deploy { [ 'selinuxenforced', 'selinux_avcstats' ]: }
 }
diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
new file mode 100644
index 0000000..c2c5ed3
--- /dev/null
+++ b/manifests/plugins/setup.pp
@@ -0,0 +1,27 @@
+class munin::plugins::setup {
+  file {
+    [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
+      source => "puppet:///modules/common/empty",
+      ignore => [ '.ignore', 'snmp_*' ],
+      ensure => directory, checksum => mtime,
+      recurse => true, purge => true, force => true,
+      mode => 0755, owner => root, group => 0,
+      notify => Service['munin-node'];
+    '/etc/munin/plugin-conf.d/munin-node':
+      ensure => present,
+      mode => 0644, owner => root, group => 0,
+      notify => Service['munin-node'],
+  }
+  case $kernel {
+    openbsd: {
+      File['/etc/munin/plugin-conf.d/munin-node']{
+        before => File['/var/run/munin'],
+      }
+    }
+    default: {
+      File['/etc/munin/plugin-conf.d/munin-node']{
+        before => Package['munin-node'],
+      }
+    }
+  }
+}
diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp
index 42a9bf4..e3eec05 100644
--- a/manifests/plugins/vserver.pp
+++ b/manifests/plugins/vserver.pp
@@ -1,8 +1,7 @@
-class munin::plugins::vserver inherits munin::plugins::base {
-
-    munin::plugin {
-        [ netstat, processes ]:
-            ensure => present;
-    }
+class munin::plugins::vserver {
+  munin::plugin {
+    [ netstat, processes ]:
+      ensure => present;
+  }
 }