Module: check_mk
Branch: master
Commit: 49ebb0e6cf6a92be98355f305069599abf7beb1b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49ebb0e6cf6a92…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Wed Jul 23 22:26:58 2014 +0200
FIX jolokia_metrics: fix for problem when catalina uses the standalone engine
---
.werks/639 | 8 ++++++++
ChangeLog | 1 +
checks/jolokia_metrics | 7 ++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/639 b/.werks/639
new file mode 100644
index 0000000..a6e86ba
--- /dev/null
+++ b/.werks/639
@@ -0,0 +1,8 @@
+Title: jolokia_metrics: fix for problem when catalina uses the standalone engine
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1406147156
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 97e98c0..a59c233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,7 @@
* 1083 FIX: ad_replication.bat: does not return data if the server is no DC
* 0638 FIX: windows_updates: agent plugin now always sends section header, even if no
update information provided...
* 1084 FIX: ps: now able to handle bigger process groups without constant
MKCounterWrapped Exceptions...
+ * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone
engine
Multisite:
* 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...
diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics
index c48218d..afa2dc5 100644
--- a/checks/jolokia_metrics
+++ b/checks/jolokia_metrics
@@ -62,7 +62,12 @@ def jolokia_metrics_parse(info):
part2 = part1[1].split(',type=')
gc = part2[0]
elif "ThreadPool" in inst:
- part1 = inst.split(',Catalina:name=')
+ if "Catalina" in inst:
+ part1 = inst.split(',Catalina:name=')
+ elif "Standalone" in inst:
+ part1 = inst.split(',Standalone:name=')
+ else:
+ continue
inst = part1[0]
part2 = part1[1].split(',type=')
tp = part2[0]