Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

Moved translate_piggyback_host where it belongs.

by Sven Panne

Module: check_mk Branch: master Commit: 65c7fb7835e8b5b2a4b2a7fc569dc3e74df2a83c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65c7fb7835e8b5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jun 12 10:13:50 2018 +0200 Moved translate_piggyback_host where it belongs. This was a clear case of feature envy, see: https://refactoring.guru/smells/feature-envy Furthermore, this decouples the import cycle between config and rulesets a bit, which is a step in the right direction... Change-Id: I9c53a870248cd63acd022857d3ef739ae73e612f --- cmk_base/config.py | 15 ++++++++++++++- cmk_base/data_sources/abstract.py | 3 +-- cmk_base/piggyback.py | 13 ------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 6c43e81..6984ad2 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -1455,7 +1455,20 @@ def decode_incoming_string(s, encoding="utf-8"): return s.decode(fallback_agent_output_encoding) -def get_piggyback_translations(hostname): +def translate_piggyback_host(sourcehost, backedhost): + translation = _get_piggyback_translations(sourcehost) + + # To make it possible to match umlauts we need to change the hostname + # to a unicode string which can then be matched with regexes etc. + # We assume the incoming name is correctly encoded in UTF-8 + backedhost = decode_incoming_string(backedhost) + + translated = cmk.translations.translate_hostname(translation, backedhost) + + return translated.encode('utf-8') # change back to UTF-8 encoded string + + +def _get_piggyback_translations(hostname): """Get a dict that specifies the actions to be done during the hostname translation""" rules = rulesets.host_extra_conf(hostname, piggyback_translation) translations = {} diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 7afea91..c002f33 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -42,7 +42,6 @@ import cmk_base.utils import cmk_base.console as console import cmk_base.config as config import cmk_base.ip_lookup as ip_lookup -import cmk_base.piggyback as piggyback import cmk_base.checks as checks import cmk_base.check_api as check_api from cmk_base.exceptions import MKSkipCheck, MKAgentError, MKEmptyAgentData, MKSNMPError, \ @@ -627,7 +626,7 @@ class CheckMKAgentDataSource(DataSource): if not host: host = None else: - host = piggyback.translate_piggyback_host(self._hostname, host) + host = config.translate_piggyback_host(self._hostname, host) if host == self._hostname: host = None # unpiggybacked "normal" host diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index 9309928..ecf6eef 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -151,19 +151,6 @@ def store_piggyback_raw_data(sourcehost, piggybacked_raw_data): remove_source_status_file(sourcehost) -def translate_piggyback_host(sourcehost, backedhost): - translation = config.get_piggyback_translations(sourcehost) - - # To make it possible to match umlauts we need to change the hostname - # to a unicode string which can then be matched with regexes etc. - # We assume the incoming name is correctly encoded in UTF-8 - backedhost = config.decode_incoming_string(backedhost) - - translated = cmk.translations.translate_hostname(translation, backedhost) - - return translated.encode('utf-8') # change back to UTF-8 encoded string - - def cleanup_piggyback_files(): """This is a housekeeping job to clean up different old files from the piggyback directories.

6 years

6132 FIX ipmi_sensors.include: Treat states 'S0G0' ( System full operational, working) and 'System Restart' as 'OK'

by Simon Betz

Module: check_mk Branch: master Commit: 5fd95ad9e389749d42894b6850ca1a8aa430eb97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fd95ad9e38974… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 12 09:26:08 2018 +0200 6132 FIX ipmi_sensors.include: Treat states 'S0G0' (System full operational, working) and 'System Restart' as 'OK' Change-Id: I8aff3bce59ade97b81319b0f8e735af1f3bbacfc --- .werks/6132 | 10 ++++++++++ checks/ipmi_common.include | 2 ++ checks/ipmi_sensors.include | 13 +++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/6132 b/.werks/6132 new file mode 100644 index 0000000..2d3a3ec --- /dev/null +++ b/.werks/6132 @@ -0,0 +1,10 @@ +Title: ipmi_sensors.include: Treat states 'S0G0' (System full operational, working) and 'System Restart' as 'OK' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1528788266 +Class: fix + + diff --git a/checks/ipmi_common.include b/checks/ipmi_common.include index e568fe8..8a0a65e 100644 --- a/checks/ipmi_common.include +++ b/checks/ipmi_common.include @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +#TODO Cleanup the whole status text mapping in +# ipmi_common.include, ipmi_sensors.include, ipmi def ipmi_ignore_entry(name, status_txt, rules): if status_txt is None: diff --git a/checks/ipmi_sensors.include b/checks/ipmi_sensors.include index 5c6eb73..e607881 100644 --- a/checks/ipmi_sensors.include +++ b/checks/ipmi_sensors.include @@ -113,7 +113,7 @@ def parse_freeipmi(info): def add_valid_values(values): for key, value, ty in values: if value not in [ "NA", "N/A" ]: - parsed[sensorname][key] = ty(value) + instance[key] = ty(value) parsed = {} for line in info: @@ -125,11 +125,13 @@ def parse_freeipmi(info): status_txt = status_txt[:-1] if status_txt in [ "NA", "N/A", "Unknown" ] or "_=_" in status_txt: status_txt = None + elif status_txt == "S0G0": + status_txt = "System full operational, working" else: status_txt = status_txt.replace("_", " ") sensorname = stripped_line[1].replace(" ", "_") - parsed.setdefault(sensorname, { + instance = parsed.setdefault(sensorname, { "value" : None, "unit" : None, "status_txt" : status_txt, @@ -187,8 +189,11 @@ def inventory_freeipmi(parsed): def freeipmi_status_txt_mapping(status_txt): if status_txt is None: return 3 - elif status_txt in [ "OK", "Entity Present", "battery presence detected", - "Drive Presence", "transition to Running", "Device Enabled" ] or \ + elif status_txt in [ + "OK", "Entity Present", "battery presence detected", + "Drive Presence", "transition to Running", "Device Enabled", + "System full operational, working", "System Restart", + ] or \ status_txt.startswith("Fully Redundant") or \ status_txt.endswith("is connected") or \ status_txt.endswith("Presence detected") or \

6 years

Removed two import cycles related to inventory plugins.

by Sven Panne

Module: check_mk Branch: master Commit: 961a714bdc628bef65aaf9cde06b6fbfb83bd1fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=961a714bdc628b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 11 14:33:21 2018 +0200 Removed two import cycles related to inventory plugins. This brings the number of cycles down to 6 (from 8). Change-Id: I75a703fa39827c01fdf4f1bcca9ab5342273ae02 --- cmk_base/checking.py | 2 +- cmk_base/inventory.py | 20 ++++++++++++++++++++ cmk_base/inventory_plugins.py | 30 ++++-------------------------- cmk_base/modes/check_mk.py | 4 ++-- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index fee5656..03160c0 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -394,7 +394,7 @@ def _do_status_data_inventory(sources, multi_host_sections, hostname, ipaddress) import cmk_base.inventory as inventory import cmk_base.inventory_plugins as inventory_plugins do_inv = False - inventory_plugins.load() + inventory_plugins.load_plugins(inventory.get_inventory_context) for section_name, plugin in inventory_plugins.inv_info.items(): section_content = multi_host_sections.get_section_content(hostname, ipaddress, section_name, for_discovery=False) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 1238b61..a1a4619 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -369,3 +369,23 @@ def _run_inventory_export_hooks(hostname, inventory_tree): raise raise MKGeneralException("Failed to execute export hook %s: %s" % ( hookname, e)) + +#. +# .--Plugin API----------------------------------------------------------. +# | ____ _ _ _ ____ ___ | +# | | _ \| |_ _ __ _(_)_ __ / \ | _ \_ _| | +# | | |_) | | | | |/ _` | | '_ \ / _ \ | |_) | | | +# | | __/| | |_| | (_| | | | | | / ___ \| __/| | | +# | |_| |_|\__,_|\__, |_|_| |_| /_/ \_\_| |___| | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Helper API for being used in inventory plugins. Plugins have access | +# | to all things defined by the regular Check_MK check API and all the | +# | things declared here. | +# '----------------------------------------------------------------------' + +def get_inventory_context(): + return [ + ("inv_tree_list", inv_tree_list), + ("inv_tree", inv_tree), + ] diff --git a/cmk_base/inventory_plugins.py b/cmk_base/inventory_plugins.py index c2de150..c9465dd 100644 --- a/cmk_base/inventory_plugins.py +++ b/cmk_base/inventory_plugins.py @@ -32,7 +32,6 @@ from cmk.exceptions import MKGeneralException import cmk_base.checks as checks import cmk_base.check_api as check_api import cmk_base.console as console -import cmk_base.inventory import cmk_base.check_utils # Inventory plugins have dependencies to check plugins and the inventory @@ -48,7 +47,7 @@ _plugin_contexts = {} # The checks are loaded into this dictionary. Each check _include_contexts = {} # These are the contexts of the check include files -def load(): # pylint: disable=function-redefined +def load_plugins(get_inventory_context): loaded_files = set() filelist = checks.get_plugin_paths(cmk.paths.local_inventory_dir, cmk.paths.inventory_dir) @@ -62,7 +61,7 @@ def load(): # pylint: disable=function-redefined continue # skip already loaded files (e.g. from local) try: - plugin_context = _new_inv_context() + plugin_context = _new_inv_context(get_inventory_context) known_plugins = inv_info.keys() _load_plugin_includes(f, plugin_context) @@ -81,7 +80,7 @@ def load(): # pylint: disable=function-redefined _plugin_contexts[check_plugin_name] = plugin_context -def _new_inv_context(): +def _new_inv_context(get_inventory_context): # Add the data structures where the inventory plugins register with Check_MK context = { "inv_info" : inv_info, @@ -92,7 +91,7 @@ def _new_inv_context(): # # For better separation it would be better to copy the check API objects, but # this might consume too much memory. So we simply reference it. - for k, v in check_api._get_check_context() + _get_inventory_context(): + for k, v in check_api._get_check_context() + get_inventory_context(): context[k] = v return context @@ -133,24 +132,3 @@ def is_snmp_plugin(plugin_type): section_name = cmk_base.check_utils.section_name_of(plugin_type) return "snmp_info" in inv_info.get(section_name, {}) \ or cmk_base.check_utils.is_snmp_check(plugin_type) - - -#. -# .--Plugin API----------------------------------------------------------. -# | ____ _ _ _ ____ ___ | -# | | _ \| |_ _ __ _(_)_ __ / \ | _ \_ _| | -# | | |_) | | | | |/ _` | | '_ \ / _ \ | |_) | | | -# | | __/| | |_| | (_| | | | | | / ___ \| __/| | | -# | |_| |_|\__,_|\__, |_|_| |_| /_/ \_\_| |___| | -# | |___/ | -# +----------------------------------------------------------------------+ -# | Helper API for being used in inventory plugins. Plugins have access | -# | to all things defined by the regular Check_MK check API and all the | -# | things declared here. | -# '----------------------------------------------------------------------' - -def _get_inventory_context(): - return [ - ("inv_tree_list", cmk_base.inventory.inv_tree_list), - ("inv_tree", cmk_base.inventory.inv_tree), - ] diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 695796b..243d8e5 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1208,7 +1208,7 @@ def mode_inventory(options, args): import cmk_base.inventory as inventory import cmk_base.data_sources as data_sources import cmk_base.inventory_plugins as inventory_plugins - inventory_plugins.load() + inventory_plugins.load_plugins(inventory.get_inventory_context) if args: hostnames = modes.parse_hostname_list(args, with_clusters=True) @@ -1259,7 +1259,7 @@ modes.register(Mode( def mode_inventory_as_check(options, hostname): import cmk_base.inventory as inventory import cmk_base.inventory_plugins as inventory_plugins - inventory_plugins.load() + inventory_plugins.load_plugins(inventory.get_inventory_context) return inventory.do_inv_check(hostname, options)

6 years

Removed unused parameter. Reduced scope of funcion.

by Sven Panne

Module: check_mk Branch: master Commit: cf7feae25d9765cb6e3c79591863e4285b2c6868 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf7feae25d9765… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 11 14:01:07 2018 +0200 Removed unused parameter. Reduced scope of funcion. Change-Id: I8629139c465bbb89b671dfbf3acded09a2f88bce --- cmk_base/inventory_plugins.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk_base/inventory_plugins.py b/cmk_base/inventory_plugins.py index 4db511f..c2de150 100644 --- a/cmk_base/inventory_plugins.py +++ b/cmk_base/inventory_plugins.py @@ -62,10 +62,10 @@ def load(): # pylint: disable=function-redefined continue # skip already loaded files (e.g. from local) try: - plugin_context = _new_inv_context(f) + plugin_context = _new_inv_context() known_plugins = inv_info.keys() - load_plugin_includes(f, plugin_context) + _load_plugin_includes(f, plugin_context) execfile(f, plugin_context) loaded_files.add(file_name) @@ -81,7 +81,7 @@ def load(): # pylint: disable=function-redefined _plugin_contexts[check_plugin_name] = plugin_context -def _new_inv_context(plugin_file_path): +def _new_inv_context(): # Add the data structures where the inventory plugins register with Check_MK context = { "inv_info" : inv_info, @@ -101,7 +101,7 @@ def _new_inv_context(plugin_file_path): # Load the definitions of the required include files for this check # Working with imports when specifying the includes would be much cleaner, # sure. But we need to deal with the current check API. -def load_plugin_includes(check_file_path, plugin_context): +def _load_plugin_includes(check_file_path, plugin_context): for include_file_name in checks.includes_of_plugin(check_file_path): include_file_path = os.path.join(cmk.paths.inventory_dir, include_file_name)

6 years

fixed broken integration test, couldn' t handle cyclic dependencies views.py<->sla.py

by Andreas

Module: check_mk Branch: master Commit: e1e660b5f97f05c0f784fbea8640b0c5fcc513eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e660b5f97f05… Author: Andreas <ab(a)mathias-kettner.de> Date: Mon Jun 11 15:05:37 2018 +0200 fixed broken integration test, couldn't handle cyclic dependencies views.py<->sla.py Change-Id: Iad893a93c23ffa71655d603fbcde9c7b9782b8c1 --- web/htdocs/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 12aac91..2565e85 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -37,9 +37,6 @@ from gui_exceptions import MKGeneralException, MKUserError, MKInternalError import cmk.paths -if not cmk.is_raw_edition(): - import sla - # Datastructures and functions needed before plugins can be loaded loaded_with_language = False display_options = None @@ -1665,7 +1662,9 @@ def show_view(view, show_heading = False, show_buttons = True, if "host_name" in row: row["host_inventory"] = inventory.load_tree(row["host_name"]) + if not cmk.is_raw_edition(): + import sla sla_params = [] for cell in cells: if cell.painter_name() in ["sla_specific", "sla_fixed"]:

6 years

6131 FIX brocade_fcport: Fixed wrong look up of indices which might lead to stale services

by Simon Betz

Module: check_mk Branch: master Commit: af4efaf75de4f8b4948061e67a7ef04f0060352d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af4efaf75de4f8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 11 14:43:17 2018 +0200 6131 FIX brocade_fcport: Fixed wrong look up of indices which might lead to stale services Change-Id: Ie6f723aa77b6ffefee0c6ed8b093d2d8d058db9a --- .werks/6131 | 10 ++++++++++ checks/brocade_fcport | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6131 b/.werks/6131 new file mode 100644 index 0000000..377e798 --- /dev/null +++ b/.werks/6131 @@ -0,0 +1,10 @@ +Title: brocade_fcport: Fixed wrong look up of indices which might lead to stale services +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1528720852 +Class: fix + + diff --git a/checks/brocade_fcport b/checks/brocade_fcport index d3e5f1b..a2e3ff7 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -132,11 +132,12 @@ def parse_brocade_fcport(info): c3discards, brocade_speed, portname, porttype, ifspeed in if_table: # Since FW v8.0.1b [rx/tx]words are no longer available + # Use 64bit counters if available bbcredits = None - if txwords == "" or rxwords == "": + if len(if64_info) > 0: fcmgmt_portstats = [] for oidend, tx_elements, rx_elements, bbcredits_64 in if64_info: - if index == int(oidend.split(".")[-1]): + if index == oidend.split(".")[-1]: fcmgmt_portstats = [ binstring_to_int(tx_elements), binstring_to_int(rx_elements), binstring_to_int(bbcredits_64) ]

6 years

Make the monitoring core an abstract class with 2 concrete implementations.

by Sven Panne

Module: check_mk Branch: master Commit: 0c53533873306298564486f22aafab741baaf45d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c535338733062… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 11 12:17:24 2018 +0200 Make the monitoring core an abstract class with 2 concrete implementations. Probably lots of stuff should really be moved into NagiosCore and CMC, but this is left as an easy exercise for the reader... ;-) More seriously: The current state is structurally the correct way to handle the different cores, moving functionality into the subclasses and nuking non-OO comparisons like 'monitoring_core == "cmc"' on the way can be done incrementally later. Change-Id: Ia41316a30419b50ab89716822c451a4bed5a4fce --- cmk_base/automations/check_mk.py | 2 +- cmk_base/core.py | 2 +- cmk_base/core_config.py | 22 ++++++++++++++++++++-- cmk_base/core_factory.py | 32 ++++++-------------------------- cmk_base/core_nagios.py | 26 ++++++++++++++------------ 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 6d79c74..672438b 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -784,7 +784,7 @@ class AutomationRestart(Automation): if backup_path: os.remove(backup_path) - core["precompile"]() + core.precompile() cmk_base.core.do_core_action(self._mode()) else: diff --git a/cmk_base/core.py b/cmk_base/core.py index c540e23..aa63a36 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -97,7 +97,7 @@ def do_restart(core, only_reload=False): if backup_path: os.remove(backup_path) - core["precompile"]() + 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 03544f2..d913099 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import abc import os import sys @@ -40,6 +41,23 @@ import cmk_base.checks as checks import cmk_base.rulesets as rulesets import cmk_base.ip_lookup as ip_lookup + +class MonitoringCore(object): + __metaclass__ = abc.ABCMeta + + @abc.abstractmethod + def __init__(self): + super(MonitoringCore, self).__init__() + + @abc.abstractmethod + def create_config(self): + pass + + @abc.abstractmethod + def precompile(self): + pass + + _ignore_ip_lookup_failures = False _failed_ip_lookups = [] @@ -237,7 +255,7 @@ def create_core_config(core): _verify_non_duplicate_hosts() _verify_non_deprecated_checkgroups() - core["create_config"]() + core.create_config() cmk.password_store.save(config.stored_passwords) return get_configuration_warnings() @@ -270,7 +288,7 @@ def do_update(core, with_precompile): try: do_create_config(core, with_agents=with_precompile) if with_precompile: - core["precompile"]() + core.precompile() except Exception, e: console.error("Configuration Error: %s\n" % e) diff --git a/cmk_base/core_factory.py b/cmk_base/core_factory.py index 22afe7d..037321c 100644 --- a/cmk_base/core_factory.py +++ b/cmk_base/core_factory.py @@ -24,31 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -from cmk_base.config import monitoring_core +import cmk_base.config - -# TODO: The "config" literal should really be centralized somehow. -def _cmc_file(options): - return options["cmc-file"] if options and "cmc-file" in options else "config" - - -def _create_config_hook(options): - if monitoring_core == "cmc": - from cmk_base.cee.core_cmc import create_config_hook as cch - create_config_hook = lambda: cch(_cmc_file(options)) - else: - from cmk_base.core_nagios import create_config_hook - return create_config_hook - - -def _precompile_hook(): - 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! def create_core(options=None): - return {"create_config": _create_config_hook(options), "precompile": _precompile_hook()} + if cmk_base.config.monitoring_core == "cmc": + from cmk_base.cee.core_cmc import CMC + return CMC(options) + from cmk_base.core_nagios import NagiosCore + return NagiosCore() diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 8f58446..707ffbb 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -46,6 +46,20 @@ import cmk_base.data_sources as data_sources import cmk_base.check_utils +class NagiosCore(core_config.MonitoringCore): + def __init__(self): + super(NagiosCore, self).__init__() + + def create_config(self): + with file(cmk.paths.nagios_objects_file, "w") as out: + create_config(out, None) + + def precompile(self): + console.output("Precompiling host checks...") + precompile_hostchecks() + console.output(tty.ok + "\n") + + # .--Create config-------------------------------------------------------. # | ____ _ __ _ | # | / ___|_ __ ___ __ _| |_ ___ ___ ___ _ __ / _(_) __ _ | @@ -57,11 +71,6 @@ import cmk_base.check_utils # | Create a configuration file for Nagios core with hosts + services | # '----------------------------------------------------------------------' -def create_config_hook(): - with file(cmk.paths.nagios_objects_file, "w") as out: - create_config(out, None) - - def create_config(outfile, hostnames): global hostgroups_to_define hostgroups_to_define = set([]) @@ -862,13 +871,6 @@ def _extra_conf_of(confdict, hostname, service, exclude=None): # | in adhoc mode (about 75%). | # '----------------------------------------------------------------------' -# TODO: Move to modes -def precompile_hook(): - console.output("Precompiling host checks...") - precompile_hostchecks() - console.output(tty.ok + "\n") - - # Find files to be included in precompile host check for a certain # check (for example df or mem.used). In case of checks with a period # (subchecks) we might have to include both "mem" and "mem.used". The

6 years

Fix dependencies of core-related modules, part 8.

by Sven Panne

Module: check_mk Branch: master Commit: fd55a93615e1d95783edbcc9f55a5bc66d1be258 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd55a93615e1d9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 11 10:59:53 2018 +0200 Fix dependencies of core-related modules, part 8. Removed code duplication by moving the core factory to a separate module. This brings the number of cycles down to 8 (from 11). Change-Id: Idd235e40fd1025f7180478410a2ad50ad9b1516f --- cmk_base/automations/check_mk.py | 37 ++------------------------- cmk_base/core_factory.py | 54 ++++++++++++++++++++++++++++++++++++++++ cmk_base/modes/check_mk.py | 40 +++++------------------------ 3 files changed, 62 insertions(+), 69 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 74f8f9f..6d79c74 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -46,6 +46,7 @@ from cmk_base.automations import automations, Automation, MKAutomationError import cmk_base.check_utils import cmk_base.autochecks import cmk_base.nagios_utils +from cmk_base.core_factory import create_core class DiscoveryAutomation(Automation): @@ -721,40 +722,6 @@ 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): # make sure, Nagios does not inherit any open @@ -796,7 +763,7 @@ class AutomationRestart(Automation): else: backup_path = None - core = AutomationRestart._create_core() + core = create_core() try: configuration_warnings = core_config.create_core_config(core) diff --git a/cmk_base/core_factory.py b/cmk_base/core_factory.py new file mode 100644 index 0000000..22afe7d --- /dev/null +++ b/cmk_base/core_factory.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from cmk_base.config import monitoring_core + + +# TODO: The "config" literal should really be centralized somehow. +def _cmc_file(options): + return options["cmc-file"] if options and "cmc-file" in options else "config" + + +def _create_config_hook(options): + if monitoring_core == "cmc": + from cmk_base.cee.core_cmc import create_config_hook as cch + create_config_hook = lambda: cch(_cmc_file(options)) + else: + from cmk_base.core_nagios import create_config_hook + return create_config_hook + + +def _precompile_hook(): + 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! +def create_core(options=None): + return {"create_config": _create_config_hook(options), "precompile": _precompile_hook()} diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 6f191c8..695796b 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -40,6 +40,7 @@ from cmk_base.exceptions import MKAgentError from cmk_base.modes import modes, Mode, Option, keepalive_option import cmk_base.check_utils +from cmk_base.core_factory import create_core # TODO: Investigate all modes and try to find out whether or not we can # set needs_checks=False for them. This would save a lot of IO/time for @@ -1008,38 +1009,9 @@ modes.register(Mode( )) -# TODO: The "config" literal should really be centralized somehow. -def _cmc_file(options): - return options["cmc-file"] if options and "cmc-file" in options else "config" - - -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(_cmc_file(options)) - else: - from cmk_base.core_nagios import create_config_hook - return create_config_hook - - -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! -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_core(options), with_precompile=False) + do_update(create_core(options), with_precompile=False) modes.register(Mode( long_option="update-no-precompile", @@ -1096,7 +1068,7 @@ modes.register(Mode( def mode_update(options): from cmk_base.core_config import do_update - do_update(_create_core(options), with_precompile=True) + do_update(create_core(options), with_precompile=True) modes.register(Mode( long_option="update", @@ -1135,7 +1107,7 @@ modes.register(Mode( def mode_restart(): import cmk_base.core - cmk_base.core.do_restart(_create_core()) + cmk_base.core.do_restart(create_core()) modes.register(Mode( long_option="restart", @@ -1157,7 +1129,7 @@ modes.register(Mode( def mode_reload(): import cmk_base.core - cmk_base.core.do_reload(_create_core()) + cmk_base.core.do_reload(create_core()) modes.register(Mode( long_option="reload", @@ -1409,7 +1381,7 @@ modes.register(Mode( def mode_discover_marked_hosts(): import cmk_base.discovery as discovery - discovery.discover_marked_hosts(_create_core()) + discovery.discover_marked_hosts(create_core()) modes.register(Mode( long_option="discover-marked-hosts",

6 years

fixed incorrect cee/cme checking

by Andreas

Module: check_mk Branch: master Commit: d14c7ab8e74b6edf311ec1d6c54eee5087b4b333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d14c7ab8e74b6e… Author: Andreas <ab(a)mathias-kettner.de> Date: Mon Jun 11 09:47:53 2018 +0200 fixed incorrect cee/cme checking Change-Id: Iebdbdc173241d2693ffc4183bea2b9dfe6f0252b --- web/htdocs/modules.py | 2 +- web/htdocs/views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/modules.py b/web/htdocs/modules.py index f0a4817..feff29f 100644 --- a/web/htdocs/modules.py +++ b/web/htdocs/modules.py @@ -41,7 +41,7 @@ internal_module_names = [ ] import cmk -if cmk.is_enterprise_edition(): +if not cmk.is_raw_edition(): internal_module_names.append("sla") pagehandlers = {} diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 92daba1..12aac91 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -37,7 +37,7 @@ from gui_exceptions import MKGeneralException, MKUserError, MKInternalError import cmk.paths -if cmk.is_enterprise_edition(): +if not cmk.is_raw_edition(): import sla # Datastructures and functions needed before plugins can be loaded @@ -1665,7 +1665,7 @@ def show_view(view, show_heading = False, show_buttons = True, if "host_name" in row: row["host_inventory"] = inventory.load_tree(row["host_name"]) - if cmk.is_enterprise_edition(): + if not cmk.is_raw_edition(): sla_params = [] for cell in cells: if cell.painter_name() in ["sla_specific", "sla_fixed"]:

6 years

Initial SLA version

by Andreas Boesl

Module: check_mk Branch: master Commit: d5ad5792f019459368e78867c369d0ff8115f909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5ad5792f01945… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Dec 2 15:07:24 2017 +0100 Initial SLA version Change-Id: I8c45cc7b2f953361c9784b4d5f123c11f3acd74d --- web/htdocs/availability.py | 316 ++++++++++++++++++++------------------ web/htdocs/js/checkmk.js | 69 +++++++++ web/htdocs/modules.py | 4 + web/htdocs/pages.css | 5 + web/htdocs/status.css | 1 + web/htdocs/views.css | 141 +++++++++++++++++ web/htdocs/views.py | 43 +++++- web/htdocs/visuals.py | 2 + web/plugins/views/availability.py | 7 +- web/plugins/views/builtin.py | 8 + 10 files changed, 437 insertions(+), 159 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d5ad5792f0…

6 years

← Newer
1
...
8
9
10
11
12
13
14
...
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