Module: check_mk
Branch: master
Commit: 542d6c6630e45faab111b0eedd0f18cb953601e0
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=542d6c6630e45f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Oct 31 09:47:50 2013 +0100
FIXInventory problem with inventory_processes parameter
---
.werks/20 | 8 ++++++++
ChangeLog | 3 +++
checks/ps | 3 +++
3 files changed, 14 insertions(+)
diff --git a/.werks/20 b/.werks/20
new file mode 100644
index 0000000..0373117
--- /dev/null
+++ b/.werks/20
@@ -0,0 +1,8 @@
+Title: Inventory problem with inventory_processes parameter
+Level: 2
+Component: checks
+Version: 1.2.3i6
+Date: 1383209203
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 2110f6e..13ff688 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
1.2.3i6:
+ Checks & Agents:
+ * FIX 0020: Inventory problem with inventory_processes parameter...
+
Multisite:
* 0000: Improved performance of LDAP sync by refactoring the group sync code
diff --git a/checks/ps b/checks/ps
index f310d8a..cac2e52 100644
--- a/checks/ps
+++ b/checks/ps
@@ -149,6 +149,9 @@ def inventory_ps_common(invdata, info, handle_perfdata = False):
not in_extraconf_hostlist(hostlist, g_hostname)):
continue
+ if len(inventry) == 7: # extend old inventory_processes
+ inventry += ([],)
+
entries.append(inventry)
# Handle new wato style inventory_processes_rules