[checkmk-commits] #2690 FIX ps: Fixed processing of old inventory_processes rules in discovery function

Module: check_mk Branch: master Commit: 2092e8798c06f68080b58730d46f6aace6b09d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2092e8798c06f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 14:09:27 2015 +0200 #2690 FIX ps: Fixed processing of old inventory_processes rules in discovery function Fixed exception "TypeError: can only concatenate tuple (not "list") to tuple" during service discovery when having legacy inventory_processes rules defined. --- .werks/2690 | 11 +++++++++++ ChangeLog | 1 + checks/ps.include | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2690 b/.werks/2690 new file mode 100644 index 0000000..10bc20f --- /dev/null +++ b/.werks/2690 @@ -0,0 +1,11 @@ +Title: ps: Fixed processing of old inventory_processes rules in discovery function +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445602090 + +Fixed exception "TypeError: can only concatenate tuple (not "list") to tuple" during +service discovery when having legacy inventory_processes rules defined. diff --git a/ChangeLog b/ChangeLog index 334dff9..3465668 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 2662 FIX: windows agent: fixed inventory running every time when ipv6 was activated... * 2697 FIX: hp_msa_controller.io, hp_msa_disk.io, hp_msa_volume.io: fixed broken I/O calculation * 1296 FIX: aix_memory: Check can now handle systems without swap partition + * 2690 FIX: ps: Fixed processing of old inventory_processes rules in discovery function... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ps.include b/checks/ps.include index 09e7b8c..d6761b4 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -61,7 +61,7 @@ def inventory_ps_common(invdata, invrules, info): inv_entry += ([],) default_levels = inv_entry[3:7] - entries.append(inv_entry[:3] + [None] + ({ "levels" : default_levels },)) + entries.append(inv_entry[:3] + (None,) + ({ "levels" : default_levels },)) # Handle new WATO style inventory rules for rule in invrules: