[checkmk-commits] mk_jolokia: include keys w/o default

Module: check_mk Branch: master Commit: 480a34220775def428d02b078e993aa2aa06e5ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480a34220775de… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 15:11:34 2019 +0100 mk_jolokia: include keys w/o default Change-Id: I2403358e69ac1fe22f1e23ac91779cf7f1e84a56 --- agents/plugins/mk_jolokia.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index e2a2524..4dafc96 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -549,12 +549,12 @@ def yield_configured_instances(): if os.path.exists(conffile): execfile(conffile, {}, custom_config) - # Compute list of instances to monitor. If the user has defined - # instances in his configuration, we will use this (a list - # of dicts). - instances = custom_config.pop("instances", [{}]) - for inst in instances: - yield {k: inst.get(k, custom_config[k]) for k in custom_config} + # Generate list of instances to monitor. If the user has defined + # instances in his configuration, we will use this (a list of dicts). + individual_configs = custom_config.pop("instances", [{}]) + for cfg in individual_configs: + keys = set(cfg.keys() + custom_config.keys()) + yield {k: cfg.get(k, custom_config[k]) for k in keys} def main(configs_iterable=None):