[checkmk-commits] Check_MK Git: check_mk: #2540 FIX Process piggy backed data even if host is set to "No Agent"

Module: check_mk Branch: master Commit: 2909e259405009094df5c386bd7839705a492ee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2909e259405009… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Aug 19 16:26:35 2015 +0200 #2540 FIX Process piggy backed data even if host is set to "No Agent" You need this fix for monitoring a VM just via ESX with no agent in the VM itself. You can set this now to <i>No Agent</i> and the services shipped from the ESX host or vCenter via piggy back are anyway correctly added to the host. Before this fix the host would just get a PING check. --- .werks/2540 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2540 b/.werks/2540 new file mode 100644 index 0000000..0cd0e2f --- /dev/null +++ b/.werks/2540 @@ -0,0 +1,13 @@ +Title: Process piggy backed data even if host is set to "No Agent" +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1439994260 + +You need this fix for monitoring a VM just via ESX with no agent in the VM +itself. You can set this now to <i>No Agent</i> and the services shipped +from the ESX host or vCenter via piggy back are anyway correctly added to +the host. Before this fix the host would just get a PING check. diff --git a/ChangeLog b/ChangeLog index ee1d393..e33460b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 2465 FIX: Fixed broken Check_MK Discovery checks (check reports "(null)") * 2502 FIX: Fixed removing autochecks when a host is configured to be ping only... * 2526 FIX: Fixed crash in filesystem checks in case mountpoint contains non-ascii characters + * 2540 FIX: Process piggy backed data even if host is set to "No Agent"... Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... diff --git a/modules/check_mk.py b/modules/check_mk.py index 45ba754..0aadd50 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -562,7 +562,7 @@ def is_tcp_host(hostname): return in_binary_hostlist(hostname, tcp_hosts) def is_ping_host(hostname): - return not is_snmp_host(hostname) and not is_tcp_host(hostname) + return not is_snmp_host(hostname) and not is_tcp_host(hostname) and not has_piggyback_info(hostname) def is_dual_host(hostname): return is_tcp_host(hostname) and is_snmp_host(hostname)