summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2015-10-25 14:52:49 +0100
committermh <mh@immerda.ch>2015-10-25 14:52:49 +0100
commit711cbfdc765b743f476da3027c6b95ba27b1a0c1 (patch)
treea938d963a4690f36eac8d9225610d6098495dddd
parente468d58c85886d00d3b49443fe7cef4e8ed7b2c2 (diff)
newer nagios versions use now check_interval
-rw-r--r--manifests/defaults/service_templates.pp2
-rw-r--r--manifests/service.pp6
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/defaults/service_templates.pp b/manifests/defaults/service_templates.pp
index b225455..e39441a 100644
--- a/manifests/defaults/service_templates.pp
+++ b/manifests/defaults/service_templates.pp
@@ -21,7 +21,7 @@ class nagios::defaults::service_templates {
notification_interval => '0',
is_volatile => '0',
check_period => '24x7',
- normal_check_interval => '5',
+ check_interval => '5',
retry_check_interval => '1',
max_check_attempts => '4',
notification_period => '24x7',
diff --git a/manifests/service.pp b/manifests/service.pp
index d53fd24..e2c08e9 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -5,7 +5,7 @@ define nagios::service (
$host_name = $::fqdn,
$check_command = 'absent',
$check_period = undef,
- $normal_check_interval = undef,
+ $check_interval = undef,
$retry_check_interval = undef,
$max_check_attempts = undef,
$notification_interval = undef,
@@ -59,8 +59,8 @@ define nagios::service (
Nagios_service[$real_name] { check_period => $check_period }
}
- if $normal_check_interval {
- Nagios_service[$real_name] { normal_check_interval => $normal_check_interval }
+ if $check_interval {
+ Nagios_service[$real_name] { check_interval => $check_interval }
}
if $retry_check_interval {