Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: e5ff2561a4276e10d2beb320ba21cf9d574258f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5ff2561a4276e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 14:51:48 2019 +0200 Rename function for consistency Change-Id: I1f8ef0774f10bdb39f7f65092d36721bfad50230 --- cmk_base/config.py | 6 +++--- cmk_base/core_config.py | 2 +- tests/unit/cmk_base/test_config.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 5f80543..d614770 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3033,13 +3033,13 @@ class ConfigCache(object): }) return labels - def get_extra_attributes_of_service(self, hostname, description): + def extra_attributes_of_service(self, hostname, description): # type: (str, Text) -> Dict[str, Any] attrs = { "check_interval": 1.0, # 1 minute } - for key, conflist in extra_service_conf.items(): - values = self.service_extra_conf(hostname, description, conflist) + for key, ruleset in extra_service_conf.iteritems(): + values = self.service_extra_conf(hostname, description, ruleset) if not values: continue diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 42f96c1..7ce2fda 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -325,7 +325,7 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa description).iteritems(): attrs["_%s" % varname.upper()] = value - attrs.update(config_cache.get_extra_attributes_of_service(hostname, description)) + attrs.update(config_cache.extra_attributes_of_service(hostname, description)) # Add explicit custom_variables for varname, value in config_cache.get_explicit_service_custom_variables( diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 1ab27b0..8f88292 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1052,7 +1052,7 @@ def test_config_cache_extra_attributes_of_service(monkeypatch, hostname, result) ], }) config_cache = ts.apply(monkeypatch) - assert config_cache.get_extra_attributes_of_service(hostname, "CPU load") == result + assert config_cache.extra_attributes_of_service(hostname, "CPU load") == result @pytest.mark.parametrize("hostname,result", [

5 years, 1 month

Moved service level processing to ConfigCache/HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 7cb3d61aa1ed5a4b831c8761d3a298b939767d58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb3d61aa1ed5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 18:24:56 2019 +0200 Moved service level processing to ConfigCache/HostConfig CMK-2030 Change-Id: Iba33321198004a1d46e9c72f33dcc2bbe4b63c56 --- cmk_base/check_api.py | 21 +++++++++---------- cmk_base/config.py | 15 ++++++++++++++ tests/unit/cmk_base/test_check_api.py | 38 +++++++++++++++++++++++++++++------ tests/unit/cmk_base/test_config.py | 34 +++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 17 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 688c629..cdd62c4 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -201,17 +201,17 @@ def savefloat(f): return 0.0 -# Compatibility wrapper for the pre 1.6 existant conf.service_extra_conf() +# Compatibility wrapper for the pre 1.6 existant config.service_extra_conf() def service_extra_conf(hostname, service, ruleset): return _config.get_config_cache().service_extra_conf(hostname, service, ruleset) -# Compatibility wrapper for the pre 1.6 existant conf.service_extra_conf() +# Compatibility wrapper for the pre 1.6 existant config.host_extra_conf() def host_extra_conf(hostname, ruleset): return _config.get_config_cache().host_extra_conf(hostname, ruleset) -# Compatibility wrapper for the pre 1.6 existant conf.service_extra_conf() +# Compatibility wrapper for the pre 1.6 existant config.in_binary_hostlist() def in_binary_hostlist(hostname, ruleset): return _config.get_config_cache().in_binary_hostlist(hostname, ruleset) @@ -504,15 +504,14 @@ def get_effective_service_level(): """Get the service level that applies to the current service. This can only be used within check functions, not during discovery nor parsing.""" config_cache = _config.get_config_cache() - service_levels = config_cache.service_extra_conf(host_name(), service_description(), - _config.service_service_levels) + service_level = config_cache.service_level_of_service(host_name(), service_description()) + if service_level is not None: + return service_level + + service_level = config_cache.get_host_config(host_name()).service_level + if service_level is not None: + return service_level - if service_levels: - return service_levels[0] - else: - service_levels = config_cache.host_extra_conf(host_name(), _config.host_service_levels) - if service_levels: - return service_levels[0] return 0 diff --git a/cmk_base/config.py b/cmk_base/config.py index d614770..ecf56fe 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2858,6 +2858,14 @@ class HostConfig(object): return params.get("host_label_inventory", True) + @property + def service_level(self): + # type: () -> Optional[int] + entries = self._config_cache.host_extra_conf(self.hostname, host_service_levels) + if not entries: + return None + return entries[0] + #. # .--Configuration Cache-------------------------------------------------. @@ -3100,6 +3108,13 @@ class ConfigCache(object): itertools.chain( *self.service_extra_conf(hostname, description, custom_service_attributes))) + def service_level_of_service(self, hostname, description): + # type: (str, Text) -> Optional[int] + entries = self.service_extra_conf(hostname, description, service_service_levels) + if not entries: + return None + return entries[0] + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/tests/unit/cmk_base/test_check_api.py b/tests/unit/cmk_base/test_check_api.py index cb02c21..b0749cd 100644 --- a/tests/unit/cmk_base/test_check_api.py +++ b/tests/unit/cmk_base/test_check_api.py @@ -1,14 +1,11 @@ # -*- coding: utf-8 -*- -r""" -Test Check API -============== - -""" import math -import pytest +import pytest # type: ignore +from testlib.base import Scenario import cmk_base.check_api as check_api import cmk_base.config as config +import cmk_base.check_api_utils as check_api_utils @check_api.get_parsed_item_data @@ -237,3 +234,32 @@ def test_http_proxy(mocker): proxy_patch = mocker.patch.object(config, "get_http_proxy") check_api.get_http_proxy(("url", "http://xy:123")) assert proxy_patch.called_once() + + +def test_get_effective_service_level(monkeypatch): + ts = Scenario().add_host("testhost1") + ts.add_host("testhost2") + ts.add_host("testhost3") + ts.set_ruleset( + "host_service_levels", + [ + (10, [], ["testhost2"], {}), + (2, [], ["testhost2"], {}), + ], + ) + ts.set_ruleset( + "service_service_levels", + [ + (33, [], ["testhost1"], ["CPU load$"], {}), + ], + ) + ts.apply(monkeypatch) + + check_api_utils.set_service("cpu.loads", "CPU load") + + check_api_utils.set_hostname("testhost1") + assert check_api.get_effective_service_level() == 33 + check_api_utils.set_hostname("testhost2") + assert check_api.get_effective_service_level() == 10 + check_api_utils.set_hostname("testhost3") + assert check_api.get_effective_service_level() == 0 diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 8f88292..8c0777e 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1136,6 +1136,23 @@ def test_config_cache_custom_attributes_of_service(monkeypatch, hostname, result assert config_cache.custom_attributes_of_service(hostname, "CPU load") == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", 10), +]) +def test_config_cache_service_level_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset( + "service_service_levels", + [ + (10, [], ["testhost2"], ["CPU load$"], {}), + (2, [], ["testhost2"], ["CPU load$"], {}), + ], + ) + config_cache = ts.apply(monkeypatch) + assert config_cache.service_level_of_service(hostname, "CPU load") == result + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"), @@ -1253,3 +1270,20 @@ def test_host_config_do_host_label_discovery_for(monkeypatch, result, ruleset): config_cache = ts.apply(monkeypatch) assert config_cache.get_host_config("abc").do_host_label_discovery == result + + +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", 10), +]) +def test_host_config_service_level(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset( + "host_service_levels", + [ + (10, [], ["testhost2"], {}), + (2, [], ["testhost2"], {}), + ], + ) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).service_level == result

5 years, 1 month

Cleanup ancient match case from in_binary_hostlist()

by Lars Michelsen

Module: check_mk Branch: master Commit: 161ad561173b20855b38a42ae030bb9af61114aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=161ad561173b20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 3 12:14:13 2019 +0200 Cleanup ancient match case from in_binary_hostlist() Change-Id: I2aad4699c428c2c6d69d557dec00adef8df4fb70 --- cmk_base/config.py | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 2f1344e..dec2944 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3633,47 +3633,47 @@ class ConfigCache(object): except KeyError: pass - # if we have just a list of strings just take it as list of hostnames if conf and isinstance(conf[0], str): - result = hostname in conf - cache[cache_id] = result - else: - for entry in conf: - actual_host_tags = self.tag_list_of_host(hostname) - entry, rule_options = get_rule_options(entry) - if rule_options.get("disabled"): - continue + raise NotImplementedError("Unsupported ruleset found: %s. Please " + "remove the configuration in case you don't need it " + "anymore. Otherwise contact the checkMK team." % conf) - try: - # Negation via 'NEGATE' - if entry[0] == NEGATE: - entry = entry[1:] - negate = True - else: - negate = False - # entry should be one-tuple or two-tuple. Tuple's elements are - # lists of strings. User might forget comma in one tuple. Then the - # entry is the list itself. - if isinstance(entry, list): - hostlist = entry + for entry in conf: + actual_host_tags = self.tag_list_of_host(hostname) + entry, rule_options = get_rule_options(entry) + if rule_options.get("disabled"): + continue + + try: + # Negation via 'NEGATE' + if entry[0] == NEGATE: + entry = entry[1:] + negate = True + else: + negate = False + # entry should be one-tuple or two-tuple. Tuple's elements are + # lists of strings. User might forget comma in one tuple. Then the + # entry is the list itself. + if isinstance(entry, list): + hostlist = entry + tags = [] + else: + if len(entry) == 1: # 1-Tuple with list of hosts + hostlist = entry[0] tags = [] else: - if len(entry) == 1: # 1-Tuple with list of hosts - hostlist = entry[0] - tags = [] - else: - tags, hostlist = entry - - if hosttags_match_taglist(actual_host_tags, tags) and \ - in_extraconf_hostlist(hostlist, hostname): - cache[cache_id] = not negate - break - except: - # TODO: Fix this too generic catching (+ bad error message) - raise MKGeneralException("Invalid entry '%r' in host configuration list: " - "must be tuple with 1 or 2 entries" % (entry,)) - else: - cache[cache_id] = False + tags, hostlist = entry + + if hosttags_match_taglist(actual_host_tags, tags) and \ + in_extraconf_hostlist(hostlist, hostname): + cache[cache_id] = not negate + break + except: + # TODO: Fix this too generic catching (+ bad error message) + raise MKGeneralException("Invalid entry '%r' in host configuration list: " + "must be tuple with 1 or 2 entries" % (entry,)) + else: + cache[cache_id] = False return cache[cache_id]

5 years, 1 month

Move last host_extra_conf to cmk_base.config

by Lars Michelsen

Module: check_mk Branch: master Commit: b05b41626ae07bdd74c3cca87242eb7e091ade3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b05b41626ae07b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 20:55:49 2019 +0200 Move last host_extra_conf to cmk_base.config * The agent bakery config computation is a bit special. The rule matching logic has now been moved to cmk_base.config. * Added tests for it * The value merging logic remains in cmk_base.cee.agent_bakery for the moment because it is based on the bakery plugins which should be cleaned up in the near future. CMK-2030 Change-Id: Icf06e4f2e50f403b8253e380bdfdcdb66a4a014b --- cmk_base/config.py | 66 ++++++++++++++++++++++++++---------- tests/unit/cmk_base/test_rulesets.py | 9 +++-- 2 files changed, 55 insertions(+), 20 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 0fa8ef9..2f1344e 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -1204,22 +1204,6 @@ def in_extraconf_hostlist(hostlist, hostname): return False -def parse_host_rule(rule): - rule, rule_options = get_rule_options(rule) - - num_elements = len(rule) - if num_elements == 2: - item, hostlist = rule - tags = [] - elif num_elements == 3: - item, tags, hostlist = rule - else: - raise MKGeneralException("Invalid entry '%r' in host configuration list: must " - "have 2 or 3 entries" % (rule,)) - - return item, tags, hostlist, rule_options - - def get_rule_options(entry): """Get the options from a rule. @@ -3376,7 +3360,7 @@ class ConfigCache(object): console.warning('deprecated entry [ "" ] in host configuration list') for rule in ruleset: - item, tags, hostlist, rule_options = parse_host_rule(rule) + item, tags, hostlist, rule_options = self._parse_host_rule(rule) if rule_options.get("disabled"): continue @@ -3386,6 +3370,21 @@ class ConfigCache(object): return new_rules + def _parse_host_rule(self, rule): + rule, rule_options = get_rule_options(rule) + + num_elements = len(rule) + if num_elements == 2: + item, hostlist = rule + tags = [] + elif num_elements == 3: + item, tags, hostlist = rule + else: + raise MKGeneralException("Invalid entry '%r' in host configuration list: must " + "have 2 or 3 entries" % (rule,)) + + return item, tags, hostlist, rule_options + def service_extra_conf(self, hostname, service, ruleset): """Compute outcome of a service rule set that has an item.""" # When the requested host is part of the local sites configuration, @@ -3746,6 +3745,39 @@ class CEEConfigCache(ConfigCache): return None return entries[0] + # TODO: Cleanup the GENERIC_AGENT duplication with cmk_base.cee.agent_bakyery.GENERIC_AGENT + def matched_agent_config_entries(self, hostname): + # type: (Union[bool, str]) -> Dict[str, Any] + GENERIC_AGENT = True + matched = {} + for varname, ruleset in agent_config.items() + [("agent_port", agent_ports), + ("agent_encryption", agent_encryption)]: + if hostname is GENERIC_AGENT: + matched[varname] = self._generic_host_extra_conf(ruleset) + else: + matched[varname] = self.host_extra_conf(hostname, ruleset) + + return matched + + def _generic_host_extra_conf(self, ruleset): + """Compute ruleset for "generic" host + + This fictious host has no name and no tags. It matches all rules that + do not require specific hosts or tags. But it matches rules that e.g. + except specific hosts or tags (is not, has not set) + """ + entries = [] + + for rule in ruleset: + item, tags, hostlist = self._parse_host_rule(rule)[:-1] + if tags and not hosttags_match_taglist([], tags): + continue + if not in_extraconf_hostlist(hostlist, ""): + continue + + entries.append(item) + return entries + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore. diff --git a/tests/unit/cmk_base/test_rulesets.py b/tests/unit/cmk_base/test_rulesets.py index b3ef5e5..7654c0a 100644 --- a/tests/unit/cmk_base/test_rulesets.py +++ b/tests/unit/cmk_base/test_rulesets.py @@ -210,22 +210,25 @@ def test_in_extraconf_hostlist(): def test_parse_host_rule(): + config_cache = config.get_config_cache() options = {'description': u'Put all hosts into the contact group "all"'} entry = ('all', [], config.ALL_HOSTS, options) - assert config.parse_host_rule(entry) == ('all', [], config.ALL_HOSTS, options) + assert config_cache._parse_host_rule(entry) == ('all', [], config.ALL_HOSTS, options) def test_parse_host_rule_without_tags(): + config_cache = config.get_config_cache() options = {'description': u'Put all hosts into the contact group "all"'} entry = ('all', config.ALL_HOSTS, options) - assert config.parse_host_rule(entry) == ('all', [], config.ALL_HOSTS, options) + assert config_cache._parse_host_rule(entry) == ('all', [], config.ALL_HOSTS, options) def test_parse_host_rule_invalid_length(): + config_cache = config.get_config_cache() options = {'description': u'Put all hosts into the contact group "all"'} entry = (None, None, 'all', config.ALL_HOSTS, options) with pytest.raises(MKGeneralException): - assert config.parse_host_rule(entry) + assert config_cache._parse_host_rule(entry) def test_get_rule_options_regular_rule():

5 years, 1 month

Move config.service_contactgroups processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 3008d945d6ca4b6c9f3b6a67476e0afe5812aa44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3008d945d6ca4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 10:07:43 2019 +0200 Move config.service_contactgroups processing to ConfigCache CMK-2030 Change-Id: I8dd706a88385b21f2d61887c77df38c435d2d382 --- cmk_base/config.py | 11 +++++++++++ cmk_base/core_nagios.py | 8 +++----- tests/unit/cmk_base/test_config.py | 13 +++++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 0c19a08..2b9a972 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3064,6 +3064,17 @@ class ConfigCache(object): """Returns the list of servicegroups of this services""" return self.service_extra_conf(hostname, description, service_groups) + def contactgroups_of_service(self, hostname, description): + # type: (str, Text) -> List[str] + """Returns the list of contactgroups of this service""" + cgrs = set() # type: Set[str] + cgrs.update(self.service_extra_conf(hostname, description, service_contactgroups)) + + if monitoring_core == "nagios" and enable_rulebased_notifications: + cgrs.add("check-mk-notify") + + return list(cgrs) + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 65ddf06..b264f88 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -828,12 +828,10 @@ def _extra_service_conf_of(cfg, config_cache, hostname, description): service_spec = {} # Contact groups - sercgr = config_cache.service_extra_conf(hostname, description, config.service_contactgroups) - cfg.contactgroups_to_define.update(sercgr) - if len(sercgr) > 0: - if config.enable_rulebased_notifications: - sercgr.append("check-mk-notify") # not nessary if not explicit groups defined + sercgr = config_cache.contactgroups_of_service(hostname, description) + if sercgr: service_spec["contact_groups"] = ",".join(sercgr) + cfg.contactgroups_to_define.update(sercgr) sergr = config_cache.servicegroups_of_service(hostname, description) if sergr: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 4f6faa9..1732197 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1081,6 +1081,19 @@ def test_config_cache_servicegroups_of_service(monkeypatch, hostname, result): assert config_cache.servicegroups_of_service(hostname, "CPU load") == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", []), + ("testhost2", ["dingdong"]), +]) +def test_config_cache_contactgroups_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("service_contactgroups", [ + ("dingdong", [], ["testhost2"], "CPU load", {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.contactgroups_of_service(hostname, "CPU load") == result + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"),

5 years, 1 month

Move config.cmc_service_check_timeout processing to CEEConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: c309c7b794758866a88e04695428c74c72677dd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c309c7b7947588… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 11:09:26 2019 +0200 Move config.cmc_service_check_timeout processing to CEEConfigCache CMK-2030 Change-Id: Ia334a6d82b89d19e0c42b417258e4f4fd3fe9ff8 --- cmk_base/config.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 2b9a972..d6f177e 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3695,6 +3695,15 @@ class CEEConfigCache(ConfigCache): spec.update(entry) return spec + def check_timeout_of_service(self, hostname, description): + # type: (str, Text) -> int + """Returns the check timeout in seconds""" + entries = self.service_extra_conf(hostname, description, cmc_service_check_timeout) + if not entries: + return cmc_check_timeout + + return entries[0] + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore.

5 years, 1 month

Moved config.custom_service_attributes processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b91d666bfb55d481db8640591c81fc4669932a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b91d666bfb55d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 11:46:26 2019 +0200 Moved config.custom_service_attributes processing to ConfigCache CMK-2030 Change-Id: Ib586fbe25216a0c1af3f021c92d368bb569a5cc0 --- cmk_base/config.py | 7 +++++++ cmk_base/core_config.py | 11 ++--------- tests/unit/cmk_base/test_config.py | 25 +++++++++++++++++++++++++ tests/unit/cmk_base/test_core_config.py | 21 --------------------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9c4f97f..aa10f6f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -34,6 +34,7 @@ import os import py_compile import struct import sys +import itertools from typing import Set, Text, Any, Callable, Dict, List, Tuple, Union, Optional # pylint: disable=unused-import import six @@ -3082,6 +3083,12 @@ class ConfigCache(object): return "24X7" return passive_check_period[0] + def custom_attributes_of_service(self, hostname, description): + # type: (str, Text) -> Dict[str, str] + return dict( + itertools.chain( + *self.service_extra_conf(hostname, description, custom_service_attributes))) + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index f5b3ea3..42f96c1 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -28,7 +28,6 @@ import abc import numbers import os import sys -import itertools from typing import Text, Optional, Any, List, Dict # pylint: disable=unused-import import cmk.utils.paths @@ -322,8 +321,8 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa # Add service custom_variables. Name conflicts are prevented by the GUI, but just # to be sure, add them first. The other definitions will override the custom attributes. - for varname, value in _custom_service_attributes_of(config_cache, hostname, - description).iteritems(): + for varname, value in config_cache.custom_attributes_of_service(hostname, + description).iteritems(): attrs["_%s" % varname.upper()] = value attrs.update(config_cache.get_extra_attributes_of_service(hostname, description)) @@ -340,12 +339,6 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa return attrs -def _custom_service_attributes_of(config_cache, hostname, service_description): - return dict( - itertools.chain(*config_cache.service_extra_conf(hostname, service_description, - config.custom_service_attributes))) - - #. # .--HostAttributes------------------------------------------------------. # | _ _ _ _ _ _ _ _ _ | diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 5e29a3f..d009cef 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1107,6 +1107,31 @@ def test_config_cache_passive_check_period_of_service(monkeypatch, hostname, res assert config_cache.passive_check_period_of_service(hostname, "CPU load") == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", {}), + ("testhost2", { + 'ATTR1': 'value1', + 'ATTR2': 'value2', + }), +]) +def test_config_cache_custom_attributes_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset( + "custom_service_attributes", + [ + ([ + ("ATTR1", "value1"), + ("ATTR2", "value2"), + ], [], ["testhost2"], ["CPU load$"], {}), + ([ + ("ATTR1", "value1"), + ], [], ["testhost2"], ["CPU load$"], {}), + ], + ) + config_cache = ts.apply(monkeypatch) + assert config_cache.custom_attributes_of_service(hostname, "CPU load") == result + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"), diff --git a/tests/unit/cmk_base/test_core_config.py b/tests/unit/cmk_base/test_core_config.py index 5d9a0af..1031ef4 100644 --- a/tests/unit/cmk_base/test_core_config.py +++ b/tests/unit/cmk_base/test_core_config.py @@ -70,24 +70,3 @@ def test_get_tag_attributes(tag_groups, result): for k, v in attributes.items(): assert isinstance(k, unicode) assert isinstance(v, unicode) - - -def test_custom_service_attributes_of(monkeypatch): - config_cache = config.get_config_cache() - attributes = core_config._custom_service_attributes_of(config_cache, "luluhost", "laladescr") - assert attributes == {} - - ts = Scenario().add_host("luluhost", []) - ts.set_ruleset("custom_service_attributes", [ - ([('deng', '1')], [], config.ALL_HOSTS, config.ALL_SERVICES, {}), - ([('ding', '2'), ('ding', '2a'), - ('dong', '3')], [], config.ALL_HOSTS, config.ALL_SERVICES, {}), - ]) - config_cache = ts.apply(monkeypatch) - - attributes = core_config._custom_service_attributes_of(config_cache, "luluhost", "laladescr") - assert attributes == { - "deng": "1", - "ding": "2a", - "dong": "3", - }

5 years, 1 month

Move config.check_periods processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: fc76c799e95fd78eb811bc3a413c0656b53da970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc76c799e95fd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 11:18:36 2019 +0200 Move config.check_periods processing to ConfigCache CMK-2030 Change-Id: Ib0c06138d57daa587d56e440bec1b4984e6deeca --- cmk_base/config.py | 7 +++++++ tests/unit/cmk_base/test_config.py | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index d6f177e..48da6b5 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3075,6 +3075,13 @@ class ConfigCache(object): return list(cgrs) + def passive_check_period_of_service(self, hostname, description): + # type: (str, Text) -> str + passive_check_period = self.service_extra_conf(hostname, description, check_periods) + if not passive_check_period: + return "24X7" + return passive_check_period[0] + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 1732197..5e29a3f 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1094,6 +1094,19 @@ def test_config_cache_contactgroups_of_service(monkeypatch, hostname, result): assert config_cache.contactgroups_of_service(hostname, "CPU load") == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", "24X7"), + ("testhost2", "workhours"), +]) +def test_config_cache_passive_check_period_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("check_periods", [ + ("workhours", [], ["testhost2"], ["CPU load$"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.passive_check_period_of_service(hostname, "CPU load") == result + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"),

5 years, 1 month

Move config.cmc_graphite_service_metrics processing to CEEConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: e5bc8725e1b437ff2f9940d9930f151b184c7970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5bc8725e1b437… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 11:28:37 2019 +0200 Move config.cmc_graphite_service_metrics processing to CEEConfigCache CMK-2030 Change-Id: I5755184038cc774092d482a8c7fff937fd83405b --- cmk_base/config.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 48da6b5..9c4f97f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3711,6 +3711,13 @@ class CEEConfigCache(ConfigCache): return entries[0] + def graphite_metrics_of_service(self, hostname, description): + # type: (str, Text) -> Optional[List[str]] + entries = self.service_extra_conf(hostname, description, cmc_graphite_service_metrics) + if not entries: + return None + return entries[0] + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore.

5 years, 1 month

Fix: " was interpreted incorrectly

by Alex Zurhake

Module: check_mk Branch: master Commit: 70e77376033964797caabb1bcc09fc832f27d5e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70e77376033964… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri May 3 12:05:27 2019 +0200 Fix: " was interpreted incorrectly Change-Id: I10b1914b01daf7b26940499e026013e7e70f5d0a --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index b8e268a..ed28831 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -254,7 +254,7 @@ node { stage('Packaging Tests') { try { dir("${DAILY_DATA}/git/tests") { - withEnv(["VERSION_PATH=${ARCHIVE_DIR}", "PYTEST_ADDOPTS='--junitxml=\"${WORKSPACE}/junit.xml\"'", "EDITION=cee"]) { + withEnv(["VERSION_PATH=${ARCHIVE_DIR}", "PYTEST_ADDOPTS='--junitxml=${WORKSPACE}/junit.xml'", "EDITION=cee"]) { sh "make test-packaging" } }

5 years, 1 month

← Newer
1
...
24
25
26
27
28
29
30
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019