Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/service.pp

1 files changed, 17 insertions, 3 deletions

diff --git a/manifests/service.pp b/manifests/service.pp
index 9eb993e..134d1f7 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -11,8 +11,11 @@ define nagios::service (
   $notification_options = '',
   $contact_groups = '',
   $use = 'generic-service',
-  $service_description = 'absent' )
-{
+  $service_description = 'absent',
+  $use_nrpe = '',
+  $nrpe_args = '',
+  $nrpe_timeout = 10
+) {
 
   # TODO: this resource should normally accept all nagios_host parameters
 
@@ -25,7 +28,18 @@ define nagios::service (
 
   if $ensure != 'absent' {
     if $check_comand == 'absent' {
-    fail("Must pass a check_command to ${name} if it should be present")
+      fail("Must pass a check_command to ${name} if it should be present")
+    }
+    if ($use_nrpe == 'true') {
+	    include nagios::command::nrpe_timeout
+
+      if ($nrpe_args != '') {
+	      $real_check_command = "check_nrpe_timeout!$nrpe_timeout!$check_command!\"$nrpe_args\""
+	    } else {
+	      $real_check_command = "check_nrpe_1arg_timeout!$nrpe_timeout!$check_command"
+	    }
+    } else {
+      $real_check_command = "$check_command"
     }
 
     Nagios_service["${real_name}"] {