Module: check_mk
Branch: master
Commit: 06a5751129e715f11bccce9289a7254319f2daa1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a5751129e715…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Apr 11 18:52:47 2019 +0200
7257 WATO: The host diagnose page now also indicates if there are errors in the agent
datasource
CMK-1889
Change-Id: Ic22a1c18dcd10d57d14049cacf750a297a1158fb
---
.werks/7257 | 11 +++++++++++
cmk_base/automations/check_mk.py | 2 ++
2 files changed, 13 insertions(+)
diff --git a/.werks/7257 b/.werks/7257
new file mode 100644
index 0000000..29b04a5
--- /dev/null
+++ b/.werks/7257
@@ -0,0 +1,11 @@
+Title: WATO: The host diagnose page now also indicates if there are errors in the agent
datasource
+Level: 1
+Component: wato
+Class: feature
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1555001446
+
+
diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py
index 86cb6c2..8483e1b 100644
--- a/cmk_base/automations/check_mk.py
+++ b/cmk_base/automations/check_mk.py
@@ -1179,6 +1179,8 @@ class AutomationDiagHost(Automation):
source.set_timeout(tcp_connect_timeout)
output += source.run_raw()
+ if source.exception():
+ output += "%s" % source.exception()
return 0, output