Module: check_mk Branch: master Commit: a06b151c59fd631549772a8d36e125035c18b126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a06b151c59fd63… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Thu Sep 21 12:48:36 2017 +0200 5297 FIX dotnet_clrmemory, msexch_rpcclientaccess, wmi_cpuload: Fixed activate changes because of inconsistent item handling Change-Id: I4834da06a4a57b8b5d26b27abcf47d981c9992f2 --- .werks/5297 | 21 +++++++++++++++++++++ checks/dotnet_clrmemory | 2 +- checks/wmi.include | 2 +- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.werks/5297 b/.werks/5297 new file mode 100644 index 0000000..134075f --- /dev/null +++ b/.werks/5297 @@ -0,0 +1,21 @@ +Title: dotnet_clrmemory, msexch_rpcclientaccess, wmi_cpuload: Fixed activate changes because of inconsistent item handling +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505989362 + +WATO groups, inventory functions in wmi.include and service descriptions +were inconsistent. +<ul> +<li>Werk 4099 changed WATO item type.</li> +<li>Library {{wmi.include}} returned wrong item for {{wmi_cpuload}}.</li> +<li>Check {{dotnet_clrmemory}} had not '%s' in service description (not incomp.).</li> +</ul> +In the first case the existing rules must be discharged and new ones have +to be applied. +Second issue requires a re-discovery on the affected hosts. +Third one is not incompatible; just a cosmetic change. diff --git a/checks/dotnet_clrmemory b/checks/dotnet_clrmemory index 26f9d13..42f0d26 100644 --- a/checks/dotnet_clrmemory +++ b/checks/dotnet_clrmemory @@ -46,7 +46,7 @@ check_info['dotnet_clrmemory'] = { 'check_function' : check_dotnet_clrmemory, 'parse_function' : parse_wmi_table, 'has_perfdata' : True, - 'service_description' : "DotNet Memory Management", + 'service_description' : "DotNet Memory Management %s", 'includes' : ['wmi.include'], 'group' : "clr_memory" } diff --git a/checks/wmi.include b/checks/wmi.include index a87672c..ae744cf 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -221,7 +221,7 @@ def inventory_wmi_table(tables, **kwargs): # 'system_perf' section has only counters and comes together # with 'computer_system' which has table names and intersection # of these tables would be empty. Thus no service is discovered. - potential_instances = [""] + potential_instances = [None] else: # inventarize one item per instance that exists in all tables diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 101f202..885dfbc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6718,7 +6718,7 @@ register_check_parameters( ], optional_keys=[] ), - FixedValue("", title=""), + None, match_type = 'dict' )