Module: check_mk Branch: master Commit: c098b97a2c6f7ca63729bcd1d7576c24ffbbc195 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c098b97a2c6f7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 08:58:27 2015 +0100 #1874 FIX ps: Old process inventory configurations work now again Since werk #1563 we migrated the way the process inventory is being configured. The intention was that old style configurations remain working after an upgrade. This compatibility was broken and has been fixed again. --- .werks/1874 | 14 ++++++++++++++ ChangeLog | 3 +-- checks/ps.include | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/1874 b/.werks/1874 new file mode 100644 index 0000000..c41e8f9 --- /dev/null +++ b/.werks/1874 @@ -0,0 +1,14 @@ +Title: ps: Old process inventory configurations work now again +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421913153 + +Since werk #1563 we migrated the way the process inventory is being +configured. + +The intention was that old style configurations remain working after +an upgrade. This compatibility was broken and has been fixed again. diff --git a/ChangeLog b/ChangeLog index 0016eb1..ab7d841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,8 +50,6 @@ NOTE: Please refer to the migration notes! * 1673 netapp_volumes: now able to configure levels by magic factor * 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler Loadbalancer Appliances - * 1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule... - NOTE: Please refer to the migration notes! * 1857 ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! @@ -101,6 +99,7 @@ NOTE: Please refer to the migration notes! * 1671 FIX: windows agent: fixed gaps in eventlog monitoring after agent restart... * 1856 FIX: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin... + * 1874 FIX: ps: Old process inventory configurations work now again... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ps.include b/checks/ps.include index bcb8de7..5f9b1f1 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -74,7 +74,8 @@ def inventory_ps_common(invdata, invrules, info): entries.append((v['descr'], v['match'], v.get('user'))) - for servicedesc, pattern, userspec in entries: + for entry in entries: + servicedesc, pattern, userspec = entry[:3] num_perc_s = servicedesc.count("%s") for line in info: # First entry in line is the node name or None for non-clusters