From 2e8026282331d41c9447aab8884ecca3902db56a Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 20 Nov 2012 14:55:26 +0200
Subject: [PATCH] Added more commands for nrpe

---
 nagios/manifests/init.pp | 53 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/nagios/manifests/init.pp b/nagios/manifests/init.pp
index a6bf2eb..fac6ed0 100644
--- a/nagios/manifests/init.pp
+++ b/nagios/manifests/init.pp
@@ -451,30 +451,48 @@ class nagios::target::nrpe {
         $nagios_allow = "127.0.0.1"
     }
 
+    include nagios::common
     include nagios::target
 
     case $operatingsystem {
         "centos","redhat","fedora": {
+            $service = "nrpe"
+            $nrpedir = "/etc/nrpe.d"
             package { [ "nrpe",
                         "nagios-plugins-disk",
                         "nagios-plugins-load",
                         "nagios-plugins-procs",
                         "nagios-plugins-users", ]:
                 ensure => installed,
-                before => [ Augeas["nrpe-allow"], Service["nrpe"] ],
+                before => [ File["/etc/nrpe.d"],
+                            Augeas["nrpe-allow"],
+                            Service["nrpe"], ],
             }
-            $service = "nrpe"
         }
         "ubuntu","debian": {
+            $service = "nagios-nrpe-server"
+            $nrpedir = "/etc/nagios/nrpe.d"
             package { [ "nagios-nrpe-server",
                         "nagios-plugins-basic", ]:
                 ensure => installed,
-                before => [ Augeas["nrpe-allow"], Service["nrpe"] ],
+                before => [ File["/etc/nrpe.d"],
+                            Augeas["nrpe-allow"],
+                            Service["nrpe"], ],
             }
-            $service = "nagios-nrpe-server"
         }
     }
 
+    file { "/etc/nrpe.d":
+        ensure  => directory,
+        mode    => "0644",
+        owner   => "root",
+        group   => "root",
+        purge   => true,
+        force   => true,
+        recurse => true,
+        source  => "puppet:///modules/custom/empty",
+    }
+
     service { "nrpe":
         name   => $service,
         ensure => running,
@@ -487,12 +505,39 @@ class nagios::target::nrpe {
         notify  => Service["nrpe"],
     }
 
+    file { "${nrpedir}/check_disk.cfg":
+        ensure  => present,
+        mode    => "0644",
+        owner   => "root",
+        group   => "root",
+        content => "command[check_disk] = ${nagios::common::libdir}/check_disk -c 10% -w 20% -p /\n",
+        require => File["/etc/nrpe.d"],
+        notify  => Service["nrpe"],
+    }
+    @@nagios::service { "${fqdn}_disk":
+        host        => $fqdn,
+        command     => "check_nrpe!check_disk",
+        description => "Disk",
+    }
+
     @@nagios::service { "${fqdn}_load":
         host        => $fqdn,
         command     => "check_nrpe!check_load",
         description => "Load",
     }
 
+    @@nagios::service { "${fqdn}_users":
+        host        => $fqdn,
+        command     => "check_nrpe!check_users",
+        description => "Users",
+    }
+
+    @@nagios::service { "${fqdn}_procs":
+        host        => $fqdn,
+        command     => "check_nrpe!check_total_procs",
+        description => "Processes",
+    }
+
 }