From: Stephen Gran <steve@lobefin.net>
Date: Sat, 17 Oct 2009 15:51:26 +0000 (+0100)
Subject: add some ps_ munin plugins
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c01cdbd4c5c3500f6a3427d6649d9755f79c574f;p=mirror%2Fdsa-puppet.git

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 f554c1604..df0171e84 100644
--- 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 699f4cf7a..034e821df 100644
--- 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"];
             }
         }