[checkmk-commits] Fixed merge issues

Module: check_mk Branch: master Commit: 030ad109cd34ca2e26bcb318cc174dc90017f4f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=030ad109cd34ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 17:06:06 2018 +0200 Fixed merge issues Change-Id: I8fa658d1000beb763be177af2e2cc2133541e86a --- cmk_base/automations/check_mk.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 2fd244f..32c0c0c 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -523,8 +523,6 @@ class AutomationAnalyseServices(Automation): # TODO: Was ist mit Clustern??? # TODO: Klappt das mit automatischen verschatten von SNMP-Checks (bei dual Monitoring) def execute(self, args): - import cmk_base.check_table as check_table - hostname = args[0] servicedesc = args[1].decode("utf-8") check_api_utils.set_hostname(hostname) @@ -1430,7 +1428,7 @@ class AutomationGetServiceConfigurations(Automation): # legacy checks via active_checks actchecks = [] for acttype, rules in config.active_checks.iteritems(): - entries = rulesets.host_extra_conf(hostname, rules) + entries = config.host_extra_conf(hostname, rules) for params in entries: description = config.active_check_service_description(hostname, acttype, params) actchecks.append((acttype, description, params)) @@ -1438,9 +1436,8 @@ class AutomationGetServiceConfigurations(Automation): def _get_checkgroup_of_checks(self): checkgroup_of_checks = {} - for check_plugin_name, check in checks.check_info.items(): + for check_plugin_name, check in config.check_info.items(): checkgroup_of_checks[check_plugin_name] = check.get("group") return checkgroup_of_checks automations.register(AutomationGetServiceConfigurations()) -