[checkmk-commits] 5805 FIX windows services: service discovery was unable to ignore disabled rules

Module: check_mk Branch: master Commit: 5a4d44e5c47ba106d44aedade9f1bb50b4432613 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a4d44e5c47ba1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 7 14:51:19 2018 +0200 5805 FIX windows services: service discovery was unable to ignore disabled rules Change-Id: I5bde4632291ee77c901b2b53f5eb07c9ac7d8afe --- .werks/5805 | 10 ++++++++++ checks/services | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/.werks/5805 b/.werks/5805 new file mode 100644 index 0000000..b3a29e4 --- /dev/null +++ b/.werks/5805 @@ -0,0 +1,10 @@ +Title: windows services: service discovery was unable to ignore disabled rules +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525697446 +Class: fix + + diff --git a/checks/services b/checks/services index 11e92be..cd85a65 100644 --- a/checks/services +++ b/checks/services @@ -118,6 +118,11 @@ def inventory_windows_services(info): # Filter WATO compatible rules by tags/hostlist rules = [] for rule in inventory_services_rules: + if len(rule) >= 4: + options = rule[3] + if options.get("disabled"): + continue + # 1. Get all rules matching the current host taglist, hostlist = rule[1:3] if not hosttags_match_taglist(tags_of_host(host_name()), taglist) \