[checkmk-commits] checks/jolokia_metric: minor simplifications

Module: check_mk Branch: master Commit: f9b60052761e65ed799b20a1044716ae8e8e7d60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9b60052761e65… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 15 15:05:41 2018 +0100 checks/jolokia_metric: minor simplifications Change-Id: I46daadc16281db53a0e293cfebe795b7cdfa9ed2 --- checks/jolokia_metrics | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 9f16926..9978e13 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -69,7 +69,7 @@ factory_settings["jolokia_metrics_tp_default_levels"] = { def jolokia_metrics_parse(info): parsed = {} for line in info: - if line[1] == "ERROR": + if len(line) > 1 and line[1] == "ERROR": continue try: @@ -99,29 +99,27 @@ def jolokia_metrics_parse(info): parsed.setdefault(inst, {}) if 'type' in attributes: - bean_name = attributes['name'] - bean_type = attributes['type'] + bean_name = attributes.pop('name') + bean_type = attributes.pop('type') # backwards compatibility bean_type = {"GarbageCollector": "gc", "ThreadPool": "tp"}.get(bean_type, bean_type) # maybe do this for all types? if bean_type == "tp": bean_name = bean_name.replace('"', '') - parsed[inst].setdefault(bean_type, {}).setdefault(bean_name, {}) - parsed[inst][bean_type][bean_name][var] = value - for attr_key, attr_value in attributes.iteritems(): - if attr_key not in set(['name', 'type']): - parsed[inst][bean_type][bean_name][attr_key] = attr_value + bean = parsed[inst].setdefault(bean_type, {}).setdefault(bean_name, {}) + bean[var] = value + bean.update(attributes) else: if positional: app = positional[0] - parsed[inst].setdefault('apps', {}).setdefault(app, {}) + app_dict = parsed[inst].setdefault('apps', {}).setdefault(app, {}) if len(positional) > 1: servlet = positional[1] - parsed[inst]['apps'][app].setdefault('servlets', {}).setdefault(servlet, {}) - parsed[inst]['apps'][app]['servlets'][servlet][var] = value + app_dict.setdefault('servlets', {}).setdefault(servlet, {}) + app_dict['servlets'][servlet][var] = value else: - parsed[inst]['apps'][app][var] = value + app_dict[var] = value else: parsed[inst][var] = value return parsed