Module: check_mk
Branch: master
Commit: 5786e0f29155e5d6fafba4822064d36cb9f0bdce
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5786e0f29155e5…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Jan 25 14:34:42 2017 +0100
jolokia_metrics.{gc,tp}: Store dict-based default params in factory_settings
Change-Id: I5cc34d6c70a0b4b4c0ccdc0dc4a0db82450bb650
---
checks/jolokia_metrics | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics
index 8af0feb..d151ea8 100644
--- a/checks/jolokia_metrics
+++ b/checks/jolokia_metrics
@@ -53,13 +53,13 @@ jolokia_metrics_serv_req_default_levels = (-1, -1, 5000, 6000)
jolokia_metrics_queue_default_levels = ( 20, 50 )
# Garbage collections count and time per minute
-jolokia_metrics_gc_default_levels = {
+factory_settings["jolokia_metrics_gc_default_levels"] = {
'CollectionTime': (None, None),
'CollectionCount': (None, None)
}
# Tomcat ThreadPools Count/Busy in relation to max value
-jolokia_metrics_tp_default_levels = {
+factory_settings["jolokia_metrics_tp_default_levels"] = {
'currentThreadsBusy': (80, 90),
'currentThreadsCount': (None, None)
}
@@ -383,12 +383,11 @@ check_info["jolokia_metrics.serv_req"] = {
def inventory_jolokia_metrics_gc(info):
inv = []
parsed = jolokia_metrics_parse(info)
- levels = None
for inst, vals in parsed.iteritems():
if vals == None:
continue # no data from agent
for gc, val in vals.get('gc', {}).iteritems():
- inv.append(("%s GC %s" % (inst ,gc) , levels))
+ inv.append(("%s GC %s" % (inst ,gc) , {}))
return inv
@@ -440,11 +439,12 @@ def check_jolokia_metrics_gc(item, params, info):
check_info["jolokia_metrics.gc"] = {
- "service_description" : "JVM %s",
- "check_function" : check_jolokia_metrics_gc,
- "inventory_function" : inventory_jolokia_metrics_gc,
- "group" : "jvm_gc",
- "has_perfdata" : True,
+ "default_levels_variable" :
"jolokia_metrics_gc_default_levels",
+ "service_description" : "JVM %s",
+ "check_function" : check_jolokia_metrics_gc,
+ "inventory_function" : inventory_jolokia_metrics_gc,
+ "group" : "jvm_gc",
+ "has_perfdata" : True,
}
#.
@@ -466,12 +466,11 @@ check_info["jolokia_metrics.gc"] = {
def inventory_jolokia_metrics_tp(info):
inv = []
parsed = jolokia_metrics_parse(info)
- levels = 'jolokia_metrics_tp_default_levels'
for inst, vals in parsed.iteritems():
if vals == None:
continue # no data from agent
for tp, val in vals.get('tp', {}).iteritems():
- inv.append(("%s ThreadPool %s" % (inst ,tp) , levels))
+ inv.append(("%s ThreadPool %s" % (inst ,tp) , {}))
return inv
@@ -544,11 +543,12 @@ def check_jolokia_metrics_tp(item, params, info):
check_info["jolokia_metrics.tp"] = {
- "service_description" : "JVM %s",
- "check_function" : check_jolokia_metrics_tp,
- "inventory_function" : inventory_jolokia_metrics_tp,
- "group" : "jvm_tp",
- "has_perfdata" : True,
+ "default_levels_variable" :
"jolokia_metrics_tp_default_levels",
+ "service_description" : "JVM %s",
+ "check_function" : check_jolokia_metrics_tp,
+ "inventory_function" : inventory_jolokia_metrics_tp,
+ "group" : "jvm_tp",
+ "has_perfdata" : True,
}
#.