munin-node stuff for apache

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8a5684cc2cb4d49225e6eb18ddd516fabde1523b..e1eaf300bb751cf379897673f8a14e56680443c8 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -3,6 +3,8 @@ define enable_module($module) {
 }
 
 class apache2 {
+        include munin-node::apache
+
        package {
                apache2: ensure => installed;
                logrotate: ensure => installed;

diff --git a/modules/munin-node/manifests/apache.pp b/modules/munin-node/manifests/apache.pp
new file mode 100644 (file)
index 0000000..47ccba1
--- /dev/null
+++ b/modules/munin-node/manifests/apache.pp
@@ -0,0 +1,6 @@
+class munin-node::apache {
+        activate_munin_check("apache_accesses");
+        activate_munin_check("apache_processes");
+        activate_munin_check("apache_volume");
+}
+

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 5870a223ce0bd786101c110608c0094b5cd478aa..f09f8fc6a9ff14f93295708d01b0d821d4fb640f 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,3 +1,10 @@
+define activate_munin_check($script) {
+       file { "/etc/munin/plugins/$script":
+                ensure => "/usr/share/munin/plugins/$script"
+                notify => Exec["munin-node restart"];
+        }
+}
+
 class munin-node {
 
     package { munin-node: ensure => installed }