Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

compilation fix(error during resolving comflicts)

by Sergey Kipnis

Module: check_mk Branch: master Commit: 676f8b9b9984cb37be61811da50c58d2de9b896e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=676f8b9b9984cb… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon May 6 11:38:49 2019 +0200 compilation fix(error during resolving comflicts) Change-Id: If303fdbc3cec0328d4c24f3c04d7f2e5cd16a2b7 --- agents/wnx/watest/test_tools.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/wnx/watest/test_tools.h b/agents/wnx/watest/test_tools.h index 501c6f9..873b412 100644 --- a/agents/wnx/watest/test_tools.h +++ b/agents/wnx/watest/test_tools.h @@ -14,13 +14,13 @@ public: using namespace cma::cfg; std::error_code ec; std::filesystem::remove(cma::cfg::GetBakeryFile(), ec); - cma::OnStart(cma::kTest); + cma::OnStart(cma::AppType::test); auto yaml = GetLoadedConfig(); ProcessKnownConfigGroups(); SetupEnvironmentFromGroups(); } - ~YamlLoader() { OnStart(cma::kTest); } + ~YamlLoader() { OnStart(cma::AppType::test); } }; inline void CreateFile(std::filesystem::path Path, std::string Content) {

5 years, 2 months

Revert "Fixed nexus URL."

by Alex Zurhake

Module: check_mk Branch: master Commit: 3d1d70fbee2f2186aad2208d5dc9468205ee637d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d1d70fbee2f21… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 10:01:34 2019 +0200 Revert "Fixed nexus URL." This reverts commit e3507cf6357a9537225495b299ff63819291a210. --- Pipfile | 2 +- Pipfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Pipfile b/Pipfile index 72dacd4..e660f5e 100644 --- a/Pipfile +++ b/Pipfile @@ -24,7 +24,7 @@ pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ # Workaround: We need to upload the Archive and cannot use it from our Git due to a Pipenv bug -compiledb = {file = "http://nexus.lan.tribe29.com:8081/repository/archives/compiledb-1604e14.tar…"} +compiledb = {file = "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz"} [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index d9e5a3d..0096c14 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "b8a3467e46635ee27af0010d167beb32a3aa7e647b9ae5a2480e44f4c10d2475" + "sha256": "9f48473f7896536f450eb385c041745c6028ebadb0ae29b516b1b678d4e0fc7b" }, "pipfile-spec": 6, "requires": { @@ -1010,7 +1010,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3'", + "markers": "python_version == '2.7'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1054,7 +1054,7 @@ "version": "==3.0.4" }, "compiledb": { - "file": "http://nexus.lan.tribe29.com:8081/repository/archives/compiledb-1604e14.tar…" + "file": "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz" }, "configparser": { "hashes": [ @@ -1156,7 +1156,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -1280,11 +1280,11 @@ }, "mock": { "hashes": [ - "sha256:21a2c07af3bbc4a77f9d14ac18fcc1782e8e7ea363df718740cdeaf61995b5e7", - "sha256:7868db2825a1563578869d4a011a036503a2f1d60f9ff9dd1e3205cd6e25fcec" + "sha256:5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe", + "sha256:d659f8ef8810ff4c3f8f973d113a05d291a08ab0f7ed17bd60887983b93a0f9a" ], "markers": "python_version < '3.0'", - "version": "==3.0.4" + "version": "==3.0.3" }, "mockldap": { "hashes": [

5 years, 2 months

Cleanups: Spread some type hints, add comments

by Lars Michelsen

Module: check_mk Branch: master Commit: 36be6848757c83bd0dfe6ae04723328a1063c3ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36be6848757c83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 09:32:31 2019 +0200 Cleanups: Spread some type hints, add comments Change-Id: Ic8447732263e2712e5d451c8cf1a71dc87a82e0d --- cmk_base/config.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9920e5c..f95aa99 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -906,6 +906,7 @@ def get_final_service_description(hostname, description): def service_ignored(hostname, check_plugin_name, description): + # type: (str, str, Text) -> bool if check_plugin_name and check_plugin_name in ignored_checktypes: return True @@ -1294,6 +1295,7 @@ def in_extraconf_servicelist(servicelist, service): def _in_servicematcher_list(service_matchers, item): + # type: (List[Tuple[bool, Callable]], Text) -> bool for negate, func in service_matchers: result = func(item) if result: @@ -3342,6 +3344,7 @@ class ConfigCache(object): return self._host_extra_conf_match_cache[cache_id][hostname] + # TODO: Cleanup external in_binary_hostlist call sites def in_binary_hostlist(self, hostname, conf): cache = self._in_binary_hostlist_cache @@ -3492,11 +3495,14 @@ class ConfigCache(object): return new_rules - # Compute outcome of a service rule set that just say yes/no def in_boolean_serviceconf_list(self, hostname, descr, ruleset): - # When the requested host is part of the local sites configuration, - # then use only the sites hosts for processing the rules + # type: (str, Text, List) -> bool + """Compute outcome of a service rule set that just say yes/no""" + + # Optimization: When the requested host is part of the local sites + # configuration, then use only the sites hosts for processing the rules with_foreign_hosts = hostname not in self._all_processed_hosts + cache_id = id(ruleset), with_foreign_hosts try: ruleset = self._in_boolean_service_conf_list_ruleset_cache[cache_id] @@ -3506,12 +3512,12 @@ class ConfigCache(object): for negate, hosts, service_matchers in ruleset: if hostname in hosts: - cache_id = service_matchers, descr + match_cache_id = service_matchers, descr try: - match = self._in_boolean_service_conf_list_match_cache[cache_id] + match = self._in_boolean_service_conf_list_match_cache[match_cache_id] except KeyError: match = _in_servicematcher_list(service_matchers, descr) - self._in_boolean_service_conf_list_match_cache[cache_id] = match + self._in_boolean_service_conf_list_match_cache[match_cache_id] = match if match: return not negate

5 years, 2 months

cisco_temperature_dom: Cleanup from not required usr and dev default handling

by Florian Kromer

Module: check_mk Branch: master Commit: 0890ba8cf3c131d9016c24b5ce49a027a743396d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0890ba8cf3c131… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri May 3 13:30:47 2019 +0200 cisco_temperature_dom: Cleanup from not required usr and dev default handling Change-Id: Ia2393fc7934490095d82a70478a67333d03b05af --- checks/cisco_temperature | 106 ++------------------- cmk/gui/plugins/wato/check_parameters/cisco_dom.py | 10 +- tests/unit/checks/test_cisco_temperature.py | 33 ------- 3 files changed, 15 insertions(+), 134 deletions(-) diff --git a/checks/cisco_temperature b/checks/cisco_temperature index 63878f3..09141e0 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -347,99 +347,17 @@ def inventory_cisco_temperature_dom(parsed): yield item, {} -def _determine_all_levels(dlh_upper, dlh_lower, user_levels, dev_levels): - """ - Backend-specific generic determintation of levels dependent on the device - handling configuration, the user and device levels. The returned levels - are conform to the levels expected by the generic check_levels() function. - - dlh_upper/lower: - - "no": Sets user_levels to None. - - "usr": Uses user_levels, ignores dev_levels. - - "dev": Uses dev_levels, ignores usr_levels. - - "devdefault": Uses device's upper/lower_levels if present, - - "usrdefault": Uses user upper/lower_levels if present, otherwise device's_upper/lower_levels. - usr_levels: Tuple[warn_upper, crit_upper, warn_lower, crit_lower] - dev_levels: Tuple[warn_upper, crit_upper, warn_lower, crit_lower] - - In case the user_levels or dev_levels are prefered over the other choice - dependent on the dlh selection ("usrdefault", "devdefault") but only upper or lower - levels defined the overall levels are merged: - - E.g. with dlh "usrdefault", user_levels (None, None, -1.0, -2.0) and - dev_levels (-1.3, 1.699, -7.3, -11.301) are merged into (-1.3, 1.699, -1.0, -2.0). - - Raises ValueError in case of unsupported value passed to dlh_upper/lower. - """ - - def _determine_levels(dlh, user_levels, dev_levels): - """ - Same as _determine_all_levels() but for upper or lower levels only. - - dlh: Same as in _determine_all_levels() but for upper or lower levels only. - user_levels: Tuple[warn, crit] - device_levels: Tuple[warn, crit] - """ - if dlh not in ("no", "usr", "dev", "usrdefault", "devdefault"): - raise ValueError("Invalid value for dlh %s" % dlh) - if not isinstance(user_levels, tuple): - raise TypeError("Invalid type for user_levels %s" % type(user_levels)) - if len(user_levels) != 2: - raise TypeError("user_levels supports 2-Tuple only but is %s" % type(user_levels)) - if not isinstance(dev_levels, tuple): - raise TypeError("Invalid type for dev_levels %s" % type(dev_levels)) - if len(dev_levels) != 2: - raise TypeError("user_levels supports 2-Tuple only but is %s" % type(dev_levels)) - if dlh == "usr": - levels = user_levels - elif dlh == "dev": - levels = dev_levels - else: - if dev_levels is None: - levels = (None, None) - if dlh == "devdefault": - levels = tuple(x if x is not None else y for x, y in zip(dev_levels, user_levels)) - elif dlh == "usrdefault": - levels = tuple(y if y is not None else x for x, y in zip(dev_levels, user_levels)) - else: # "no" - levels = (None, None) - return levels - - upper_levels = _determine_levels(dlh_upper, user_levels[0:2], dev_levels[0:2]) - lower_levels = _determine_levels(dlh_lower, user_levels[2:4], dev_levels[2:4]) - - levels = upper_levels + lower_levels - - if levels == (None, None, None, None): - levels = None # for check_levels() compatibility, no checking - return levels +def _determine_levels(user_levels, device_levels): + if isinstance(user_levels, tuple): + return user_levels + elif user_levels: + return device_levels + return (None, None) def check_cisco_temperature_dom(item, params, parsed): # TODO perf, precision, severity, etc. - def _get_device_level_handling_and_user_levels(levels): - """ - Maps WATO UI specific levels into generically manageable information. - - levels: upper or lower user levels - - False: set device handling indicator to "no checking", set user_levels to Tuple[None, None] - - True: set device handling indicator to "use device levels", set user_levels to Tuple[None, None] - - Tuple[warn, crit]: upper or lower user levels - - Returns: device level handling indicator and user levels as Tuple["no"/"dev"/"usr", 2-Tuple[]] - - Raises TypeError in case levels types are not valid. - """ - if isinstance(levels, tuple) and len(levels) == 2 and all( - isinstance(x, float) for x in levels): - return "usr", levels - elif levels is True: - return "dev", (None, None) - elif levels is False: - return "no", (None, None) - raise TypeError("levels does only accept Bool and 2-Tuple but is %s" % type(levels)) - data = parsed.get('14', {}).get(item, {}) reading = data.get('reading') if reading is None: @@ -449,17 +367,13 @@ def check_cisco_temperature_dom(item, params, parsed): state, state_readable = data['dev_state'] yield state, 'Status: %s' % state_readable + device_levels = data.get('dev_levels', (None, None, None, None)) + # Map WATO configuration of levels to check_levels() compatible tuple. # Default value in case of missing WATO config is use device levels. - upper_levels = params.get("power_levels_upper", True) - dlh_upper, user_levels_upper = _get_device_level_handling_and_user_levels(upper_levels) - lower_levels = params.get("power_levels_lower", True) - dlh_lower, user_levels_lower = _get_device_level_handling_and_user_levels(lower_levels) - - user_levels = user_levels_upper + user_levels_lower - device_levels = data.get('dev_levels', (None, None, None, None)) + levels = (_determine_levels(params.get("power_levels_upper", True), device_levels[0:2]) + + _determine_levels(params.get("power_levels_lower", True), device_levels[2:4])) - levels = _determine_all_levels(dlh_upper, dlh_lower, user_levels, device_levels) if "Transmit" in data["descr"]: dsname = "output_signal_power_dbm" elif "Receive" in data["descr"]: diff --git a/cmk/gui/plugins/wato/check_parameters/cisco_dom.py b/cmk/gui/plugins/wato/check_parameters/cisco_dom.py index 5c056a3..d431d92 100644 --- a/cmk/gui/plugins/wato/check_parameters/cisco_dom.py +++ b/cmk/gui/plugins/wato/check_parameters/cisco_dom.py @@ -70,11 +70,6 @@ def _vs_cisco_dom(which_levels): default_value=True, # use device levels elements=[ FixedValue( - False, - title=_("No levels"), - totext="", - ), - FixedValue( True, title=_("Use device levels"), totext="", @@ -85,6 +80,11 @@ def _vs_cisco_dom(which_levels): Float(title=_(_button_text_warn(which_levels)), unit=_("dBm")), Float(title=_(_button_text_crit(which_levels)), unit=_("dBm")), ]), + FixedValue( + False, + title=_("No levels"), + totext="", + ), ])) diff --git a/tests/unit/checks/test_cisco_temperature.py b/tests/unit/checks/test_cisco_temperature.py deleted file mode 100644 index e710714..0000000 --- a/tests/unit/checks/test_cisco_temperature.py +++ /dev/null @@ -1,33 +0,0 @@ -import pytest - -pytestmark = pytest.mark.checks - - -(a)pytest.mark.parametrize("dlh_upper, dlh_lower, user_levels, dev_levels, expected", [ - ("no", "no", (0.0, 0.0, 0.0, 0.0), (0.0, 0.0, 0.0, 0.0), None), - ("usr", "usr", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), (1.5, 3.0, -1.5, -3.0)), - ("usr", "devdefault", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), (1.5, 3.0, -1.0, -2.0)), - ("usr", "usrdefault", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), (1.5, 3.0, -1.5, -3.0)), - ("devdefault", "usr", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), (1.0, 2.0, -1.5, -3.0)), - ("devdefault", "devdefault", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), - (1.0, 2.0, -1.0, -2.0)), - ("devdefault", "usrdefault", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), - (1.0, 2.0, -1.5, -3.0)), - ("usrdefault", "usr", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), (1.5, 3.0, -1.5, -3.0)), - ("usrdefault", "devdefault", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), - (1.5, 3.0, -1.0, -2.0)), - ("usrdefault", "usrdefault", (1.5, 3.0, -1.5, -3.0), (1.0, 2.0, -1.0, -2.0), - (1.5, 3.0, -1.5, -3.0)), - ("usrdefault", "devdefault", (1.5, 3.0, -1.5, -3.0), (None, None, None, None), - (1.5, 3.0, -1.5, -3.0)), - ("usrdefault", "devdefault", (1.5, 3.0, -1.5, -3.0), (None, None, -1 - 0, -2.0), - (1.5, 3.0, -1.0, -2.0)), -]) -def test_level_determination(check_manager, dlh_upper, dlh_lower, user_levels, dev_levels, - expected): - """ - Combinatorical "all pairs" testing applied to device level handling parameters. - """ - check = check_manager.get_check("cisco_temperature") - determine_all_levels = check.context["_determine_all_levels"] - assert determine_all_levels(dlh_upper, dlh_lower, user_levels, dev_levels) == expected

5 years, 2 months

Move host ruleset match object computation to ConfigCache for the moment

by Lars Michelsen

Module: check_mk Branch: master Commit: 4083a4f4055259a56e202b382becacdffd58ecd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4083a4f4055259… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 09:40:32 2019 +0200 Move host ruleset match object computation to ConfigCache for the moment Change-Id: I0264b8d3f36874e9f57bb8c7ecc269108d8ab3ef --- cmk_base/config.py | 25 ++++++++++++------------- tests/unit/cmk_base/test_config.py | 14 +++++++------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index f95aa99..cca5a82 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2215,7 +2215,6 @@ class HostConfig(object): self.tag_groups = self._config_cache.tags_of_host(hostname) self.labels = self._get_host_labels() self.label_sources = self._get_host_label_sources() - self.ruleset_match_object = self._get_ruleset_match_object() # Basic types self.is_tcp_host = self._config_cache.in_binary_hostlist(hostname, tcp_hosts) @@ -2258,14 +2257,6 @@ class HostConfig(object): self.is_ipv6_primary = (not self.is_ipv4v6_host and self.is_ipv6_host) \ or (self.is_ipv4v6_host and self._primary_ip_address_family_of() == "ipv6") - def _get_ruleset_match_object(self): - # type: () -> RulesetMatchObject - """Construct the dictionary object that is needed to match this host to rulesets""" - return RulesetMatchObject( - host_name=self.hostname, - host_tags=self.tag_groups, - ) - @property def has_piggyback_data(self): if piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, self.hostname): @@ -3091,6 +3082,17 @@ class ConfigCache(object): except KeyError: return {} + # TODO: Move to HostConfig? Is currently not possible to have this in HostConfig because + # the constructor executes rule matching functions. Moved the computation to this place + # to prevent dependency issues for the moment. + def ruleset_match_object_of_host(self, hostname): + # type: (str) -> RulesetMatchObject + """Construct the dictionary object that is needed to match this host to rulesets""" + return RulesetMatchObject( + host_name=hostname, + host_tags=self.tags_of_host(hostname), + ) + def ruleset_match_object_of_service(self, hostname, svc_desc): # type: (str, Text) -> RulesetMatchObject """Construct the dictionary object that is needed to match this service to rulesets @@ -3098,11 +3100,8 @@ class ConfigCache(object): This is done by loading the host match object and extending it with the information of this service. """ - host_config = self.get_host_config(hostname) - match_object = host_config.ruleset_match_object.copy() - + match_object = self.ruleset_match_object_of_host(hostname) match_object.service_description = svc_desc - return match_object def set_all_processed_hosts(self, all_processed_hosts): diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index ec443da..13fba5c 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1248,7 +1248,7 @@ def test_config_cache_get_host_config(monkeypatch, edition_short, expected_cache assert host_config is cache.get_host_config("xyz") -def test_host_ruleset_match_object_of_host(monkeypatch): +def test_config_cache_ruleset_match_object_of_host(monkeypatch): ts = Scenario() ts.set_option("host_tags", { "test-host": { @@ -1258,16 +1258,16 @@ def test_host_ruleset_match_object_of_host(monkeypatch): ts.add_host("test-host", ["abc"]) config_cache = ts.apply(monkeypatch) - cfg = config_cache.get_host_config("xyz") - assert isinstance(cfg.ruleset_match_object, RulesetMatchObject) - assert cfg.ruleset_match_object.to_dict() == { + ruleset_match_object = config_cache.ruleset_match_object_of_host("xyz") + assert isinstance(ruleset_match_object, RulesetMatchObject) + assert ruleset_match_object.to_dict() == { "host_tags": {}, "host_name": "xyz", } - cfg = config_cache.get_host_config("test-host") - assert isinstance(cfg.ruleset_match_object, RulesetMatchObject) - assert cfg.ruleset_match_object.to_dict() == { + ruleset_match_object = config_cache.ruleset_match_object_of_host("test-host") + assert isinstance(ruleset_match_object, RulesetMatchObject) + assert ruleset_match_object.to_dict() == { "host_name": "test-host", "host_tags": { "tag_group": "abc",

5 years, 2 months

Minor cleanup: Move in_binary_hostlist to related methods

by Lars Michelsen

Module: check_mk Branch: master Commit: 37e03b1a5c5348a7682d00f52f42cc2b47829b43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37e03b1a5c5348… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 09:29:31 2019 +0200 Minor cleanup: Move in_binary_hostlist to related methods Change-Id: I431342e15861e6ee0ec5ec77440ec8b51beba9bf --- cmk_base/config.py | 106 ++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 0c70683..9920e5c 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3342,6 +3342,59 @@ class ConfigCache(object): return self._host_extra_conf_match_cache[cache_id][hostname] + def in_binary_hostlist(self, hostname, conf): + cache = self._in_binary_hostlist_cache + + cache_id = id(conf), hostname + try: + return cache[cache_id] + except KeyError: + pass + + if conf and isinstance(conf[0], str): + raise NotImplementedError("Unsupported ruleset found: %s. Please " + "remove the configuration in case you don't need it " + "anymore. Otherwise contact the checkMK team." % conf) + + 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: + 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] + def _convert_host_ruleset(self, ruleset, with_foreign_hosts): new_rules = [] if len(ruleset) == 1 and ruleset[0] == "": @@ -3612,59 +3665,6 @@ class ConfigCache(object): return hostname - def in_binary_hostlist(self, hostname, conf): - cache = self._in_binary_hostlist_cache - - cache_id = id(conf), hostname - try: - return cache[cache_id] - except KeyError: - pass - - if conf and isinstance(conf[0], str): - raise NotImplementedError("Unsupported ruleset found: %s. Please " - "remove the configuration in case you don't need it " - "anymore. Otherwise contact the checkMK team." % conf) - - 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: - 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] - def get_config_cache(): # type: () -> ConfigCache

5 years, 2 months

Fix case where only_hosts is None

by Lars Michelsen

Module: check_mk Branch: master Commit: f736817b33c2e7270db730f1d1b014faf58dcc90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f736817b33c2e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 09:36:34 2019 +0200 Fix case where only_hosts is None Change-Id: I5de944161814434b8da7079f42ca47cbe380d15a --- cmk_base/config.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index fb52726..0c70683 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -700,6 +700,9 @@ def all_offline_hosts(): config_cache.all_configured_realhosts().union(config_cache.all_configured_clusters()), keep_offline_hosts=True)) + if only_hosts is None: + return set() + return set([ hostname for hostname in hostlist if not config_cache.in_binary_hostlist(hostname, only_hosts) @@ -711,6 +714,9 @@ def all_configured_offline_hosts(): config_cache = get_config_cache() hostlist = config_cache.all_configured_realhosts().union(config_cache.all_configured_clusters()) + if only_hosts is None: + return set() + return set([ hostname for hostname in hostlist if not config_cache.in_binary_hostlist(hostname, only_hosts)

5 years, 2 months

Activate sizeofFunctionCall again.

by Sven Panne

Module: check_mk Branch: master Commit: 0594b406c66040652991c297278d2c4d0101cee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0594b406c66040… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 15:38:41 2019 +0200 Activate sizeofFunctionCall again. Change-Id: I319cca62f71155ef14bca9b52716aa08cd7a4500 --- livestatus/src/cppcheck-suppressions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 2e106d6..7db40ac 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -2,7 +2,6 @@ missingIncludeSystem passedByValue redundantAssignment shiftTooManyBitsSigned -sizeofFunctionCall uninitMemberVar unmatchedSuppression unusedFunction

5 years, 2 months

Activate noExplicitConstructor again.

by Sven Panne

Module: check_mk Branch: master Commit: 6ec6997f1aefdd160774459824db43b2e127886c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ec6997f1aefdd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 15:36:53 2019 +0200 Activate noExplicitConstructor again. Change-Id: I6457c005b5a39ba74e0371eafaddd3e5ec65dbc6 --- livestatus/src/cppcheck-suppressions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 68fdd4c..2e106d6 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,5 +1,4 @@ missingIncludeSystem -noExplicitConstructor passedByValue redundantAssignment shiftTooManyBitsSigned @@ -14,7 +13,9 @@ missingOverride:test_*.cc // We do not care about warnings in our libraries. *:*/include/boost/* *:*/include/gtest/* +*:*/include/re2/* // Why on earth do we need this??? unmatchedSuppression:test_*.cc unmatchedSuppression:*/include/boost/* unmatchedSuppression:*/include/gtest/* +unmatchedSuppression:*/include/re2/*

5 years, 2 months

Activate noConstructor again.

by Sven Panne

Module: check_mk Branch: master Commit: 24c78e5e30428fde97b82daf25cb1a808d9ddf8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24c78e5e30428f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 15:30:21 2019 +0200 Activate noConstructor again. Change-Id: I32bbd095341fb1e602ee034d70fb9e0efc18bb62 --- livestatus/src/cppcheck-suppressions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index e019cfa..68fdd4c 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,5 +1,4 @@ missingIncludeSystem -noConstructor noExplicitConstructor passedByValue redundantAssignment @@ -10,11 +9,12 @@ unmatchedSuppression unusedFunction unusedPrivateFunction useStlAlgorithm -// -unmatchedSuppression:*/include/boost/* -preprocessorErrorDirective:*/include/boost/* // The TEST/TEST_F macros from googletest do not contain "override". -unmatchedSuppression:*/include/gtest/* -missingOverride:*/include/gtest/* -unmatchedSuppression:test_*.cc missingOverride:test_*.cc +// We do not care about warnings in our libraries. +*:*/include/boost/* +*:*/include/gtest/* +// Why on earth do we need this??? +unmatchedSuppression:test_*.cc +unmatchedSuppression:*/include/boost/* +unmatchedSuppression:*/include/gtest/*

5 years, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
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