[checkmk-commits] 3275 FIX Piggyback based services were skipped on "No agent hosts"

Module: check_mk Branch: master Commit: 0a95c9705d4f8499d971b411266a8bad8531fb0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a95c9705d4f84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 10:27:17 2016 +0100 3275 FIX Piggyback based services were skipped on "No agent hosts" This issue was introduced with werk #3214. --- .werks/3275 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/3275 b/.werks/3275 new file mode 100644 index 0000000..999620b --- /dev/null +++ b/.werks/3275 @@ -0,0 +1,10 @@ +Title: Piggyback based services were skipped on "No agent hosts" +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457429199 + +This issue was introduced with werk #3214. diff --git a/ChangeLog b/ChangeLog index 88b705a..06d3f7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts * 3221 FIX: Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled... * 3234 FIX: Make unixcat more robust... + * 3275 FIX: Piggyback based services were skipped on "No agent hosts"... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index 4a2ac8e..4e21946 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1835,13 +1835,15 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co elif type(hostlist[0]) == str: pass # regular case: list of hostnames elif hostlist != []: - raise MKGeneralException("Invalid entry '%r' in check table. Must be single hostname or list of hostnames" % hostlist) + raise MKGeneralException("Invalid entry '%r' in check table. Must be single hostname " + "or list of hostnames" % hostlist) # Skip SNMP checks for non SNMP hosts (might have been discovered before with other # agent setting. Remove them without rediscovery). Same for agent based checks. if not is_snmp_host(hostname) and is_snmp_check(checkname): return - if not is_tcp_host(hostname) and is_tcp_check(checkname): + if not is_tcp_host(hostname) and not has_piggyback_info(hostname) \ + and is_tcp_check(checkname): return if hosttags_match_taglist(hosttags, tags) and \