[checkmk-commits] Nagios: Cleanup duplicate attribute conmputation'

Module: check_mk Branch: master Commit: 44932a2f918b071fbc6384a255dc9d76bfec21bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44932a2f918b07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 17:18:33 2019 +0200 Nagios: Cleanup duplicate attribute conmputation' The extra_service_conf rulesets are already computed and merged using the generic CMC/Nagios core_config.get_service_attributes() at all call sites. There is no need for the _extra_conf_of() function anymore. CMK-2030 Change-Id: I3084c1b8d218b0fa2c72f2844c2d2a5efab7c80a --- cmk_base/core_nagios.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 22783ab..3ebad36 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -824,22 +824,10 @@ def _extra_service_conf_of(cfg, config_cache, hostname, description): service_spec["service_groups"] = ",".join(sergr) if config.define_servicegroups: cfg.servicegroups_to_define.update(sergr) - service_spec.update( - _extra_conf_of(config_cache, config.extra_service_conf, hostname, description)) return service_spec -def _extra_conf_of(config_cache, confdict, hostname, service): - result = {} - for key, conflist in confdict.items(): - values = config_cache.service_extra_conf(hostname, service, conflist) - if values: - result[key] = values[0] - - return result - - #. # .--Precompile----------------------------------------------------------. # | ____ _ _ |