Module: check_mk
Branch: master
Commit: c1445c94bb009be2bbb3f1458c66704e5aca5711
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1445c94bb009b…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon Jan 12 11:27:04 2015 +0100
#1209 FIX livestatus_status: Check handles cluster using in cluster now
---
.werks/1209 | 10 ++++++++++
ChangeLog | 1 +
checks/livestatus_status | 4 +++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/1209 b/.werks/1209
new file mode 100644
index 0000000..1f0e940
--- /dev/null
+++ b/.werks/1209
@@ -0,0 +1,10 @@
+Title: livestatus_status: Check handles cluster using in cluster now
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1421058385
+
+
diff --git a/ChangeLog b/ChangeLog
index c484f00..c324fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@
* 1806 FIX: services check was not recognizing configured state when no service was
found
* 1840 FIX: oracle_tablespaces: fix implementation of magic factor
* 1848 FIX: df: title of pnp graphs for filesystem checks fixed...
+ * 1209 FIX: livestatus_status: Check handles cluster using in cluster now
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/checks/livestatus_status b/checks/livestatus_status
index 86bcc2a..07f1980 100644
--- a/checks/livestatus_status
+++ b/checks/livestatus_status
@@ -37,7 +37,9 @@ def livestatus_status_parse(info):
while n < len(info):
site = info[n][0][1:-1]
if n == len(info) - 1 or info[n+1][0].startswith('['):
- parsed[site] = None # Site is down
+ # Handle the case if the check running in cluster
+ if site not in parsed.keys():
+ parsed[site] = None # Site is down
n += 1
else:
headers = info[n+1]