diff options
| author | nadir <nadir-technik@nadir.org> | 2012-02-14 14:50:38 +0100 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2012-04-09 21:09:30 -0400 |
| commit | 3ed7a58cc923d52c8664776b534b123d43f8fe5d (patch) | |
| tree | ca13981628ce870d8310088bd2a6fed7d25b3ad0 | |
| parent | 6f70941c33e1f621dae4722796314e94a4b23bb6 (diff) | |
add nrpe timeout parameter
amended (lelutin): took out some trailing whitespaces and a commented
out (useless) line
| -rw-r--r-- | manifests/command/nrpe_timeout.pp | 11 | ||||
| -rw-r--r-- | manifests/service.pp | 13 |
2 files changed, 19 insertions, 5 deletions
diff --git a/manifests/command/nrpe_timeout.pp b/manifests/command/nrpe_timeout.pp new file mode 100644 index 0000000..3415566 --- /dev/null +++ b/manifests/command/nrpe_timeout.pp @@ -0,0 +1,11 @@ +class nagios::command::nrpe_timeout { + nagios_command { + 'check_nrpe_timeout': + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$ -a $ARG3$' + } + + nagios_command { + 'check_nrpe_1arg_timeout': + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$' + } +} diff --git a/manifests/service.pp b/manifests/service.pp index ae112c1..55b2254 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -13,7 +13,8 @@ define nagios::service ( $use = 'generic-service', $service_description = 'absent', $use_nrpe = '', - $nrpe_args = '' ) + $nrpe_args = '', + $nrpe_timeout = 10 ) { # TODO: this resource should normally accept all nagios_host parameters @@ -21,11 +22,13 @@ define nagios::service ( $real_name = "${hostname}_${name}" if ($use_nrpe == 'true') { - if ($nrpe_args != '') { - $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" + 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!$check_command" + else { + $real_check_command = "check_nrpe_1arg_timeout!$nrpe_timeout!$check_command" } } else { |