[checkmk-commits] Check_MK Git: check_mk: Linux: Modified cluster section to allow pacemaker/ corosync clusters without heartbeat

Module: check_mk Branch: master Commit: 57a699e549c7258334a5ddc99894677a54457054 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57a699e549c725… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu May 24 11:12:16 2012 +0200 Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat --- ChangeLog | 1 + agents/check_mk_agent.linux | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78d00f8..1da5ffa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ of nodes in state OK. Checks & Agents: + * Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat * AIX: convert NIC check to lnx_if (now being compatible with if/if64) * AIX: new check for CPU utilization (using section lparstat_aix) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c851aad..2b03e46 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -341,16 +341,15 @@ if which lpstat > /dev/null 2>&1; then 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 + echo '<<<heartbeat_crm>>>' + crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ s/^\s//; s/^\s/_/g' +fi if which cl_status > /dev/null 2>&1; then - # 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 - echo '<<<heartbeat_crm>>>' - crm_mon -1 -r | grep -v ^$ | sed '/^\sResource Group:/,$ s/^\s//; s/^\s/_/g' - else - echo '<<<heartbeat_rscstatus>>>' - cl_status rscstatus - fi + echo '<<<heartbeat_rscstatus>>>' + cl_status rscstatus echo '<<<heartbeat_nodes>>>' for NODE in $(cl_status listnodes); do