Module: check_mk
Branch: master
Commit: 98693b5f6f434e3779bc728d2889ffe91509b97b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98693b5f6f434e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu May 2 17:29:04 2019 +0200
Nagios: Fix Discovery service intervals
Change-Id: I0497dae372fd8ef99fbcab1b0a43b48fa7879fab
---
cmk_base/core_nagios.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py
index 3ebad36..bec4bab 100644
--- a/cmk_base/core_nagios.py
+++ b/cmk_base/core_nagios.py
@@ -497,14 +497,19 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname,
host_attrs):
service_spec = {
"use": config.inventory_check_template,
"host_name": hostname,
- "normal_check_interval": params["check_interval"],
- "retry_check_interval": params["check_interval"],
"service_description": service_discovery_name,
}
service_spec.update(
core_config.get_service_attributes(hostname, service_discovery_name,
config_cache))
+
service_spec.update(
_extra_service_conf_of(cfg, config_cache, hostname, service_discovery_name))
+
+ service_spec.update({
+ "check_interval": params["check_interval"],
+ "retry_interval": params["check_interval"],
+ })
+
outfile.write(_format_nagios_object("service",
service_spec).encode("utf-8"))
if have_at_least_one_service: