[checkmk-commits] #3220 FIX Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts

Module: check_mk Branch: master Commit: fed1e5c666473a39f472cae88cc714e35cffc7af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fed1e5c666473a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 14:59:02 2016 +0100 #3220 FIX Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts --- .werks/3220 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/3220 b/.werks/3220 new file mode 100644 index 0000000..766755c --- /dev/null +++ b/.werks/3220 @@ -0,0 +1,10 @@ +Title: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455631116 + + diff --git a/ChangeLog b/ChangeLog index 8b90914..73716ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 3193 FIX: Fixed fake check results for hosts... * 3214 FIX: Removing SNMP checks for non SNMP hosts and agent based checks for non agent hosts... + * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "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/nagios.py b/modules/nagios.py index 7591a1d..a76cb5c 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -468,6 +468,11 @@ define service { for acttype, rules in active_checks.items(): entries = host_extra_conf(hostname, rules) if entries: + # Skip Check_MK HW/SW Inventory for all ping hosts, even when the user has enabled + # the inventory for ping only hosts + if acttype == "cmk_inv" and is_ping_host(hostname): + continue + active_checks_to_define.add(acttype) act_info = active_check_info[acttype] for params in entries: