Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 169433a9ae37d59f6fba5574ed5e455b77060b6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=169433a9ae37d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 20:00:26 2019 +0200 Cleanup config.check_interval_of CMK-2030 Change-Id: Ic2516a5e990b5d61f10cbbc141b14101179f4453 --- cmk_base/config.py | 33 +++++++++++++++++++++------------ cmk_base/core_nagios.py | 2 +- cmk_base/data_sources/snmp.py | 2 +- tests/unit/cmk_base/test_config.py | 17 +++++++++++++++++ 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index e19294d..ca28bdc 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -763,18 +763,6 @@ def check_period_of(hostname, service): return None -def check_interval_of(hostname, section_name): - if not cmk_base.cmk_base.check_utils.is_snmp_check(section_name): - return # no values at all for non snmp checks - - # Previous to 1.5 "match" could be a check name (including subchecks) instead of - # only main check names -> section names. This has been cleaned up, but we still - # need to be compatible. Strip of the sub check part of "match". - for match, minutes in get_config_cache().host_extra_conf(hostname, snmp_check_interval): - if match is None or match.split(".")[0] == section_name: - return minutes # use first match - - #. # .--Services------------------------------------------------------------. # | ____ _ | @@ -2507,6 +2495,27 @@ class HostConfig(object): of this site""" return self.hostname in self._config_cache.all_configured_clusters() + def snmp_check_interval(self, section_name): + # type: (str) -> Optional[int] + """Return the check interval of SNMP check sections + + This has been added to reduce the check interval of single SNMP checks (or + more precise: sections) to be executed less frequent that the "Check_MK" + service is executed. + """ + if not cmk_base.cmk_base.check_utils.is_snmp_check(section_name): + return None # no values at all for non snmp checks + + # Previous to 1.5 "match" could be a check name (including subchecks) instead of + # only main check names -> section names. This has been cleaned up, but we still + # need to be compatible. Strip of the sub check part of "match". + for match, minutes in self._config_cache.host_extra_conf(self.hostname, + snmp_check_interval): + if match is None or match.split(".")[0] == section_name: + return minutes # use first match + + return None + @property def agent_port(self): # type: () -> int diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index e5f1fbe..fc8e680 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -325,7 +325,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): check_interval = int(values[0]) except: check_interval = float(values[0]) - value = config.check_interval_of(hostname, cmk_base.check_utils.section_name_of(checkname)) + value = host_config.snmp_check_interval(cmk_base.check_utils.section_name_of(checkname)) if value is not None: check_interval = value diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index f696658..3795852 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -247,7 +247,7 @@ class SNMPDataSource(DataSource): persisted_sections = {} for section_name, section_content in raw_data.items(): - check_interval = config.check_interval_of(self._hostname, section_name) + check_interval = self._host_config.snmp_check_interval(section_name) if check_interval is None: continue diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 116175f..c574970 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -9,6 +9,7 @@ import cmk import cmk.utils.paths import cmk_base.config as config import cmk_base.piggyback as piggyback +import cmk_base.check_api as check_api def test_all_configured_realhosts(monkeypatch): @@ -399,6 +400,22 @@ def test_host_config_exit_code_spec_individual(monkeypatch, hostname, result): assert config_cache.get_host_config(hostname).exit_code_spec(data_source_id="snmp") == result +(a)pytest.mark.parametrize("hostname,section_name,result", [ + ("testhost1", "uptime", None), + ("testhost2", "uptime", None), + ("testhost1", "snmp_uptime", None), + ("testhost2", "snmp_uptime", 4), +]) +def test_host_config_snmp_check_interval(monkeypatch, hostname, section_name, result): + config.load_checks(check_api.get_check_api_context, ["checks/uptime", "checks/snmp_uptime"]) + ts = Scenario().add_host(hostname) + ts.set_ruleset("snmp_check_interval", [ + (("snmp_uptime", 4), [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).snmp_check_interval(section_name) == result + + def test_http_proxies(): assert config.http_proxies == {}

5 years, 2 months

Cleanup config.exit_code_spec

by Lars Michelsen

Module: check_mk Branch: master Commit: 81151bf1258061289282819600f0847200820c3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81151bf1258061… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 19:35:15 2019 +0200 Cleanup config.exit_code_spec CMK-2030 Change-Id: I8db2ede87168f6a90c0c5f75ec8586156e1982d2 --- cmk_base/checking.py | 3 +-- cmk_base/config.py | 49 +++++++++++++++++++------------------- cmk_base/data_sources/abstract.py | 9 ++++--- cmk_base/data_sources/programs.py | 3 --- cmk_base/data_sources/tcp.py | 4 ++-- cmk_base/decorator.py | 3 ++- tests/unit/cmk_base/test_config.py | 48 +++++++++++++++++++++++++++++++++++++ 7 files changed, 82 insertions(+), 37 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 2bc025d..3956293 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -92,8 +92,7 @@ def do_check(hostname, ipaddress, only_check_plugin_names=None): config_cache = config.get_config_cache() host_config = config_cache.get_host_config(hostname) - # Exit state in various situations is configurable since 1.2.3i1 - exit_spec = config.exit_code_spec(hostname) + exit_spec = host_config.exit_code_spec() status, infotexts, long_infotexts, perfdata = 0, [], [], [] try: diff --git a/cmk_base/config.py b/cmk_base/config.py index 16de0f8..e19294d 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -751,30 +751,6 @@ def get_explicit_service_custom_variables(hostname, description): # -def exit_code_spec(hostname, data_source_id=None): - spec = {} - specs = get_config_cache().host_extra_conf(hostname, check_mk_exit_status) - for entry in specs[::-1]: - spec.update(entry) - return _get_exit_code_spec(spec, data_source_id) - - -def _get_exit_code_spec(spec, data_source_id): - if data_source_id is not None: - try: - return spec["individual"][data_source_id] - except KeyError: - pass - - try: - return spec["overall"] - except KeyError: - pass - - # Old configuration format - return spec - - def check_period_of(hostname, service): periods = get_config_cache().service_extra_conf(hostname, service, check_periods) if periods: @@ -2648,6 +2624,31 @@ class HostConfig(object): return default_value + def exit_code_spec(self, data_source_id=None): + # type: (Optional[str]) -> Dict[str, int] + spec = {} # type: Dict[str, int] + # TODO: Can we use host_extra_conf_merged? + specs = self._config_cache.host_extra_conf(self.hostname, check_mk_exit_status) + for entry in specs[::-1]: + spec.update(entry) + return self._merge_with_data_source_exit_code_spec(spec, data_source_id) + + def _merge_with_data_source_exit_code_spec(self, spec, data_source_id): + # type: (Dict, Optional[str]) -> Dict[str, int] + if data_source_id is not None: + try: + return spec["individual"][data_source_id] + except KeyError: + pass + + try: + return spec["overall"] + except KeyError: + pass + + # Old configuration format + return spec + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 178daa3..805428c 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -85,7 +85,6 @@ class DataSource(object): # Runtime data (managed by self.run()) - Meant for self.get_summary_result() self._exception = None self._host_sections = None - self._exit_code_spec = config.exit_code_spec(hostname, data_source_id=self.id()) self._persisted_sections = None self._config_cache = config.get_config_cache() @@ -388,16 +387,16 @@ class DataSource(object): exc_msg = "%s" % self._exception if isinstance(self._exception, MKEmptyAgentData): - status = self._exit_code_spec.get("empty_output", 2) + status = self._host_config.exit_code_spec().get("empty_output", 2) elif isinstance(self._exception, (MKAgentError, MKIPAddressLookupError, MKSNMPError)): - status = self._exit_code_spec.get("connection", 2) + status = self._host_config.exit_code_spec().get("connection", 2) elif isinstance(self._exception, MKTimeout): - status = self._exit_code_spec.get("timeout", 2) + status = self._host_config.exit_code_spec().get("timeout", 2) else: - status = self._exit_code_spec.get("exception", 3) + status = self._host_config.exit_code_spec().get("exception", 3) return status, exc_msg + check_api_utils.state_markers[status], [] diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index 50ff366..659805f 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -180,9 +180,6 @@ class SpecialAgentDataSource(ProgramDataSource): def special_agent_plugin_file_name(self): return "agent_%s" % self._special_agent_id - def _get_individual_exit_code_spec(self, exit_code_spec): - return exit_code_spec["individual"]["special"] - # TODO: Can't we make this more specific in case of special agents? def _gather_check_plugin_names(self): return config.discoverable_tcp_checks() diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 676aa22..58a80a7 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -192,12 +192,12 @@ class TCPDataSource(CheckMKAgentDataSource): expected += ' release %s' % expected_version[1]['release'] else: expected = expected_version - status = self._exit_code_spec.get("wrong_version", 1) + status = self._host_config.exit_code_spec().get("wrong_version", 1) output = ", unexpected agent version %s (should be %s)%s" \ % (agent_version, expected, state_markers[status]) elif config.agent_min_version and agent_version < config.agent_min_version: - status = self._exit_code_spec.get("wrong_version", 1) + status = self._host_config.exit_code_spec().get("wrong_version", 1) output = ", old plugin version %s (should be at least %s)%s" \ % (agent_version, config.agent_min_version, state_markers[status]) diff --git a/cmk_base/decorator.py b/cmk_base/decorator.py index 580be96..53e7591 100644 --- a/cmk_base/decorator.py +++ b/cmk_base/decorator.py @@ -46,7 +46,8 @@ def handle_check_mk_check_result(check_plugin_name, description): def wrap(check_func): def wrapped_check_func(hostname, *args, **kwargs): - exit_spec = config.exit_code_spec(hostname) + host_config = config.get_config_cache().get_host_config(hostname) + exit_spec = host_config.exit_code_spec() status, infotexts, long_infotexts, perfdata = 0, [], [], [] diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index da7c5ec..116175f 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -351,6 +351,54 @@ def test_host_config_contactgroups(monkeypatch, hostname, result): assert config_cache.get_host_config(hostname).contactgroups == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", {}), + ("testhost2", { + 'empty_output': 1 + }), +]) +def test_host_config_exit_code_spec_overall(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("check_mk_exit_status", [ + ({ + "overall": { + "empty_output": 1 + }, + "individual": { + "snmp": { + "empty_output": 4 + } + }, + }, [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).exit_code_spec() == result + + +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", {}), + ("testhost2", { + 'empty_output': 4 + }), +]) +def test_host_config_exit_code_spec_individual(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("check_mk_exit_status", [ + ({ + "overall": { + "empty_output": 1 + }, + "individual": { + "snmp": { + "empty_output": 4 + } + }, + }, [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).exit_code_spec(data_source_id="snmp") == result + + def test_http_proxies(): assert config.http_proxies == {}

5 years, 2 months

Move config.datasource_programs ruleset processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 29b7f0c4e91f2d3005237786c15065f70e9090c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29b7f0c4e91f2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 07:22:01 2019 +0200 Move config.datasource_programs ruleset processing to HostConfig CMK-2030 Change-Id: Ib570d590d62fe40886ce2a79a895a52b44c42620 --- cmk_base/config.py | 13 +++++++++++++ cmk_base/data_sources/__init__.py | 6 +++--- tests/unit/cmk_base/test_config.py | 13 +++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 7d719fe..06cb8cd 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2510,6 +2510,19 @@ class HostConfig(object): return spec # return the whole spec in case of an "at least version" config @property + def datasource_program(self): + # type: () -> Optional[str] + """Return the command line to execute instead of contacting the agent + + In case no datasource program is configured for a host return None + """ + programs = self._config_cache.host_extra_conf(self.hostname, datasource_programs) + if not programs: + return None + + return programs[0] + + @property def hostgroups(self): # type: () -> List[str] """Returns the list of hostgroups of this host diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 9a6523a..7aa1803 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -179,9 +179,9 @@ class DataSources(object): if special_agents: return special_agents[0] - programs = self._config_cache.host_extra_conf(self._hostname, config.datasource_programs) - if programs: - return DSProgramDataSource(self._hostname, self._ipaddress, programs[0]) + datasource_program = self._host_config.datasource_program + if datasource_program is not None: + return DSProgramDataSource(self._hostname, self._ipaddress, datasource_program) return TCPDataSource(self._hostname, self._ipaddress) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index f99fd00..5b76c12 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -343,6 +343,19 @@ def test_host_config_agent_target_version(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", "echo 1"), +]) +def test_host_config_datasource_program(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("datasource_programs", [ + ("echo 1", [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).datasource_program == result + + +(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", ["check_mk"]), ("testhost2", ["dingdong"]), ])

5 years, 2 months

Move config.special_agents processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a5d9baa1991701d1776267f555382db5728fdfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a5d9baa199170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 07:34:30 2019 +0200 Move config.special_agents processing to HostConfig CMK-2030 Change-Id: Ia20e039b1cbf977e82af5c3e74e880cdf02a9cd1 --- cmk_base/config.py | 16 ++++++++++++++++ cmk_base/data_sources/__init__.py | 21 ++++++--------------- tests/unit/cmk_base/test_config.py | 26 ++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 06cb8cd..7d0feb0 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2523,6 +2523,22 @@ class HostConfig(object): return programs[0] @property + def special_agents(self): + # type: () -> List[Tuple[str, Dict]] + matched = [] # type: List[Tuple[str, Dict]] + # Previous to 1.5.0 it was not defined in which order the special agent + # rules overwrite each other. When multiple special agents were configured + # for a single host a "random" one was picked (depending on the iteration + # over config.special_agents. + # We now sort the matching special agents by their name to at least get + # a deterministic order of the special agents. + for agentname, ruleset in sorted(special_agents.items()): + params = self._config_cache.host_extra_conf(self.hostname, ruleset) + if params: + matched.append((agentname, params[0])) + return matched + + @property def hostgroups(self): # type: () -> List[str] """Returns the list of hostgroups of this host diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 7aa1803..8e20f3f 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -41,6 +41,7 @@ import socket import subprocess import sys import time +from typing import List # pylint: disable=unused-import import cmk.utils.paths import cmk.utils.debug @@ -186,21 +187,11 @@ class DataSources(object): return TCPDataSource(self._hostname, self._ipaddress) def _get_special_agent_data_sources(self): - special_agents = [] - - # Previous to 1.5.0 it was not defined in which order the special agent - # rules overwrite eachother. When multiple special agents were configured - # for a single host a "random" one was picked (depending on the iteration - # over config.special_agents. - # We now sort the matching special agents by their name to at least get - # a deterministic order of the special agents. - for agentname, ruleset in sorted(config.special_agents.items()): - params = self._config_cache.host_extra_conf(self._hostname, ruleset) - if params: - special_agents.append( - SpecialAgentDataSource(self._hostname, self._ipaddress, agentname, params[0])) - - return special_agents + # type: () -> List[SpecialAgentDataSource] + return [ + SpecialAgentDataSource(self._hostname, self._ipaddress, agentname, params) + for agentname, params in self._host_config.special_agents + ] def get_check_plugin_names(self): """Returns the list of check types the caller may execute on the sections produced diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 5b76c12..c1f2b0e 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -356,6 +356,32 @@ def test_host_config_datasource_program(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ + ("testhost1", []), + ("testhost2", [ + ("abc", { + "param1": 1 + }), + ("xyz", { + "param2": 1 + }), + ]), +]) +def test_host_config_special_agents(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_option( + "special_agents", { + "abc": [({ + "param1": 1 + }, [], ["testhost2"], {}),], + "xyz": [({ + "param2": 1 + }, [], ["testhost2"], {}),], + }) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).special_agents == result + + +(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", ["check_mk"]), ("testhost2", ["dingdong"]), ])

5 years, 2 months

Cleanup config.get_explicit_service_custom_variables

by Lars Michelsen

Module: check_mk Branch: master Commit: c754d517298382e1a0912715532313440bada6c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c754d517298382… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 20:36:10 2019 +0200 Cleanup config.get_explicit_service_custom_variables CMK-2030 Change-Id: Ib098a7215e07740d89633720073662b61d3a325f --- cmk_base/config.py | 17 +++++++---------- cmk_base/core_config.py | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 0cb4879..7d719fe 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -727,16 +727,6 @@ def _host_is_member_of_site(config_cache, hostname, site): # -# Explicit custom variables -# -def get_explicit_service_custom_variables(hostname, description): - try: - return explicit_service_custom_variables[(hostname, description)] - except KeyError: - return {} - - -# # Misc # @@ -2832,6 +2822,13 @@ class ConfigCache(object): }) return labels + def get_explicit_service_custom_variables(self, hostname, description): + # type: (str, Text) -> Dict[str, str] + try: + return explicit_service_custom_variables[(hostname, description)] + except KeyError: + return {} + 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 diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 7f75278..83e7b0c 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -358,8 +358,8 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa attrs[key] = values[0] # Add explicit custom_variables - for varname, value in config.get_explicit_service_custom_variables(hostname, - description).iteritems(): + for varname, value in config_cache.get_explicit_service_custom_variables( + hostname, description).iteritems(): attrs["_%s" % varname.upper()] = value # Add custom user icons and actions

5 years, 2 months

Move config.agent_config.onlyfrom processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: cc231449745a00582a3e4b7d15c016b0c4a4af52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc231449745a00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 07:39:59 2019 +0200 Move config.agent_config.onlyfrom processing to HostConfig CMK-2030 Change-Id: I711c6e368db817cba3de666a204769834423d6a8 --- cmk_base/config.py | 14 ++++++++++++++ cmk_base/data_sources/tcp.py | 8 +------- tests/unit/cmk_base/test_config.py | 21 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 7d0feb0..41b6e28 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2539,6 +2539,20 @@ class HostConfig(object): return matched @property + def only_from(self): + # type: () -> Optional[Union[List[str], str]] + """The agent of a host may be configured to be accessible only from specific IPs""" + ruleset = agent_config.get("only_from", []) + if not ruleset: + return None + + entries = self._config_cache.host_extra_conf(self.hostname, ruleset) + if not entries: + return None + + return entries[0] + + @property def hostgroups(self): # type: () -> List[str] """Returns the list of hostgroups of this host diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 58a80a7..93ccc15 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -208,13 +208,7 @@ class TCPDataSource(CheckMKAgentDataSource): def _sub_result_only_from(self, agent_info): agent_only_from = agent_info.get("onlyfrom") - - ruleset = config.agent_config.get("only_from") - if not ruleset: - return 0, '' - - entries = config.get_config_cache().host_extra_conf(self._hostname, ruleset) - config_only_from = entries[0] if entries else None + config_only_from = self._host_config.only_from if None in (agent_only_from, config_only_from): return 0, '' diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index c1f2b0e..5e7a48b 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -382,6 +382,27 @@ def test_host_config_special_agents(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", ["127.0.0.1"]), +]) +def test_host_config_only_from(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_option( + "agent_config", { + "only_from": [ + ([ + "127.0.0.1", + ], [], ["testhost2"], {}), + ([ + "127.0.0.2", + ], [], ["testhost2"], {}), + ], + }) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).only_from == result + + +(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", ["check_mk"]), ("testhost2", ["dingdong"]), ])

5 years, 2 months

Move config.host_check_commands processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e6f4796222bb019b68cfa8aeb949fe02cb24cef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e6f4796222bb0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 07:44:38 2019 +0200 Move config.host_check_commands processing to HostConfig CMK-2030 Change-Id: I5affcdc1612285ec4fc4290ed65c7c25ac2c5d9e --- cmk_base/config.py | 12 ++++++++++++ cmk_base/core_config.py | 11 ++++------- tests/unit/cmk_base/test_config.py | 21 +++++++++++++++++++++ 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 41b6e28..38107df 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2553,6 +2553,18 @@ class HostConfig(object): return entries[0] @property + def explicit_check_command(self): + # type: () -> Optional[str] + entries = self._config_cache.host_extra_conf(self.hostname, host_check_commands) + if not entries: + return None + + if entries[0] == "smart" and monitoring_core != "cmc": + return "ping" # avoid problems when switching back to nagios core + + return entries[0] + + @property def hostgroups(self): # type: () -> List[str] """Returns the list of hostgroups of this host diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 83e7b0c..4964d29 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -100,10 +100,10 @@ def host_check_command(config_cache, is_clust, hostcheck_commands_to_define=None, custom_commands_to_define=None): - # Check dedicated host check command - values = config_cache.host_extra_conf(host_config.hostname, config.host_check_commands) - if values: - value = values[0] + + explicit_command = host_config.explicit_check_command + if explicit_command is not None: + value = explicit_command elif host_config.is_no_ip_host: value = "ok" elif config.monitoring_core == "cmc": @@ -111,9 +111,6 @@ def host_check_command(config_cache, else: value = "ping" - if config.monitoring_core != "cmc" and value == "smart": - value = "ping" # avoid problems when switching back to nagios core - if value == "smart" and not is_clust: return "check-mk-host-smart" diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 5e7a48b..0537c7d 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -402,6 +402,27 @@ def test_host_config_only_from(monkeypatch, hostname, result): assert config_cache.get_host_config(hostname).only_from == result +(a)pytest.mark.parametrize("hostname,core_name,result", [ + ("testhost1", "cmc", None), + ("testhost2", "cmc", "command1"), + ("testhost3", "cmc", "smart"), + ("testhost3", "nagios", "ping"), +]) +def test_host_config_explicit_check_command(monkeypatch, hostname, core_name, result): + ts = Scenario().add_host(hostname) + ts.set_option("monitoring_core", core_name) + ts.set_option( + "host_check_commands", + [ + ("command1", [], ["testhost2"], {}), + ("command2", [], ["testhost2"], {}), + ("smart", [], ["testhost3"], {}), + ], + ) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).explicit_check_command == result + + @pytest.mark.parametrize("hostname,result", [ ("testhost1", ["check_mk"]), ("testhost2", ["dingdong"]),

5 years, 2 months

Cleanup config.additional_ip_addresses

by Lars Michelsen

Module: check_mk Branch: master Commit: a3dc998011ed8a70ca2208362d96b4abe6501cf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3dc998011ed8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 20:14:06 2019 +0200 Cleanup config.additional_ip_addresses CMK-2030 Change-Id: I53f5982291420a8383975540c107bddb17fbe661 --- cmk_base/config.py | 20 ++++++++++---------- cmk_base/core_config.py | 2 +- tests/unit/cmk_base/test_config.py | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index ca28bdc..03c8710 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -726,16 +726,6 @@ def _host_is_member_of_site(config_cache, hostname, site): return True -def get_additional_ipaddresses_of(hostname): - # type: (str) -> Tuple[List[str], List[str]] - #TODO Regarding the following configuration variables from WATO - # there's no inheritance, thus we use 'host_attributes'. - # Better would be to use cmk_base configuration variables, - # eg. like 'management_protocol'. - return (host_attributes.get(hostname, {}).get("additional_ipv4addresses", []), - host_attributes.get(hostname, {}).get("additional_ipv6addresses", [])) - - # # Explicit custom variables # @@ -2633,6 +2623,16 @@ class HostConfig(object): return default_value + @property + def additional_ipaddresses(self): + # type: () -> Tuple[List[str], List[str]] + #TODO Regarding the following configuration variables from WATO + # there's no inheritance, thus we use 'host_attributes'. + # Better would be to use cmk_base configuration variables, + # eg. like 'management_protocol'. + return (host_attributes.get(self.hostname, {}).get("additional_ipv4addresses", []), + host_attributes.get(self.hostname, {}).get("additional_ipv6addresses", [])) + def exit_code_spec(self, data_source_id=None): # type: (Optional[str]) -> Dict[str, int] spec = {} # type: Dict[str, int] diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 0bbc417..7f75278 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -428,7 +428,7 @@ def get_host_attributes(hostname, config_cache): attrs["address"] = attrs["_ADDRESS_4"] attrs["_ADDRESS_FAMILY"] = "4" - add_ipv4addrs, add_ipv6addrs = config.get_additional_ipaddresses_of(hostname) + add_ipv4addrs, add_ipv6addrs = host_config.additional_ipaddresses if add_ipv4addrs: attrs["_ADDRESSES_4"] = " ".join(add_ipv4addrs) for nr, ipv4_address in enumerate(add_ipv4addrs): diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index c574970..01c7b7a 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -145,6 +145,22 @@ def test_host_config_management_address(monkeypatch, attrs, result): assert config_cache.get_host_config("hostname").management_address == result +(a)pytest.mark.parametrize("attrs,result", [ + ({}, ([], [])), + ({ + "additional_ipv4addresses": ["10.10.10.10"], + "additional_ipv6addresses": ["::3"], + }, (["10.10.10.10"], ["::3"])), +]) +def test_host_config_additional_ipaddresses(monkeypatch, attrs, result): + ts = Scenario().add_host("hostname") + ts.set_option("ipaddresses", {"hostname": "127.0.1.1"}) + ts.set_option("host_attributes", {"hostname": attrs}) + config_cache = ts.apply(monkeypatch) + + assert config_cache.get_host_config("hostname").additional_ipaddresses == result + + @pytest.mark.parametrize("hostname,tags,result", [ ("testhost", [], True), ("testhost", ["cmk-agent"], True),

5 years, 2 months

Cleanup config.do_host_label_discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: d51550095ac3551fbae5d98a49317406f73deed0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d51550095ac355… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 20:24:52 2019 +0200 Cleanup config.do_host_label_discovery CMK-2030 Change-Id: I6e961b7756b3624195287eac3514f5411d5b473d --- cmk_base/config.py | 33 +++++++++++++++++---------------- cmk_base/inventory.py | 14 ++++---------- tests/unit/cmk_base/test_config.py | 6 +++--- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 82abafb..0cb4879 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2091,22 +2091,6 @@ def _get_checkgroup_parameters(config_cache, host, checktype, item): raise MKGeneralException(str(e) + " (on host %s, checktype %s)" % (host, checktype)) -def do_host_label_discovery_for(hostname): - rules = active_checks.get('cmk_inv') - if rules is None: - return True - - entries = get_config_cache().host_extra_conf(hostname, rules) - - if not entries: - return True # No matching rule -> disable - - # Convert legacy rules to current dict format (just like the valuespec) - params = {} if entries[0] is None else entries[0] - - return params.get("host_label_inventory", True) - - def filter_by_management_board(hostname, found_check_plugin_names, for_mgmt_board, @@ -2659,6 +2643,23 @@ class HostConfig(object): return params.get('status_data_inventory', False) + @property + def do_host_label_discovery(self): + # type: () -> bool + rules = active_checks.get('cmk_inv') + if rules is None: + return True + + entries = self._config_cache.host_extra_conf(self.hostname, rules) + + if not entries: + return True # No matching rule -> disable + + # Convert legacy rules to current dict format (just like the valuespec) + params = {} if entries[0] is None else entries[0] + + return params.get("host_label_inventory", True) + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 1e9afa5..b0fae6c 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -87,7 +87,6 @@ def do_inv(hostnames): host_config=host_config, ipaddress=ipaddress, do_status_data_inv=host_config.do_status_data_inventory, - do_host_label_discovery=config.do_host_label_discovery_for(hostname), ) except Exception as e: if cmk.utils.debug.enabled(): @@ -124,7 +123,6 @@ def do_inv_check(hostname, options): host_config=host_config, ipaddress=ipaddress, do_status_data_inv=host_config.do_status_data_inventory, - do_host_label_discovery=config.do_host_label_discovery_for(hostname), ) if (inventory_tree.is_empty() and status_data_tree.is_empty() and @@ -179,12 +177,10 @@ def do_inventory_actions_during_checking_for(sources, multi_host_sections, host_ hostname = host_config.hostname do_status_data_inventory = not host_config.is_cluster and host_config.do_status_data_inventory - do_host_label_discovery = config.do_host_label_discovery_for(hostname) - if not do_status_data_inventory: _cleanup_status_data(hostname) - if not do_status_data_inventory and not do_host_label_discovery: + if not do_status_data_inventory and not host_config.do_host_label_discovery: return # nothing to do here # This is called during checking, but the inventory plugins are not loaded yet @@ -200,7 +196,6 @@ def do_inventory_actions_during_checking_for(sources, multi_host_sections, host_ host_config=host_config, ipaddress=ipaddress, do_status_data_inv=do_status_data_inventory, - do_host_label_discovery=do_host_label_discovery, ) @@ -213,9 +208,8 @@ def _cleanup_status_data(hostname): os.remove(filepath + ".gz") -def _do_inv_for(sources, multi_host_sections, host_config, ipaddress, do_status_data_inv, - do_host_label_discovery): - # type: (data_sources.DataSources, data_sources.MultiHostSections, config.HostConfig, Optional[str], bool, bool) -> Tuple[Optional[float], StructuredDataTree, StructuredDataTree, DiscoveredHostLabels] +def _do_inv_for(sources, multi_host_sections, host_config, ipaddress, do_status_data_inv): + # type: (data_sources.DataSources, data_sources.MultiHostSections, config.HostConfig, Optional[str], bool) -> Tuple[Optional[float], StructuredDataTree, StructuredDataTree, DiscoveredHostLabels] hostname = host_config.hostname _initialize_inventory_tree() @@ -241,7 +235,7 @@ def _do_inv_for(sources, multi_host_sections, host_config, ipaddress, do_status_ tty.normal) ] - if do_host_label_discovery: + if host_config.do_host_label_discovery: DiscoveredHostLabelsStore(hostname).save(discovered_host_labels.to_dict()) success_msg.append("and %s%s%d%s host labels" % (tty.bold, tty.yellow, len(discovered_host_labels), tty.normal)) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 832d679..f99fd00 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -757,11 +757,11 @@ def test_host_config_do_status_data_inventory(monkeypatch, result, ruleset): "host_label_inventory": False }, [], config.ALL_HOSTS, {})]), ]) -def test_do_host_label_discovery_for(monkeypatch, result, ruleset): +def test_host_config_do_host_label_discovery_for(monkeypatch, result, ruleset): ts = Scenario().add_host("abc", []) ts.set_option("active_checks", { "cmk_inv": ruleset, }) - ts.apply(monkeypatch) + config_cache = ts.apply(monkeypatch) - assert config.do_host_label_discovery_for("abc") == result + assert config_cache.get_host_config("abc").do_host_label_discovery == result

5 years, 2 months

Cleanup config.do_status_data_inventory_for

by Lars Michelsen

Module: check_mk Branch: master Commit: c9ba7d33a2958af1d2e3424b922998576415c06b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9ba7d33a2958a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 20:21:19 2019 +0200 Cleanup config.do_status_data_inventory_for CMK-2030 Change-Id: I266a4ee44fc64f8c7ef8b6d97a341fd8bddb0fd9 --- cmk_base/config.py | 37 +++++++++++++++++++------------------ cmk_base/inventory.py | 7 +++---- tests/unit/cmk_base/test_config.py | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 03c8710..82abafb 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2091,24 +2091,6 @@ def _get_checkgroup_parameters(config_cache, host, checktype, item): raise MKGeneralException(str(e) + " (on host %s, checktype %s)" % (host, checktype)) -def do_status_data_inventory_for(hostname): - rules = active_checks.get('cmk_inv') - if rules is None: - return False - - # 'host_extra_conf' is already cached thus we can - # use it after every check cycle. - entries = get_config_cache().host_extra_conf(hostname, rules) - - if not entries: - return False # No matching rule -> disable - - # Convert legacy rules to current dict format (just like the valuespec) - params = {} if entries[0] is None else entries[0] - - return params.get('status_data_inventory', False) - - def do_host_label_discovery_for(hostname): rules = active_checks.get('cmk_inv') if rules is None: @@ -2658,6 +2640,25 @@ class HostConfig(object): # Old configuration format return spec + @property + def do_status_data_inventory(self): + # type: () -> bool + rules = active_checks.get('cmk_inv') + if rules is None: + return False + + # 'host_extra_conf' is already cached thus we can + # use it after every check cycle. + entries = self._config_cache.host_extra_conf(self.hostname, rules) + + if not entries: + return False # No matching rule -> disable + + # Convert legacy rules to current dict format (just like the valuespec) + params = {} if entries[0] is None else entries[0] + + return params.get('status_data_inventory', False) + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 4442b82..1e9afa5 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -86,7 +86,7 @@ def do_inv(hostnames): multi_host_sections=None, host_config=host_config, ipaddress=ipaddress, - do_status_data_inv=config.do_status_data_inventory_for(hostname), + do_status_data_inv=host_config.do_status_data_inventory, do_host_label_discovery=config.do_host_label_discovery_for(hostname), ) except Exception as e: @@ -123,7 +123,7 @@ def do_inv_check(hostname, options): multi_host_sections=None, host_config=host_config, ipaddress=ipaddress, - do_status_data_inv=config.do_status_data_inventory_for(hostname), + do_status_data_inv=host_config.do_status_data_inventory, do_host_label_discovery=config.do_host_label_discovery_for(hostname), ) @@ -177,8 +177,7 @@ def do_inv_check(hostname, options): def do_inventory_actions_during_checking_for(sources, multi_host_sections, host_config, ipaddress): # type: (data_sources.DataSources, data_sources.MultiHostSections, config.HostConfig, Optional[str]) -> None hostname = host_config.hostname - do_status_data_inventory = not host_config.is_cluster \ - and config.do_status_data_inventory_for(hostname) + do_status_data_inventory = not host_config.is_cluster and host_config.do_status_data_inventory do_host_label_discovery = config.do_host_label_discovery_for(hostname) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 01c7b7a..832d679 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -735,14 +735,14 @@ def test_host_ruleset_match_object_of_service(monkeypatch): "status_data_inventory": False }, [], config.ALL_HOSTS, {})]), ]) -def test_do_status_data_inventory_for(monkeypatch, result, ruleset): +def test_host_config_do_status_data_inventory(monkeypatch, result, ruleset): ts = Scenario().add_host("abc", []) ts.set_option("active_checks", { "cmk_inv": ruleset, }) - ts.apply(monkeypatch) + config_cache = ts.apply(monkeypatch) - assert config.do_status_data_inventory_for("abc") == result + assert config_cache.get_host_config("abc").do_status_data_inventory == result @pytest.mark.parametrize("result,ruleset", [

5 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019