[checkmk-commits] Check_MK Git: check_mk: #1794 FIX Fix exception in WATO service list in case of vanished checks

Module: check_mk Branch: master Commit: ca9d27910a1f55c844ca05e467a17474fe6ce1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca9d27910a1f55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 19 13:53:23 2014 +0100 #1794 FIX Fix exception in WATO service list in case of vanished checks --- .werks/1794 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1794 b/.werks/1794 new file mode 100644 index 0000000..a941afd --- /dev/null +++ b/.werks/1794 @@ -0,0 +1,10 @@ +Title: Fix exception in WATO service list in case of vanished checks +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418993584 + + diff --git a/ChangeLog b/ChangeLog index 59fc696..2bb4103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services * 1790 FIX: Fix WATO parameters page for passive checks... + * 1794 FIX: Fix exception in WATO service list in case of vanished checks Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/modules/automation.py b/modules/automation.py index 3e8da31..354708e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -297,8 +297,8 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False, with_snmp_scan=F # Check if already in autochecks (but not found anymore) for ct, item, params in read_autochecks_of(hostname): - if hn == hostname and (ct, item) not in found: - found[(ct, item)] = ( 'vanished', repr(params) ) # This is not the real paramstring! + if (ct, item) not in found: + found[(ct, item)] = ('vanished', repr(params) ) # This is not the real paramstring! # Find manual checks existing = get_check_table(hostname)