a few more munin plugins, although I dislike the placement of the spamassassin one

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 3ea3be675151936c0848ac89e7e29568fabdaeac..0b5f7d6757f7a1de1a3400fac0e188bd528ee382 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,6 @@
 class exim {
     activate_munin_check {
+            "ps_exim4": script => "ps_";
             "exim_mailqueue":;
             "exim_mailstats":;
             "postfix_mailqueue":  ensure => absent;

diff --git a/modules/munin-node/manifests/apache.pp b/modules/munin-node/manifests/apache.pp
index df0171e84d30fb86e69b1b6061dac8ac7308b72c..2293c512b0624584530f0b6f83e5f6875c2ea390 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":;
+                "apache_servers":;
                 "ps_apache2": script => "ps_";
         }
 }

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 4e2bec275ab7fb128531d7ec2cbc5795ff622f75..d6336c8534b1bf0ae763d581fd8c401c8acdaa8c 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -46,6 +46,12 @@ class munin-node {
         "vmstat":;
     }
 
+    case $spamd {
+        "true": {
+              activate_munin_check { "spamassassin":; }
+        }
+    }
+
     file {
         "/etc/munin/munin-node.conf":
             source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",