Module: check_mk
Branch: master
Commit: ac4624fe255cce5ba58cd614f33bbcc6631bd6e6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac4624fe255cce…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Thu Jan 24 13:04:49 2019 +0100
mk_jolokia: refactor towards instance class (5)
Change-Id: I60fb7755e5cab05bad74aa1ea46d7f41146b77d4
---
agents/plugins/mk_jolokia.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py
index ed20775..36125ba 100755
--- a/agents/plugins/mk_jolokia.py
+++ b/agents/plugins/mk_jolokia.py
@@ -228,6 +228,9 @@ class JolokiaInstance(object):
self.config = self._sanitize_config(config)
self.name = self.config["instance"]
+ self.product = self.config["product"]
+ self.custom_vars = self.config.get("custom_vars", [])
+
self.base_url = self._get_base_url()
def _get_base_url(self):
@@ -413,10 +416,10 @@ def query_instance(inst):
write_section('jolokia_info', generate_jolokia_info(inst))
- shipped_vars = QUERY_SPECS_GENERIC +
QUERY_SPECS_SPECIFIC.get(inst.config["product"], [])
+ shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst.product, [])
write_section('jolokia_metrics', generate_values(inst, shipped_vars))
- write_section('jolokia_generic', generate_values(inst,
inst.config.get("custom_vars")))
+ write_section('jolokia_generic', generate_values(inst, inst.custom_vars))
class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler):
@@ -518,8 +521,8 @@ def generate_jolokia_info(inst):
info_dict = dict(server_info)
version = info_dict.get(('info', 'version'), "unknown")
product = info_dict.get(('info', 'product'), "unknown")
- if inst.config.get("product"):
- product = inst.config["product"]
+ if inst.product:
+ product = inst.product
agentversion = info_dict.get(('agent',), "unknown")
yield inst.name, product, version, agentversion