add some ps_ munin plugins

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/munin-node/manifests/apache.pp b/modules/munin-node/manifests/apache.pp
index f554c1604d2ee82ddef310728e5604fc6cd9e634..df0171e84d30fb86e69b1b6061dac8ac7308b72c 100644 (file)
--- a/modules/munin-node/manifests/apache.pp
+++ b/modules/munin-node/manifests/apache.pp
@@ -3,6 +3,7 @@ class munin-node::apache inherits munin-node {
                 "apache_accesses":;
                 "apache_processes":;
                 "apache_volume":;
+                "ps_apache2": script => "ps_";
         }
 }
 

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 699f4cf7a7891f9a8eeb189995834088804b8a30..034e821df0a1c5ce4b38e1b8d33736711ea2f1f6 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,8 +1,8 @@
-define activate_munin_check($ensure=present) {
+define activate_munin_check($ensure=present, script=$name) {
     case $ensure {
         present: {
             file { "/etc/munin/plugins/$name":
-                     ensure => "/usr/share/munin/plugins/$name",
+                     ensure => "/usr/share/munin/plugins/$script",
                      notify => Exec["munin-node restart"];
             }
         }