[checkmk-commits] Use fully qualified names in a few places.

Module: check_mk Branch: master Commit: 9098675e5e4d3ce8878e76d8a1588598c7f44b31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9098675e5e4d3c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 8 13:04:53 2018 +0200 Use fully qualified names in a few places. We will have a "core" parameter later, so things would get confusing then. Change-Id: I4c8f3b0bb906f7af8d27ac3e7e545ef52546c0ba --- cmk_base/automations/check_mk.py | 10 +++++----- cmk_base/checking.py | 6 +++--- cmk_base/discovery.py | 6 +++--- cmk_base/events.py | 6 +++--- cmk_base/modes/check_mk.py | 12 ++++++------ cmk_base/notify.py | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index e025479..786d95b 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -37,7 +37,7 @@ import cmk_base.utils import cmk_base.console as console import cmk_base.config as config import cmk_base.rulesets as rulesets -import cmk_base.core as core +import cmk_base.core import cmk_base.core_config as core_config import cmk_base.snmp as snmp import cmk_base.checks as checks @@ -224,7 +224,7 @@ class AutomationRenameHosts(Automation): # it now. core_was_running = self._core_is_running() if core_was_running: - core.do_core_action("stop", quiet=True) + cmk_base.core.do_core_action("stop", quiet=True) try: for oldname, newname in renamings: @@ -722,7 +722,7 @@ class AutomationRestart(Automation): return "restart" - # TODO: Cleanup duplicate code with core.do_restart() + # TODO: Cleanup duplicate code with cmk_base.core.do_restart() def execute(self, args): # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if @@ -753,7 +753,7 @@ class AutomationRestart(Automation): try: backup_path = None - if core.try_get_activation_lock(): + if cmk_base.core.try_get_activation_lock(): raise MKAutomationError("Cannot activate changes. " "Another activation process is currently in progresss") @@ -794,7 +794,7 @@ class AutomationRestart(Automation): from cmk_base.core_nagios import precompile_hook precompile_hook() - core.do_core_action(self._mode()) + cmk_base.core.do_core_action(self._mode()) else: broken_config_path = "%s/check_mk_objects.cfg.broken" % cmk.paths.tmp_dir file(broken_config_path, "w").write(file(cmk.paths.nagios_objects_file).read()) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 2732252..fee5656 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -46,7 +46,7 @@ import cmk_base.snmp as snmp import cmk_base.ip_lookup as ip_lookup import cmk_base.data_sources as data_sources import cmk_base.item_state as item_state -import cmk_base.core as core +import cmk_base.core import cmk_base.check_table as check_table from cmk_base.exceptions import MKTimeout, MKParseFunctionError, MKIPAddressLookupError, \ MKAgentError, MKSNMPError @@ -273,7 +273,7 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i # Skip checks that are not in their check period period = config.check_period_of(hostname, description) - if period and not core.check_timeperiod(period): + if period and not cmk_base.core.check_timeperiod(period): console.verbose("Skipping service %s: currently not in timeperiod %s.\n" % (description, period)) return False @@ -370,7 +370,7 @@ def _determine_check_params(params): if isinstance(params, dict) and "tp_default_value" in params: for timeperiod, tp_params in params["tp_values"]: try: - tp_result = core.timeperiod_active(timeperiod) + tp_result = cmk_base.core.timeperiod_active(timeperiod) except: if cmk.debug.enabled(): raise diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 0e5a73d..95ad494 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -50,7 +50,7 @@ import cmk_base.snmp as snmp import cmk_base.checking as checking import cmk_base.data_sources as data_sources import cmk_base.check_table as check_table -import cmk_base.core as core +import cmk_base.core from cmk_base.exceptions import MKAgentError, MKParseFunctionError, \ MKSNMPError, MKTimeout import cmk_base.cleanup @@ -497,9 +497,9 @@ def discover_marked_hosts(create_config_hook, precompile_hook): if activation_required: console.verbose("\nRestarting monitoring core with updated configuration...\n") if config.monitoring_core == "cmc": - core.do_reload(create_config_hook, precompile_hook) + cmk_base.core.do_reload(create_config_hook, precompile_hook) else: - core.do_restart(create_config_hook, precompile_hook) + cmk_base.core.do_restart(create_config_hook, precompile_hook) def _discover_marked_host(hostname, all_hosts, now_ts, oldest_queued): diff --git a/cmk_base/events.py b/cmk_base/events.py index d6bf254..fe77763 100644 --- a/cmk_base/events.py +++ b/cmk_base/events.py @@ -43,7 +43,7 @@ from cmk.regex import regex import cmk_base.config as config import cmk_base.rulesets as rulesets -import cmk_base.core as core +import cmk_base.core def event_keepalive(event_function, log_function, call_every_loop=None, loop_interval=None, shutdown_function=None): last_config_timestamp = config_timestamp() @@ -60,7 +60,7 @@ def event_keepalive(event_function, log_function, call_every_loop=None, loop_int while True: try: # Invalidate timeperiod caches - core.cleanup_timeperiod_caches() + cmk_base.core.cleanup_timeperiod_caches() # If the configuration has changed, we do a restart. But we do # this check just before the next event arrives. We must @@ -688,7 +688,7 @@ def event_match_checktype(rule, context): def event_match_timeperiod(rule): if "match_timeperiod" in rule: timeperiod = rule["match_timeperiod"] - if timeperiod != "24X7" and not core.check_timeperiod(timeperiod): + if timeperiod != "24X7" and not cmk_base.core.check_timeperiod(timeperiod): return "The timeperiod '%s' is currently not active." % timeperiod diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index aae74c9..57584d6 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1069,8 +1069,8 @@ modes.register(Mode( # '----------------------------------------------------------------------' def mode_compile(): - import cmk_base.core_nagios as core_nagios - core_nagios.precompile_hostchecks() + import cmk_base.core_nagios + cmk_base.core_nagios.precompile_hostchecks() modes.register(Mode( long_option="compile", @@ -1129,8 +1129,8 @@ modes.register(Mode( # '----------------------------------------------------------------------' def mode_restart(): - import cmk_base.core as core - core.do_restart(_create_config_hook(), _precompile_hook()) + import cmk_base.core + cmk_base.core.do_restart(_create_config_hook(), _precompile_hook()) modes.register(Mode( long_option="restart", @@ -1151,8 +1151,8 @@ modes.register(Mode( # '----------------------------------------------------------------------' def mode_reload(): - import cmk_base.core as core - core.do_reload(_create_config_hook(), _precompile_hook()) + import cmk_base.core + cmk_base.core.do_reload(_create_config_hook(), _precompile_hook()) modes.register(Mode( long_option="reload", diff --git a/cmk_base/notify.py b/cmk_base/notify.py index cf1e6f4..87d28b7 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -54,7 +54,7 @@ import cmk_base.utils import cmk_base.config as config import cmk_base.rulesets as rulesets import cmk_base.console as console -import cmk_base.core as core +import cmk_base.core import cmk_base.events as events try: @@ -688,7 +688,7 @@ def rbn_get_bulk_params(rule): return params elif method == "timeperiod": try: - active = core.timeperiod_active(params["timeperiod"]) + active = cmk_base.core.timeperiod_active(params["timeperiod"]) except: if cmk.debug.enabled(): raise @@ -1131,7 +1131,7 @@ def should_notify(context, entry): if "timeperiod" in entry: timeperiod = entry["timeperiod"] if timeperiod and timeperiod != "24X7": - if not core.check_timeperiod(timeperiod): + if not cmk_base.core.check_timeperiod(timeperiod): notify_log(" - Skipping: time period %s is currently not active" % timeperiod) return False return True @@ -1631,7 +1631,7 @@ def find_bulks(only_ripe): bulks.append((bulk_dir, age, interval, 'n.a.', count, uuids)) else: try: - active = core.timeperiod_active(timeperiod) + active = cmk_base.core.timeperiod_active(timeperiod) except: # This prevents sending bulk notifications if a # livestatus connection error appears. It also implies