[checkmk-commits] #2932 FIX Removal of duplicate services now also works for hosts that are no longer SNMP+TCP

Module: check_mk Branch: master Commit: 5a822bd88fcf8669e2b4f708d9c67e3bfb7932c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a822bd88fcf86… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 14:26:34 2016 +0100 #2932 FIX Removal of duplicate services now also works for hosts that are no longer SNMP+TCP --- .bugs/2307 | 10 ++++++++-- .werks/2932 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.bugs/2307 b/.bugs/2307 index b8888d8..4c22196 100644 --- a/.bugs/2307 +++ b/.bugs/2307 @@ -1,9 +1,9 @@ Title: Automatic removal of duplicate services SNMP vs. Agent can fail Component: core -State: open +Class: bug +State: done Date: 2015-03-03 10:32:56 Targetversion: 1.2.8 -Class: bug Situtation: @@ -24,3 +24,9 @@ remove *all* SNMP checks. Same holds for TCP. Note: This does change the semantics a bit but is more clean. A host cannot try to access an agent anymore if it is not tagged SNMP or TCP resp. + +2016-02-05 14:26:05: changed state open -> done +Removal of duplicates now is also being done for TCP only hosts. +That fixes the immediate problem. The more general solution +is being postponed since its implications to existing installations +are unclear. diff --git a/.werks/2932 b/.werks/2932 new file mode 100644 index 0000000..eec8986 --- /dev/null +++ b/.werks/2932 @@ -0,0 +1,9 @@ +Title: Removal of duplicate services now also works for hosts that are no longer SNMP+TCP +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1454678767 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index df27cda..757213b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2926 FIX: Fix exception in WATO when a check man page has not catalog entry * 2944 FIX: Fixed exception during config activation having clusters with unresolvable node IP addresses * 3037 FIX: Terminate datasource programs when check timeout occurs... + * 2932 FIX: Removal of duplicate services now also works for hosts that are no longer SNMP+TCP Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk.py b/modules/check_mk.py index a07d3c8..b3503d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1857,7 +1857,7 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co if not skip_autochecks and use_cache: g_check_table_cache[hostname] = check_table - if remove_duplicates and is_dual_host(hostname): + if remove_duplicates: return remove_duplicate_checks(check_table) else: return check_table