Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

Fix dependencies of core-related modules, part 7.

by Sven Panne

Module: check_mk Branch: master Commit: 5766f9e98598f5169e319ce471c8f3d664504c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5766f9e98598f5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 8 14:18:46 2018 +0200 Fix dependencies of core-related modules, part 7. Combine the config generation hook and the precompilation hook into a single data structure, see: https://refactoring.com/catalog/introduceParameterObject.html This dict (what else? ;-) acts as a pseudo-class for now. We will change that into a real class soon, removing some duplication on the way, too. Change-Id: I10ecfdbd46f6cf7c154e0370267f29d183d08db4 --- cmk_base/automations/check_mk.py | 47 ++++++++++++++++++++++++++++++---------- cmk_base/core.py | 10 ++++----- cmk_base/core_config.py | 14 ++++++------ cmk_base/discovery.py | 6 ++--- cmk_base/modes/check_mk.py | 17 ++++++++++----- 5 files changed, 62 insertions(+), 32 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 355bede..74f8f9f 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -721,6 +721,39 @@ class AutomationRestart(Automation): else: return "restart" + # TODO: _cmc_file, _create_config_hook, _precompile_hook, _create_core are copy-n-pasted from cmk_base.modes.check_mk. + @staticmethod + def _cmc_file(options): + return options["cmc-file"] if options and "cmc-file" in options else "config" + + + @staticmethod + def _create_config_hook(options): + from cmk_base.config import monitoring_core + if monitoring_core == "cmc": + from cmk_base.cee.core_cmc import create_config_hook as cch + create_config_hook = lambda: cch(AutomationRestart._cmc_file(options)) + else: + from cmk_base.core_nagios import create_config_hook + return create_config_hook + + + @staticmethod + def _precompile_hook(): + from cmk_base.config import monitoring_core + if monitoring_core == "cmc": + from cmk_base.cee.core_cmc import precompile_hook + else: + from cmk_base.core_nagios import precompile_hook + return precompile_hook + + + # TODO: Change this naive dict representation of a core object into a real class! + @staticmethod + def _create_core(options=None): + return {"create_config": AutomationRestart._create_config_hook(options), + "precompile": AutomationRestart._precompile_hook()} + # TODO: Cleanup duplicate code with cmk_base.core.do_restart() def execute(self, args): @@ -763,13 +796,9 @@ class AutomationRestart(Automation): else: backup_path = None + core = AutomationRestart._create_core() try: - if config.monitoring_core == "cmc": - from cmk_base.cee.core_cmc import create_config_hook as cch - create_config_hook = lambda: cch("config") - else: - from cmk_base.core_nagios import create_config_hook - configuration_warnings = core_config.create_core_config(create_config_hook) + configuration_warnings = core_config.create_core_config(core) try: from cmk_base.cee.agent_bakery import bake_on_restart @@ -788,11 +817,7 @@ class AutomationRestart(Automation): if backup_path: os.remove(backup_path) - if config.monitoring_core == "cmc": - from cmk_base.cee.core_cmc import precompile_hook - else: - from cmk_base.core_nagios import precompile_hook - precompile_hook() + core["precompile"]() cmk_base.core.do_core_action(self._mode()) else: diff --git a/cmk_base/core.py b/cmk_base/core.py index 39e6ce6..c540e23 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -60,12 +60,12 @@ _restart_lock_fd = None # | Invoke actions affecting the core like reload/restart | # '----------------------------------------------------------------------' -def do_reload(create_config_hook, precompile_hook): - do_restart(create_config_hook, precompile_hook, only_reload=True) +def do_reload(core): + do_restart(core, only_reload=True) # TODO: Cleanup duplicate code with automation_restart() -def do_restart(create_config_hook, precompile_hook, only_reload=False): +def do_restart(core, only_reload=False): try: backup_path = None @@ -83,7 +83,7 @@ def do_restart(create_config_hook, precompile_hook, only_reload=False): backup_path = None try: - core_config.do_create_config(create_config_hook, with_agents=True) + core_config.do_create_config(core, with_agents=True) except Exception, e: # TODO: Replace by MKBailOut()/MKTerminate()? console.error("Error creating configuration: %s\n" % e) @@ -97,7 +97,7 @@ def do_restart(create_config_hook, precompile_hook, only_reload=False): if backup_path: os.remove(backup_path) - precompile_hook() + core["precompile"]() do_core_action(only_reload and "reload" or "restart") else: diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index a045d0d..03544f2 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -218,10 +218,10 @@ def check_icmp_arguments_of(hostname, add_defaults=True, family=None): # '----------------------------------------------------------------------' # TODO: Move to modes? -def do_create_config(create_config_hook, with_agents): +def do_create_config(core, with_agents): console.output("Generating configuration for core (type %s)..." % config.monitoring_core) - create_core_config(create_config_hook) + create_core_config(core) console.output(tty.ok + "\n") if with_agents: @@ -232,12 +232,12 @@ def do_create_config(create_config_hook, with_agents): pass -def create_core_config(create_config_hook): +def create_core_config(core): initialize_warnings() _verify_non_duplicate_hosts() _verify_non_deprecated_checkgroups() - create_config_hook() + core["create_config"]() cmk.password_store.save(config.stored_passwords) return get_configuration_warnings() @@ -266,11 +266,11 @@ def _verify_non_duplicate_hosts(): "This might lead to invalid/incomplete monitoring for these hosts." % ", ".join(duplicates)) -def do_update(create_config_hook, precompile_hook, with_precompile): +def do_update(core, with_precompile): try: - do_create_config(create_config_hook, with_agents=with_precompile) + do_create_config(core, with_agents=with_precompile) if with_precompile: - precompile_hook() + core["precompile"]() except Exception, e: console.error("Configuration Error: %s\n" % e) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 95ad494..32137ec 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -461,7 +461,7 @@ def _get_autodiscovery_dir(): return cmk.paths.var_dir + '/autodiscovery' -def discover_marked_hosts(create_config_hook, precompile_hook): +def discover_marked_hosts(core): console.verbose("Doing discovery for all marked hosts:\n") autodiscovery_dir = _get_autodiscovery_dir() @@ -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": - cmk_base.core.do_reload(create_config_hook, precompile_hook) + cmk_base.core.do_reload(core) else: - cmk_base.core.do_restart(create_config_hook, precompile_hook) + cmk_base.core.do_restart(core) def _discover_marked_host(hostname, all_hosts, now_ts, oldest_queued): diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 57584d6..6f191c8 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1013,7 +1013,7 @@ def _cmc_file(options): return options["cmc-file"] if options and "cmc-file" in options else "config" -def _create_config_hook(options=None): +def _create_config_hook(options): from cmk_base.config import monitoring_core if monitoring_core == "cmc": from cmk_base.cee.core_cmc import create_config_hook as cch @@ -1032,9 +1032,14 @@ def _precompile_hook(): return precompile_hook +# TODO: Change this naive dict representation of a core object into a real class! +def _create_core(options=None): + return {"create_config": _create_config_hook(options), "precompile": _precompile_hook()} + + def mode_update_no_precompile(options): from cmk_base.core_config import do_update - do_update(_create_config_hook(options), _precompile_hook(), with_precompile=False) + do_update(_create_core(options), with_precompile=False) modes.register(Mode( long_option="update-no-precompile", @@ -1091,7 +1096,7 @@ modes.register(Mode( def mode_update(options): from cmk_base.core_config import do_update - do_update(_create_config_hook(options), _precompile_hook(), with_precompile=True) + do_update(_create_core(options), with_precompile=True) modes.register(Mode( long_option="update", @@ -1130,7 +1135,7 @@ modes.register(Mode( def mode_restart(): import cmk_base.core - cmk_base.core.do_restart(_create_config_hook(), _precompile_hook()) + cmk_base.core.do_restart(_create_core()) modes.register(Mode( long_option="restart", @@ -1152,7 +1157,7 @@ modes.register(Mode( def mode_reload(): import cmk_base.core - cmk_base.core.do_reload(_create_config_hook(), _precompile_hook()) + cmk_base.core.do_reload(_create_core()) modes.register(Mode( long_option="reload", @@ -1404,7 +1409,7 @@ modes.register(Mode( def mode_discover_marked_hosts(): import cmk_base.discovery as discovery - discovery.discover_marked_hosts(_create_config_hook(), _precompile_hook()) + discovery.discover_marked_hosts(_create_core()) modes.register(Mode( long_option="discover-marked-hosts",

6 years

Avoid dangerous hierarchical import in the middle of a function.

by Sven Panne

Module: check_mk Branch: master Commit: bd224c085ad3d1705db085bbdf2d782a34d88d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd224c085ad3d1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 8 16:48:18 2018 +0200 Avoid dangerous hierarchical import in the middle of a function. This shadows the upper names of the hierarchy in the code before the import. o_O Change-Id: Id41d00656b800492104253ca8dde01020ae86bfc --- cmk_base/automations/check_mk.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index f61f97e..355bede 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -37,14 +37,7 @@ import cmk_base.utils import cmk_base.console as console import cmk_base.config as config import cmk_base.rulesets as rulesets -# TODO: For some extremely obscure reason we can't simply import the module and -# use it in a qualified way in AutomationRestart.execute: It results in: -# -# UnboundLocalError: local variable 'cmk_base' referenced before assignment -# -# Doing exactly the same thing in e.g. AutomationDiscovery.execute works. o_O -# Leaving a funny identifier as an urgent reminder to figure out what's going on here... -import cmk_base.core as maxGNARK +import cmk_base.core import cmk_base.core_config as core_config import cmk_base.snmp as snmp import cmk_base.checks as checks @@ -231,7 +224,7 @@ class AutomationRenameHosts(Automation): # it now. core_was_running = self._core_is_running() if core_was_running: - maxGNARK.do_core_action("stop", quiet=True) + cmk_base.core.do_core_action("stop", quiet=True) try: for oldname, newname in renamings: @@ -729,7 +722,7 @@ class AutomationRestart(Automation): return "restart" - # TODO: Cleanup duplicate code with maxGNARK.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 @@ -760,7 +753,7 @@ class AutomationRestart(Automation): try: backup_path = None - if maxGNARK.try_get_activation_lock(): + if cmk_base.core.try_get_activation_lock(): raise MKAutomationError("Cannot activate changes. " "Another activation process is currently in progresss") @@ -779,8 +772,8 @@ class AutomationRestart(Automation): configuration_warnings = core_config.create_core_config(create_config_hook) try: - import cmk_base.cee.agent_bakery - cmk_base.cee.agent_bakery.bake_on_restart() + from cmk_base.cee.agent_bakery import bake_on_restart + bake_on_restart() except ImportError: pass @@ -801,7 +794,7 @@ class AutomationRestart(Automation): from cmk_base.core_nagios import precompile_hook precompile_hook() - maxGNARK.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())

6 years

Added workaround for arcane problem.

by Sven Panne

Module: check_mk Branch: master Commit: 9526089f0c0ab7a23db5cec235c8e10a3b493fd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9526089f0c0ab7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 8 16:11:25 2018 +0200 Added workaround for arcane problem. Change-Id: I6870f3a114a06083cea08695ece5126ee2b41e7f --- cmk_base/automations/check_mk.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 786d95b..f61f97e 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -37,7 +37,14 @@ 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 +# TODO: For some extremely obscure reason we can't simply import the module and +# use it in a qualified way in AutomationRestart.execute: It results in: +# +# UnboundLocalError: local variable 'cmk_base' referenced before assignment +# +# Doing exactly the same thing in e.g. AutomationDiscovery.execute works. o_O +# Leaving a funny identifier as an urgent reminder to figure out what's going on here... +import cmk_base.core as maxGNARK import cmk_base.core_config as core_config import cmk_base.snmp as snmp import cmk_base.checks as checks @@ -224,7 +231,7 @@ class AutomationRenameHosts(Automation): # it now. core_was_running = self._core_is_running() if core_was_running: - cmk_base.core.do_core_action("stop", quiet=True) + maxGNARK.do_core_action("stop", quiet=True) try: for oldname, newname in renamings: @@ -722,7 +729,7 @@ class AutomationRestart(Automation): return "restart" - # TODO: Cleanup duplicate code with cmk_base.core.do_restart() + # TODO: Cleanup duplicate code with maxGNARK.do_restart() def execute(self, args): # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if @@ -753,7 +760,7 @@ class AutomationRestart(Automation): try: backup_path = None - if cmk_base.core.try_get_activation_lock(): + if maxGNARK.try_get_activation_lock(): raise MKAutomationError("Cannot activate changes. " "Another activation process is currently in progresss") @@ -794,7 +801,7 @@ class AutomationRestart(Automation): from cmk_base.core_nagios import precompile_hook precompile_hook() - cmk_base.core.do_core_action(self._mode()) + maxGNARK.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())

6 years

5819 FIX Host DNS names may include underscores again

by Andreas

Module: check_mk Branch: master Commit: 142c5462ee79693eee711ba0050b7fd8c29b164a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=142c5462ee7969… Author: Andreas <ab(a)mathias-kettner.de> Date: Fri Jun 8 15:59:03 2018 +0200 5819 FIX Host DNS names may include underscores again Change-Id: I383982858ef338ba45aecf289a5249de57bcc42a --- .werks/5819 | 11 +++++++++++ web/htdocs/valuespec.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5819 b/.werks/5819 new file mode 100644 index 0000000..9dfad7f --- /dev/null +++ b/.werks/5819 @@ -0,0 +1,11 @@ +Title: Host DNS names may include underscores again +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1528466319 + + diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1f48a04..fd2ccd9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -854,7 +854,7 @@ class HostAddress(TextAscii): if re.match(r"[\d.]+$", hostname): return False - allowed = re.compile("(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE) + allowed = re.compile("(?!-)[A-Z_\d-]{1,63}(?<!-)$", re.IGNORECASE) return all(allowed.match(x) for x in hostname.split("."))

6 years

6221 FIX emc_datadomain_disks: Fix crash caused by missing busy data

by Konstantin Büttner

Module: check_mk Branch: master Commit: c1b21775ba384fe82d2a2152fb84affe46a4037b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1b21775ba384f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 7 17:55:05 2018 +0200 6221 FIX emc_datadomain_disks: Fix crash caused by missing busy data Some devices do not report busy stats for disks via SNMP. Previously, the check would crash, thus shadowing the status monitoring. This has been fixed. --- .werks/6221 | 12 ++++++++++++ checks/emc_datadomain_disks | 14 ++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/6221 b/.werks/6221 new file mode 100644 index 0000000..6567b5d --- /dev/null +++ b/.werks/6221 @@ -0,0 +1,12 @@ +Title: emc_datadomain_disks: Fix crash caused by missing busy data +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1528386821 + +Some devices do not report busy stats for disks via SNMP. Previously, the +check would crash, thus shadowing the status monitoring. This has been fixed. diff --git a/checks/emc_datadomain_disks b/checks/emc_datadomain_disks index dc68c51..7ff8705 100644 --- a/checks/emc_datadomain_disks +++ b/checks/emc_datadomain_disks @@ -46,14 +46,16 @@ def check_emc_datadomain_disks(item, _no_params, info): serial = line[4] capacity = line[5] dev_state = line[6] - index = int(line[7].split('.')[1]) - 1 - busy = info[1][index][0] dev_state_str = state_table.get(dev_state, ("Unknown",3))[0] dev_state_rc = state_table.get(dev_state, ("Unknown",3))[1] - infotext = "%s, busy %s%% - %s, Firmware %s, Serial %s, Capacity %s" \ - % ( dev_state_str, busy, model, firmware, serial, capacity ) - perfdata = [('busy', busy+"%" )] - return dev_state_rc, infotext,perfdata + yield dev_state_rc, dev_state_str + index = int(line[7].split('.')[1]) - 1 + if len(info[1]) > index: + busy = info[1][index][0] + perfdata = [('busy', busy+"%" )] + yield 0, "busy %s%%" % busy, perfdata + yield 0, "Model %s, Firmware %s, Serial %s, Capacity %s" % ( model, firmware, serial, capacity ) + check_info["emc_datadomain_disks"] = { "check_function" : check_emc_datadomain_disks,

6 years

Use fully qualified names in a few places.

by Sven Panne

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

6 years

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 01e4fae426d8532e653dd4b3f6bc1d367315b968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01e4fae426d853… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 8 13:06:01 2018 +0200 Removed dead code. Change-Id: Ia4cb7f334817f7ed78acdc85abca5a11094f1ba9 --- cmk_base/core.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmk_base/core.py b/cmk_base/core.py index fcec2ca..39e6ce6 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -46,11 +46,6 @@ from cmk_base.exceptions import MKTimeout from cmk_base import config_cache import cmk_base.cleanup -try: - import cmk_base.cee.core_cmc as core_cmc -except ImportError: - core_cmc = None - _restart_lock_fd = None #.

6 years

Removed healspaces-related stuff from Makefile.

by Sven Panne

Module: check_mk Branch: master Commit: 8d558e861d7484c5c72db13d1cc3cfc034b33185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d558e861d7484… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 8 11:11:33 2018 +0200 Removed healspaces-related stuff from Makefile. It was broken currently, anyway. Furthermore this is the wrong place to do such things, we have pylint/yapf/clang-format/... Change-Id: Ic4d76bc2615c15d12e616327d8808e02e83552c9 --- Makefile | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 10c47ea..da477c2 100644 --- a/Makefile +++ b/Makefile @@ -97,25 +97,6 @@ LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ api/python/{README,*.py} {nagios,nagios4}/{README,*.h} \ src/{Makefile.am,*.{cc,h}} standalone/config_files.m4 -# Files that are checked for trailing spaces -HEAL_SPACES_IN := checkman/* cmk_base/* checks/* notifications/* inventory/* \ - $$(find -name Makefile) livestatus/src/*.{cc,h} \ - web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ - doc/helpers/* scripts/setup.sh scripts/autodetect.py \ - $$(find pnp-templates -type f -name "*.php") \ - bin/mkeventd bin/*.cc active_checks/* \ - agents/check_mk_*agent* agents/*.c \ - $$(find agents/cfg_examples -type f) \ - agents/special/agent_* \ - agents/special/lib/cmk_special_agents.py \ - $$(find agents/plugins -type f) \ - $(wildcard enterprise/cmk_base/cee/*.py \ - enterprise/modules/*.py \ - enterprise/web/htdocs/*.py \ - enterprise/web/plugins/*/*/*.py) \ - $(wildcard managed/web/htdocs/*.py \ - managed/web/plugins/*/*/*.py) - FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/,*.cc *.h)) \ $(wildcard $(addprefix agents/windows/sections/,*.cc *.h)) \ @@ -135,9 +116,9 @@ JAVASCRIPT_MINI := $(patsubst %.js,%_min.js,$(JAVASCRIPT_SOURCES)) PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons managed/web/htdocs/images managed/web/htdocs/images/icons)) -.PHONY: all analyze build check check-binaries check-permissions check-spaces \ +.PHONY: all analyze build check check-binaries check-permissions \ check-version clean compile-neb-cmc cppcheck dist documentation format \ - GTAGS headers healspaces help install iwyu mrproper \ + GTAGS headers help install iwyu mrproper \ optimize-images packages setup setversion tidy version \ am--refresh skel @@ -158,19 +139,7 @@ deb: cma: $(MAKE) -C omd cma -check: check-spaces check-permissions check-binaries check-version - -check-spaces: - @echo -n "Checking for trailing spaces..." - @if grep -q '[[:space:]]$$' $(HEAL_SPACES_IN) ; then \ - echo FAILED ; \ - figlet "Space error"; \ - echo "Aborting due to trailing spaces. Please use 'make healspaces' to repair."; \ - echo "Affected files: "; \ - grep -l '[[:space:]]$$' $(HEAL_SPACES_IN); \ - exit 1; \ - fi - @echo OK +check: check-permissions check-binaries check-version check-permissions: @echo -n "Checking permissions... with find -not -perm -444..." && [ -z "$$(find -not -perm -444)" ] && echo OK @@ -352,10 +321,6 @@ endif headers: doc/helpers/headrify -healspaces: - @echo "Removing trailing spaces from code lines..." - @sed -ri 's/[[:space:]]+$$//g' $(HEAL_SPACES_IN) - optimize-images: @if type pngcrush >/dev/null 2>&1; then \ for F in $(PNG_FILES); do \

6 years

Enable trailing-newlines and trailing-whitespace checks.

by Sven Panne

6 years

update

by Andreas

Module: check_mk Branch: master Commit: 05aad5911b7f0b0768e182915e2a52d4b0f92115 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05aad5911b7f0b… Author: Andreas <ab(a)mathias-kettner.de> Date: Fri Jun 8 09:30:21 2018 +0200 update Change-Id: I13f8c7898a96d14cfded292a7e57442a3e304d74 --- cmk_base/data_sources/tcp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 31881a5..9dd2499 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -30,13 +30,13 @@ import socket import subprocess import cmk.debug -from cmk.exceptions import MKTerminate +from cmk.exceptions import MKTerminate, MKGeneralException import cmk_base.utils as utils import cmk_base.console as console import cmk_base.config as config import cmk_base.checks as checks -from cmk_base.exceptions import MKAgentError, MKEmptyAgentData, MKGeneralException +from cmk_base.exceptions import MKAgentError, MKEmptyAgentData from .abstract import DataSource, CheckMKAgentDataSource

6 years

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018