8 Dec
2014
8 Dec
'14
2:30 p.m.
Module: check_mk
Branch: master
Commit: 28c844617cd31c606d59d08467039c235c4a5d13
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28c844617cd31c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Dec 8 14:30:31 2014 +0100
#1710 FIX omd_status: Fix totally missing section in Linux agent
Reason was an invalid call to <tt>run_cached</tt>. As a result the agent
section
<tt>omd_status</tt> was always empty. This has been fixed.
---
.werks/1710 | 10 ++++++++++
ChangeLog | 1 +
agents/check_mk_agent.linux | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1710 b/.werks/1710
new file mode 100644
index 0000000..6e5dfcc
--- /dev/null
+++ b/.werks/1710
@@ -0,0 +1,10 @@
+Title: omd_status: Fix totally missing section in Linux agent
+Level: 2
+Component: checks
+Compatible: compat
+Version: 1.2.5i7
+Date: 1418045381
+Class: fix
+
+Reason was an invalid call to <tt>run_cached</tt>. As a result the agent
section
+<tt>omd_status</tt> was always empty. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 5e46b51..7f1614a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -126,6 +126,7 @@
* 1688 FIX: juniper_screenos_mem: Fixed wrong total memory computation
* 1658 FIX: agent_vsphere: no longer crashes when decommissioned vms report no
hardware information...
* 1708 FIX: cups_queues: fix outputting of current printer jobs if printer daemon is
CUPS...
+ * 1710 FIX: omd_status: Fix totally missing section in Linux agent...
Multisite:
* 1508 Allow input of plugin output and perfdata when faking check results...
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 3dbaaa1..5f925e1 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -529,7 +529,7 @@ fi
# Check status of OMD sites
if type omd >/dev/null
then
- run_cached omd_status 60 "echo '<<<omd_status>>>' ;
omd status --bare --auto"
+ run_cached -s omd_status 60 "omd status --bare --auto"
fi