Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/service.pp

1 files changed, 25 insertions, 2 deletions

diff --git a/README b/README
index e2a35ea..8fcd85d 100644
--- a/README
+++ b/README
@@ -51,9 +51,9 @@ Services
 
 Services can be monitored by using the "nagios::service" component.
 
-The simplest form is::
+The simplest form is:
 
-	nagios::service { 'check_http':
+    nagios::service { 'check_http':
         check_command => 'http_port!80',
     }
 
@@ -65,6 +65,29 @@ Obviously, the check command must either be defined using nagios_command objects
 (some are supplied in nagios::defaults::commands) or in the nagios configuration
 files directly.
 
+NRPE Services 
+-------------
+
+Some Nagios services need to be checked via NRPE. The following will make the
+nagios server define a service that will check the NRPE command 'check_cpu' on
+the current node:
+
+    nagios::service { 'CPU Usage':
+      use_nrpe => 'true',
+      check_command => "check_cpu",
+      nrpe_args => "-t 60"
+    }
+
+NRPE Commands
+-------------
+
+To be able to call NRPE commands on a host, one needs to define that command
+and what it is going to execute:
+
+    nagios::nrpe::command { 'debsums':
+      check_command => '/usr/lib/nagios/plugins/check_debsums openssh-server'
+    }
+
 
 Upgrade Notes
 =============