Module: check_mk
Branch: master
Commit: c9a7fc045bc59ea294f522d44ce585ade35e4344
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a7fc045bc59e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 11 14:40:28 2015 +0100
#2765 FIX heartbeat_crm: Fixed issue detecting outdated data with daylight saving time
---
.werks/2765 | 10 ++++++++++
ChangeLog | 1 +
agents/check_mk_agent.linux | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/2765 b/.werks/2765
new file mode 100644
index 0000000..a559d94
--- /dev/null
+++ b/.werks/2765
@@ -0,0 +1,10 @@
+Title: heartbeat_crm: Fixed issue detecting outdated data with daylight saving time
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1447249165
+
+
diff --git a/ChangeLog b/ChangeLog
index 7c44447..513fd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
* 2702 FIX: oracle_diva_csm: fixed handling of empty sublists
* 2761 FIX: check_http: Fixed handling of multiple strings given as "Strings to
expect in server response"
* 2786 FIX: agent_netapp: now able to monitor more than 20 instances of a given type,
e.g. volumes or interfaces...
+ * 2765 FIX: heartbeat_crm: Fixed issue detecting outdated data with daylight saving
time
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 05d2cb3..d32045d 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -487,7 +487,7 @@ fi
# for the resource state
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'
+ TZ=UTC crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ s/^\s//;
s/^\s/_/g'
fi
if type cl_status > /dev/null 2>&1; then
echo '<<<heartbeat_rscstatus>>>'