Module: check_mk
Branch: master
Commit: 387650d14f58c632a7bb54193befc88b40b271d1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=387650d14f58c6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 17:44:35 2013 +0100
FIX heartbeat_crm: Agent code is now compatible to pacemaker 1.1.9
The paths /var/run/heartbeat/crm/cib_ro or /var/run/crm/cib_ro do not seem
to be existing anymore. Instead testing whether or not crmd is running.
---
.werks/366 | 11 +++++++++++
ChangeLog | 1 +
agents/check_mk_agent.linux | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/366 b/.werks/366
new file mode 100644
index 0000000..07e917b
--- /dev/null
+++ b/.werks/366
@@ -0,0 +1,11 @@
+Title: heartbeat_crm: Agent code is now compatible to pacemaker 1.1.9
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387212198
+Targetversion: future
+
+The paths /var/run/heartbeat/crm/cib_ro or /var/run/crm/cib_ro do not seem
+to be existing anymore. Instead testing whether or not crmd is running.
diff --git a/ChangeLog b/ChangeLog
index 0784db0..dc20c59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
* 0363 FIX: mysql_capacity: Did use wrong calculated warn / crit thresholds...
* 0364 FIX: brocade_mlx*: Several cleanups, fixed bug in brocade_mlx_fan where only
the first worst state was shown in output
* 0365 FIX: RPMs: Cleaning up xinetd checkmk.rpmnew file after updating package...
+ * 0366 FIX: heartbeat_crm: Agent code is now compatible to pacemaker 1.1.9...
Multisite:
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in
Chrome/IE
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index ff0eb8d..33899d5 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -386,7 +386,7 @@ fi
# Heartbeat monitoring
# Different handling for heartbeat clusters with and without CRM
# for the resource state
-if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ]; then
+if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ] || pgrep crmd >
/dev/null 2>&1; then
echo '<<<heartbeat_crm>>>'
crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ s/^\s//;
s/^\s/_/g'
fi