Module: check_mk Branch: master Commit: d8450ce0042d4972061a91681c5dba0dce68d0d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8450ce0042d49… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Wed Jul 1 15:52:40 2015 +0200 #2321 FIX process discovery: fixed exception during service discovery when no explicit process matching was set The process discovery failed with an exception when there was no match type explictly set. E.g. in WATO this means that the checkbox for <i>Process Matching</i> was unchecked. The check now uses the setting <i>Match all services</i> as default. --- .werks/2321 | 13 +++++++++++++ ChangeLog | 1 + checks/ps.include | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2321 b/.werks/2321 new file mode 100644 index 0000000..aa912cb --- /dev/null +++ b/.werks/2321 @@ -0,0 +1,13 @@ +Title: process discovery: fixed exception during service discovery when no explicit process matching was set +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435758354 + +The process discovery failed with an exception when there was no match type explictly set. +E.g. in WATO this means that the checkbox for <i>Process Matching</i> was unchecked. + +The check now uses the setting <i>Match all services</i> as default. diff --git a/ChangeLog b/ChangeLog index 20d2247..ae5ddf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 2319 FIX: winperf_if: fixed exception when using windows_if.ps1 in an old windows version... * 1261 FIX: apc_symmetra_power: Ignore unused phases during discovery * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available + * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/ps.include b/checks/ps.include index d77a5fb..9c29195 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -78,7 +78,7 @@ def inventory_ps_common(invdata, invrules, info): v = rule[0] - entries.append((v['descr'], v['match'], v.get('user'), v.get('default_params', v))) + entries.append((v['descr'], v.get('match'), v.get('user'), v.get('default_params', v))) for servicedesc, pattern, userspec, default_params in entries: num_perc_s = servicedesc.count("%s")