Module: check_mk
Branch: master
Commit: 326b39e8eaf2be292b799969b90baf4030d46cac
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=326b39e8eaf2be…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 13:36:40 2013 +0100
FIX heartbeat_crm: Now handling "Failed actions:" output in agent
When there is a "Failed actions:" info block provided by the agent,
the inventory code of the check failed with an exception. This has
been fixed now.
---
.werks/355 | 12 ++++++++++++
ChangeLog | 1 +
checks/heartbeat_crm | 4 +++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.werks/355 b/.werks/355
new file mode 100644
index 0000000..878dcd1
--- /dev/null
+++ b/.werks/355
@@ -0,0 +1,12 @@
+Title: heartbeat_crm: Now handling "Failed actions:" output in agent
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387197335
+Targetversion: future
+
+When there is a "Failed actions:" info block provided by the agent,
+the inventory code of the check failed with an exception. This has
+been fixed now.
diff --git a/ChangeLog b/ChangeLog
index 1a990a3..d771a80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
* 0326 FIX: hr_fs printer_supply: Improved translation of wrong encoded chars...
* 0059 FIX: agent_vpshere: new option for supporting ESX 4.1...
* 0334 FIX: cisco_fantray: Fixed error on Cisco devices which do not support this
check...
+ * 0355 FIX: heartbeat_crm: Now handling "Failed actions:" output in
agent...
Multisite:
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in
Chrome/IE
diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm
index 3b6341c..e5e2611 100644
--- a/checks/heartbeat_crm
+++ b/checks/heartbeat_crm
@@ -138,7 +138,9 @@ def heartbeat_crm_parse_resources(info):
resource = ''
mode = 'single'
for line in info:
- if not blockStart and ' '.join(line) == 'Full list of
resources:':
+ if ' '.join(line) == 'Failed actions:':
+ blockStart = False
+ elif not blockStart and ' '.join(line) == 'Full list of
resources:':
blockStart = True
elif blockStart:
if ' '.join(line[0:2]) == 'Resource Group:':