Module: check_mk
Branch: master
Commit: d132299be100d879a21e2807bd7a1106a4f95ecd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d132299be100d8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Sep 7 17:43:34 2011 +0200
scan-parents: tag found parents with ping
---
ChangeLog | 2 ++
modules/check_mk.py | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c3ef015..2ea7ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
Core, Setup, etc.:
* FIX: use hostgroups instead of host_groups in Nagios configuration.
This fixes a problem with Shinken
+ * --scan-parents: detected parent hosts are now tagged with 'ping', so
+ that no agent will be contacted on those hosts
Checks & Agents:
* Added 4 new checks dell_powerconnect_* by Chris Bowlby
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 899458c..d69efe2 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -3624,7 +3624,7 @@ def do_scan_parents(hosts):
gateway = "gw-%s" % (gateway_ip.replace(".",
"-"))
if gateway not in gateway_hosts:
gateway_hosts.add(gateway)
- parent_hosts.append("%s|parent" % gateway)
+ parent_hosts.append("%s|parent|ping" % gateway)
parent_ips[gateway] = gateway_ip
parent_rules.append( (monitoring_host, [gateway]) ) # make Nagios
a parent of gw
parent_rules.append( (gateway, [host]) )