Module: check_mk
Branch: master
Commit: 91ad89f2da0aed3c4c0132ea2183d090d54d20c1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91ad89f2da0aed…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Mon Sep 24 13:46:19 2018 +0200
6629 FIX jolokia_generic: Make service descriptions consistent with jolokia_metrics
Rediscovery is required on the affected hosts.
Change-Id: Icc3ceb44c925a3ffd3d5863bf80a5010c3038010
---
.werks/6629 | 10 ++++++++++
checks/jolokia_generic | 8 ++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/.werks/6629 b/.werks/6629
new file mode 100644
index 0000000..3697918
--- /dev/null
+++ b/.werks/6629
@@ -0,0 +1,10 @@
+Title: jolokia_generic: Make service descriptions consistent with jolokia_metrics
+Level: 1
+Component: checks
+Compatible: incomp
+Edition: cre
+Version: 1.6.0i1
+Date: 1537789397
+Class: fix
+
+Rediscovery is required on the affected hosts.
diff --git a/checks/jolokia_generic b/checks/jolokia_generic
index 8eb2c2b..2704ba7 100644
--- a/checks/jolokia_generic
+++ b/checks/jolokia_generic
@@ -30,7 +30,7 @@ def parse_jolokia_generic(info):
for line in info:
instance, mbean, value, value_type = line
- item = instance + " " + mbean
+ item = instance + " MBean " + mbean
parsed[item] = {
"type" : value_type,
@@ -72,7 +72,7 @@ def check_jolokia_generic_string(item, params, parsed):
check_info["jolokia_generic.string"] = {
"inventory_function" : inventory_jolokia_generic_string,
"check_function" : check_jolokia_generic_string,
- "service_description" : "MBean %s",
+ "service_description" : "JVM %s",
"group" : "generic_string",
}
@@ -146,7 +146,7 @@ def check_jolokia_generic_rate(item, params, parsed):
check_info["jolokia_generic.rate"] = {
"inventory_function" : inventory_jolokia_generic_rate,
"check_function" : check_jolokia_generic_rate,
- "service_description" : "MBean %s",
+ "service_description" : "JVM %s",
"has_perfdata" : True,
"group" : "generic_rate",
}
@@ -220,7 +220,7 @@ check_info["jolokia_generic"] = {
"parse_function" : parse_jolokia_generic,
"inventory_function" : inventory_jolokia_generic,
"check_function" : check_jolokia_generic,
- "service_description" : "MBean %s",
+ "service_description" : "JVM %s",
"has_perfdata" : True,
"group" : "generic_number",
}