Module: check_mk
Branch: master
Commit: d916a36bd75096b006df2934168a9c6a610882ef
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d916a36bd75096…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Jan 11 15:49:23 2017 +0100
4212 FIX jolokia_info: Fix crash for certain product versions.
Change-Id: I8838eaa889e61d76cfe9bf3dba19b564178d1f24
---
.werks/4212 | 10 ++++++++++
ChangeLog | 1 +
checks/jolokia_info | 7 ++++++-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.werks/4212 b/.werks/4212
new file mode 100644
index 0000000..ec3c276
--- /dev/null
+++ b/.werks/4212
@@ -0,0 +1,10 @@
+Title: jolokia_info: Fix crash for certain product versions.
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i4
+Date: 1484146032
+
+
diff --git a/ChangeLog b/ChangeLog
index 54dd049..da54f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,7 @@
* 4268 FIX: cisco_vpn_tunnel: Reporting zero traffic in case the tunnel is down...
* 4288 FIX: sentry_pdu: fixed data handling if power value is missing
* 4289 FIX: mysql.innodb_io: fixed incomplete data handling...
+ * 4212 FIX: jolokia_info: Fix crash for certain product versions.
Multisite:
* 4169 View action: Default values of sticky, notification and persistent options can
now be configured via global settings....
diff --git a/checks/jolokia_info b/checks/jolokia_info
index a5c1aa0..1f626c5 100644
--- a/checks/jolokia_info
+++ b/checks/jolokia_info
@@ -38,7 +38,12 @@ def check_jolokia_info(item, _no_params, info):
if line[1] == 'ERROR' or len(line) < 4:
return (2, "Jolokia not running")
- product, version, jolokia_version = line[1:]
+ if len(line) > 4:
+ product = line[1]
+ jolokia_version = line[-1]
+ version = " ".join(line[2:-1])
+ else:
+ product, version, jolokia_version = line[1:]
return (0, "%s %s (Jolokia version %s)" % (
product.title(), version, jolokia_version))