X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=6e2eb5e1271b0198df0eb7737abfa72d11c52eea;hb=a74d2b5351e782da2dea66815a2973d1cb1ed83b;hp=698899cf8b14dbae6fef5713849dc294484e215d;hpb=162e4df691c0765b962b547feefcbdbfe0198f9b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 698899cf8..6e2eb5e12 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,8 +1,13 @@
-define activate_munin_check($ensure=present) {
+define activate_munin_check($ensure=present, script=$name) {
+    case $script {
+        "": { $base = $name }
+        default: { $base = $script }
+    }
+
     case $ensure {
         present: {
             file { "/etc/munin/plugins/$name":
-                     ensure => "/usr/share/munin/plugins/$name",
+                     ensure => "/usr/share/munin/plugins/$base",
                      notify => Exec["munin-node restart"];
             }
         }
@@ -12,6 +17,7 @@ define activate_munin_check($ensure=present) {
                      notify => Exec["munin-node restart"];
             }
         }
+    }
 }
 
 class munin-node {
@@ -21,6 +27,7 @@ class munin-node {
     activate_munin_check {
         "cpu":;
         "df":;
+        "df_abs":;
         "df_inode":;
         "entropy":;
         "forks":;
@@ -34,14 +41,22 @@ class munin-node {
         "open_inodes":;
         "processes":;
         "swap":;
+        "uptime":;
         "vmstat":;
     }
 
-    file { "/etc/munin/munin-node.conf":
-        source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
-                     "puppet:///munin-node/common/munin-node.conf" ],
-        require => Package["munin-node"],
-        notify  => Exec["munin-node restart"],
+    file {
+        "/etc/munin/munin-node.conf":
+            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
+                         "puppet:///munin-node/common/munin-node.conf" ],
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"];
+
+        "/etc/munin/plugin-conf.d/munin-node":
+            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.plugin.conf",
+                         "puppet:///munin-node/common/munin-node.plugin.conf" ],
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"];
     }
 
     exec { "munin-node restart":