Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 68922eb781ab7ebba53551324b31476fae6c63cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68922eb781ab7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 07:47:23 2019 +0200 Add tests for host list functions Change-Id: Id4da7a9be4e16e4ed1f2c7d1a81fcce49e33a324 --- tests/unit/cmk_base/test_config.py | 59 +++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 783fcc1..ec443da 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -12,7 +12,49 @@ import cmk_base.piggyback as piggyback import cmk_base.check_api as check_api -def test_all_configured_realhosts(monkeypatch): +def test_duplicate_hosts(monkeypatch): + ts = Scenario() + ts.add_host("bla1") + ts.add_host("bla1") + ts.add_host("zzz") + ts.add_host("zzz") + ts.add_host("yyy") + ts.apply(monkeypatch) + assert config.duplicate_hosts() == ["bla1", "zzz"] + + +def test_all_offline_hosts(monkeypatch): + ts = Scenario() + ts.add_host("blub", ["offline"]) + ts.add_host("bla") + ts.apply(monkeypatch) + assert config.all_offline_hosts() == set() + + +def test_all_offline_hosts_with_wato_default_config(monkeypatch): + ts = Scenario(site_id="site1") + ts.set_ruleset("only_hosts", [ + (["!offline"], config.ALL_HOSTS), + ]) + ts.add_host("blub1", ["offline"]) + ts.add_host("blub2", ["offline", "site:site2"]) + ts.add_host("bla") + ts.apply(monkeypatch) + assert config.all_offline_hosts() == set(["blub1"]) + + +def test_all_configured_offline_hosts(monkeypatch): + ts = Scenario(site_id="site1") + ts.set_ruleset("only_hosts", [ + (["!offline"], config.ALL_HOSTS), + ]) + ts.add_host("blub1", ["offline", "site:site1"]) + ts.add_host("blub2", ["offline", "site:site2"]) + ts.apply(monkeypatch) + assert config.all_offline_hosts() == set(["blub1"]) + + +def test_all_configured_hosts(monkeypatch): ts = Scenario(site_id="site1") ts.add_host("real1", ["site:site1"]) ts.add_host("real2", ["site:site2"]) @@ -28,6 +70,21 @@ def test_all_configured_realhosts(monkeypatch): ["cluster1", "cluster2", "cluster3", "real1", "real2", "real3"]) +def test_all_active_hosts(monkeypatch): + ts = Scenario(site_id="site1") + ts.add_host("real1", ["site:site1"]) + ts.add_host("real2", ["site:site2"]) + ts.add_host("real3", []) + ts.add_cluster("cluster1", ["site:site1"], nodes=["node1"]) + ts.add_cluster("cluster2", ["site:site2"], nodes=["node2"]) + ts.add_cluster("cluster3", [], nodes=["node3"]) + + config_cache = ts.apply(monkeypatch) + assert config_cache.all_active_clusters() == set(["cluster1", "cluster3"]) + assert config_cache.all_active_realhosts() == set(["real1", "real3"]) + assert config_cache.all_active_hosts() == set(["cluster1", "cluster3", "real1", "real3"]) + + @pytest.mark.parametrize("hostname,tags,result", [ ("testhost", [], True), ("testhost", ["ip-v4"], True),

5 years, 1 month

Cleanup GUI config file loading a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 6bf830c9d5dd0e1a4db8667dba1c8c72c4062f59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bf830c9d5dd0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat May 4 20:28:08 2019 +0200 Cleanup GUI config file loading a bit * Cleaned up loading code a bit * multisite.mk is now optional Change-Id: I4ade430545f48a0337588221aea0f5e9d9f2ca31 --- cmk/gui/config.py | 22 ++++++++++------------ tests/unit/cmk/gui/conftest.py | 6 ------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index d8f2be5..5c06cb3 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -153,18 +153,16 @@ def initialize(): cmk.gui.i18n.set_user_localizations(user_localizations) -# Read in a multisite.d/*.mk file -def include(filename): - if not filename.startswith("/"): - filename = cmk.utils.paths.default_config_dir + "/" + filename - - # Config file is obligatory. An empty example is installed - # during setup.sh. Better signal an error then simply ignore - # Absence. +def _load_config_file(path): + # type: (str) -> None + """Load the given GUI configuration file""" try: - execfile(filename, globals(), globals()) + execfile(path, globals(), globals()) + except IOError as e: + if e.errno != errno.ENOENT: # No such file or directory + raise except Exception as e: - raise MKConfigError(_("Cannot read configuration file %s: %s:") % (filename, e)) + raise MKConfigError(_("Cannot read configuration file %s: %s:") % (path, e)) # Load multisite.mk and all files in multisite.d/. This will happen @@ -184,7 +182,7 @@ def load_config(): sites = default_single_site_configuration() # First load main file - include("multisite.mk") + _load_config_file(cmk.utils.paths.default_config_dir + "/multisite.mk") # Load also recursively all files below multisite.d conf_dir = cmk.utils.paths.default_config_dir + "/multisite.d" @@ -197,7 +195,7 @@ def load_config(): filelist.sort() for p in filelist: - include(p) + _load_config_file(p) if sites: sites = migrate_old_site_config(sites) diff --git a/tests/unit/cmk/gui/conftest.py b/tests/unit/cmk/gui/conftest.py index 2fa1b29..6ec0d94 100644 --- a/tests/unit/cmk/gui/conftest.py +++ b/tests/unit/cmk/gui/conftest.py @@ -34,14 +34,8 @@ def register_builtin_html(): @pytest.fixture() def load_config(register_builtin_html): old_root_log_level = cmk.utils.log.logger.getEffectiveLevel() - - multisite_mk = Path(cmk.utils.paths.default_config_dir) / "multisite.mk" - multisite_mk.parent.mkdir(parents=True, exist_ok=True) # pylint: disable=no-member - multisite_mk.touch() # pylint: disable=no-member config.initialize() - yield - cmk.utils.log.logger.setLevel(old_root_log_level)

5 years, 1 month

Cleanup tests parametrization

by Lars Michelsen

Module: check_mk Branch: master Commit: 4863773d4263c182ddce1111e1f0ca5b710ba0b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4863773d4263c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat May 4 15:15:00 2019 +0200 Cleanup tests parametrization Change-Id: I0ef698513e8733394df3343ab1f127956946ba02 --- tests/unit/cmk_base/test_core_nagios.py | 137 +++++++++++++++----------------- 1 file changed, 64 insertions(+), 73 deletions(-) diff --git a/tests/unit/cmk_base/test_core_nagios.py b/tests/unit/cmk_base/test_core_nagios.py index 495add3..96249b6 100644 --- a/tests/unit/cmk_base/test_core_nagios.py +++ b/tests/unit/cmk_base/test_core_nagios.py @@ -29,9 +29,8 @@ def test_format_nagios_object(): """ % tuple(itertools.chain(*sorted(spec.items(), key=lambda x: x[0]))) -def ts_test_create_nagios_host_spec(): - ts1 = Scenario().add_host("localhost") - result1 = { +(a)pytest.mark.parametrize("hostname,result", [ + ("localhost", { '_ADDRESS_4': '127.0.0.1', '_ADDRESS_6': '', '_ADDRESS_FAMILY': '4', @@ -43,33 +42,22 @@ def ts_test_create_nagios_host_spec(): 'host_name': 'localhost', 'hostgroups': 'check_mk', 'use': 'check_mk_host', - } - - yield ts1, result1 - - ts2 = Scenario().add_host("localhost") - ts2.set_option("extra_host_conf", { - "alias": [(u'lOCALhost', ['localhost']),], - }) - result2 = { - '_ADDRESS_4': '127.0.0.1', + }), + ("host2", { + '_ADDRESS_4': '0.0.0.0', '_ADDRESS_6': '', '_ADDRESS_FAMILY': '4', '_FILENAME': '/', '_TAGS': '', - 'address': '127.0.0.1', + 'address': '0.0.0.0', 'alias': u'lOCALhost', 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', - 'host_name': 'localhost', + 'host_name': 'host2', 'hostgroups': 'check_mk', 'use': 'check_mk_host', - } - - yield ts2, result2 - - ts3 = Scenario().add_cluster("localhost") - result3 = { - '_ADDRESS_4': '127.0.0.1', + }), + ("cluster1", { + '_ADDRESS_4': '', '_ADDRESS_6': '', '_ADDRESS_FAMILY': '4', '_FILENAME': '/', @@ -78,31 +66,16 @@ def ts_test_create_nagios_host_spec(): '_NODEIPS_6': '', '_NODENAMES': '', '_TAGS': '', - 'address': '127.0.0.1', - 'alias': 'localhost', - 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', - 'host_name': 'localhost', + 'address': '0.0.0.0', + 'alias': 'cluster1', + 'check_command': 'check-mk-host-ping-cluster!-w 200.00,80.00% -c 500.00,100.00%', + 'host_name': 'cluster1', 'hostgroups': 'check_mk', 'parents': '', 'use': 'check_mk_cluster', - } - - yield ts3, result3 - - ts4 = Scenario().add_cluster("localhost", nodes=["node1", "node2"]) - ts4.add_host("node1") - ts4.add_host("node2") - ts4.add_host("switch") - ts4.set_option("ipaddresses", { - "node1": "127.0.0.1", - "node2": "127.0.0.2", - }) - ts4.set_option("extra_host_conf", { - "alias": [(u'lOCALhost', ['localhost']),], - "parents": [('switch', ['node1', 'node2']),], - }) - result4 = { - '_ADDRESS_4': '127.0.0.1', + }), + ("cluster2", { + '_ADDRESS_4': '', '_ADDRESS_6': '', '_ADDRESS_FAMILY': '4', '_FILENAME': '/', @@ -111,43 +84,61 @@ def ts_test_create_nagios_host_spec(): '_NODEIPS_6': '', '_NODENAMES': 'node1 node2', '_TAGS': '', - 'address': '127.0.0.1', - 'alias': u'lOCALhost', - 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', - 'host_name': 'localhost', + 'address': '0.0.0.0', + 'alias': u'CLUSTer', + 'check_command': 'check-mk-host-ping-cluster!-w 200.00,80.00% -c 500.00,100.00%', + 'host_name': 'cluster2', 'hostgroups': 'check_mk', 'parents': 'node1,node2', 'use': 'check_mk_cluster', - } + }), + ("node1", { + '_ADDRESS_4': '127.0.0.1', + '_ADDRESS_6': '', + '_ADDRESS_FAMILY': '4', + '_FILENAME': '/', + '_TAGS': '', + 'address': '127.0.0.1', + 'alias': 'node1', + 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', + 'host_name': 'node1', + 'hostgroups': 'check_mk', + 'parents': 'switch', + 'use': 'check_mk_host', + }), +]) +def test_create_nagios_host_spec(hostname, result, monkeypatch): + ts = Scenario().add_host("localhost") + ts.add_host("host2") + ts.add_cluster("cluster1") + + ts.add_cluster("cluster2", nodes=["node1", "node2"]) + ts.add_host("node1") + ts.add_host("node2") + ts.add_host("switch") + ts.set_option("ipaddresses", { + "node1": "127.0.0.1", + "node2": "127.0.0.2", + }) - yield ts4, result4 + ts.set_option("extra_host_conf", { + "alias": [(u'lOCALhost', ['localhost']),], + }) + ts.set_option( + "extra_host_conf", { + "alias": [ + (u'lOCALhost', ['host2']), + (u'CLUSTer', ['cluster2']), + ], + "parents": [('switch', ['node1', 'node2']),], + }) -(a)pytest.mark.parametrize("ts,result", ts_test_create_nagios_host_spec()) -def test_create_nagios_host_spec(ts, result, monkeypatch): outfile = StringIO() - cfg = core_nagios.NagiosConfig(outfile, ["localhost"]) + cfg = core_nagios.NagiosConfig(outfile, [hostname]) config_cache = ts.apply(monkeypatch) - host_attrs = core_config.get_host_attributes("localhost", config_cache) + host_attrs = core_config.get_host_attributes(hostname, config_cache) - host_spec = core_nagios._create_nagios_host_spec(cfg, config_cache, "localhost", host_attrs) + host_spec = core_nagios._create_nagios_host_spec(cfg, config_cache, hostname, host_attrs) assert host_spec == result - - if "node1" in config_cache.all_configured_hosts(): - host_attrs = core_config.get_host_attributes("node1", config_cache) - host_spec = core_nagios._create_nagios_host_spec(cfg, config_cache, "node1", host_attrs) - assert host_spec == { - '_ADDRESS_4': '127.0.0.1', - '_ADDRESS_6': '', - '_ADDRESS_FAMILY': '4', - '_FILENAME': '/', - '_TAGS': '', - 'address': '127.0.0.1', - 'alias': 'node1', - 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', - 'host_name': 'node1', - 'hostgroups': 'check_mk', - 'parents': 'switch', - 'use': 'check_mk_host', - }

5 years, 1 month

Nagios config: Cleanup check service interval handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 3624815028d953397d03dee5632f57e214b33fa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3624815028d953… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 14:36:16 2019 +0200 Nagios config: Cleanup check service interval handling CMK-2030 Change-Id: Ib3ae5aa367aa81c6939c13b91b004372722ca6bc --- cmk_base/core_nagios.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index b264f88..012d787 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -250,6 +250,8 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): host_config = config_cache.get_host_config(hostname) + check_mk_attrs = core_config.get_service_attributes(hostname, "Check_MK", config_cache) + # _____ # |___ / # |_ \ @@ -314,20 +316,14 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): "dependent_service_description": description, }).encode("utf-8")) + # TODO: Find a generic (CMC/Nagios) place for this logic # Add the check interval of either the Check_MK service or # (if configured) the snmp_check_interval for snmp based checks - check_interval = 1 # default hardcoded interval - # Customized interval of Check_MK service - values = config_cache.service_extra_conf( - hostname, "Check_MK", config.extra_service_conf.get('check_interval', [])) - if values: - try: - check_interval = int(values[0]) - except: - check_interval = float(values[0]) value = host_config.snmp_check_interval(cmk_base.check_utils.section_name_of(checkname)) if value is not None: check_interval = value + else: + check_interval = check_mk_attrs["check_interval"] service_spec = { "use": template, @@ -354,7 +350,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): "host_name": hostname, "service_description": "Check_MK", } - service_spec.update(core_config.get_service_attributes(hostname, "Check_MK", config_cache)) + service_spec.update(check_mk_attrs) service_spec.update(_extra_service_conf_of(cfg, config_cache, hostname, "Check_MK")) outfile.write(_format_nagios_object("service", service_spec).encode("utf-8"))

5 years, 1 month

Service attributes: Cleanup check interval handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c20f61b5940b151b919b30c841ddf7ae8a211ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c20f61b5940b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 14:23:38 2019 +0200 Service attributes: Cleanup check interval handling * Moved CMC specific things to generic service attribute calculation * The check_interval is now a mandatory attribute and casted to float in all cases. CMK-2030 Change-Id: I6bc03b9fc747afbe0ac49a8f24c81221148a6c61 --- cmk_base/config.py | 25 ++++++++++++++++++------- tests/unit/cmk_base/test_config.py | 8 ++++++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index aa10f6f..5f80543 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3034,16 +3034,27 @@ class ConfigCache(object): return labels def get_extra_attributes_of_service(self, hostname, description): - # type: (str, Text) -> Dict[str, str] - attrs = {} + # 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) - if values: - if key[0] == "_": - key = key.upper() + if not values: + continue + + value = values[0] + if value is None: + continue + + if key == "check_interval": + value = float(value) + + if key[0] == "_": + key = key.upper() + + attrs[key] = value - if values[0] is not None: - attrs[key] = values[0] return attrs def icons_and_actions_of_service(self, hostname, description, checkname, params): diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index d009cef..1ab27b0 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1020,16 +1020,20 @@ def test_labels_of_service(monkeypatch): @pytest.mark.parametrize("hostname,result", [ - ("testhost1", {}), + ("testhost1", { + "check_interval": 1.0 + }), ("testhost2", { '_CUSTOM': ['value1'], - 'dingdong': ['value1'] + 'dingdong': ['value1'], + 'check_interval': 10.0, }), ]) def test_config_cache_extra_attributes_of_service(monkeypatch, hostname, result): ts = Scenario().add_host(hostname) ts.set_option( "extra_service_conf", { + "check_interval": [("10", [], ["testhost2"], "CPU load$", {}),], "dingdong": [ ([ "value1",

5 years, 1 month

Nagios: Cleanup duplicate attribute conmputation'

by Lars Michelsen

Module: check_mk Branch: master Commit: 44932a2f918b071fbc6384a255dc9d76bfec21bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44932a2f918b07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 17:18:33 2019 +0200 Nagios: Cleanup duplicate attribute conmputation' The extra_service_conf rulesets are already computed and merged using the generic CMC/Nagios core_config.get_service_attributes() at all call sites. There is no need for the _extra_conf_of() function anymore. CMK-2030 Change-Id: I3084c1b8d218b0fa2c72f2844c2d2a5efab7c80a --- cmk_base/core_nagios.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 22783ab..3ebad36 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -824,22 +824,10 @@ def _extra_service_conf_of(cfg, config_cache, hostname, description): service_spec["service_groups"] = ",".join(sergr) if config.define_servicegroups: cfg.servicegroups_to_define.update(sergr) - service_spec.update( - _extra_conf_of(config_cache, config.extra_service_conf, hostname, description)) return service_spec -def _extra_conf_of(config_cache, confdict, hostname, service): - result = {} - for key, conflist in confdict.items(): - values = config_cache.service_extra_conf(hostname, service, conflist) - if values: - result[key] = values[0] - - return result - - #. # .--Precompile----------------------------------------------------------. # | ____ _ _ |

5 years, 1 month

Centralize computation of passive check interval computation

by Lars Michelsen

Module: check_mk Branch: master Commit: be3f94bbd803d6742e03638c27895674eb2b20e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be3f94bbd803d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 16:57:45 2019 +0200 Centralize computation of passive check interval computation The logic for computing the check interval of passive checks that base on the Check_MK service has been centralized. Added a test for the computation on the way. CMK-2030 Change-Id: I3727f4d25b48ff1cfd91af1cec29587193d693df --- cmk_base/core_config.py | 14 ++++++++++++++ cmk_base/core_nagios.py | 14 ++------------ tests/unit/cmk_base/test_core_config.py | 32 ++++++++++++++++++++++++++++++++ tests/unit/cmk_base/test_core_nagios.py | 4 ++-- 4 files changed, 50 insertions(+), 14 deletions(-) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 7ce2fda..ec5d159 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -310,6 +310,20 @@ def active_check_arguments(hostname, description, args): # '----------------------------------------------------------------------' +def get_cmk_passive_service_attributes(config_cache, host_config, description, checkname, params, + check_mk_attrs): + attrs = get_service_attributes(host_config.hostname, description, config_cache, checkname, + params) + + value = host_config.snmp_check_interval(config_cache.section_name_of(checkname)) + if value is not None: + attrs["check_interval"] = value + else: + attrs["check_interval"] = check_mk_attrs["check_interval"] + + return attrs + + def get_service_attributes(hostname, description, config_cache, checkname=None, params=None): attrs = _extra_service_attributes(hostname, description, config_cache, checkname, params) attrs.update(_get_tag_attributes(config_cache.tags_of_service(hostname, description), "TAG")) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 012d787..22783ab 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -316,26 +316,16 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): "dependent_service_description": description, }).encode("utf-8")) - # TODO: Find a generic (CMC/Nagios) place for this logic - # Add the check interval of either the Check_MK service or - # (if configured) the snmp_check_interval for snmp based checks - value = host_config.snmp_check_interval(cmk_base.check_utils.section_name_of(checkname)) - if value is not None: - check_interval = value - else: - check_interval = check_mk_attrs["check_interval"] - service_spec = { "use": template, "host_name": hostname, "service_description": description, - "check_interval": check_interval, "check_command": "check_mk-%s" % checkname, } service_spec.update( - core_config.get_service_attributes( - hostname, description, config_cache, checkname=checkname, params=params)) + core_config.get_cmk_passive_service_attributes(config_cache, host_config, description, + checkname, params, check_mk_attrs)) service_spec.update(_extra_service_conf_of(cfg, config_cache, hostname, description)) outfile.write(_format_nagios_object("service", service_spec).encode("utf-8")) diff --git a/tests/unit/cmk_base/test_core_config.py b/tests/unit/cmk_base/test_core_config.py index 1031ef4..ff5c1f6 100644 --- a/tests/unit/cmk_base/test_core_config.py +++ b/tests/unit/cmk_base/test_core_config.py @@ -6,6 +6,7 @@ from testlib.base import Scenario from cmk.utils.exceptions import MKGeneralException import cmk_base.config as config import cmk_base.core_config as core_config +import cmk_base.check_api as check_api def test_active_check_arguments(mocker): @@ -49,6 +50,37 @@ def test_get_host_attributes(fixup_ip_lookup, monkeypatch): } +(a)pytest.mark.parametrize("hostname,result", [ + ("localhost", { + 'check_interval': 1.0, + 'contact_groups': u'ding', + }), + ("blub", { + 'check_interval': 40.0 + }), +]) +def test_get_cmk_passive_service_attributes(monkeypatch, hostname, result): + config.load_checks(check_api.get_check_api_context, ["checks/cpu"]) + + ts = Scenario().add_host("localhost") + ts.add_host("blub") + ts.set_option( + "extra_service_conf", { + "contact_groups": [(u'ding', ['localhost'], ["CPU load$"]),], + "check_interval": [ + (40.0, ['blub'], ["Check_MK$"]), + (33.0, ['localhost'], ["CPU load$"]), + ], + }) + config_cache = ts.apply(monkeypatch) + host_config = config_cache.get_host_config(hostname) + check_mk_attrs = core_config.get_service_attributes(hostname, "Check_MK", config_cache) + + service_spec = core_config.get_cmk_passive_service_attributes( + config_cache, host_config, "CPU load", "cpu.loads", {}, check_mk_attrs) + assert service_spec == result + + @pytest.mark.parametrize("tag_groups,result", [({ "tg1": "val1", "tg2": "val1", diff --git a/tests/unit/cmk_base/test_core_nagios.py b/tests/unit/cmk_base/test_core_nagios.py index d60cb9b..495add3 100644 --- a/tests/unit/cmk_base/test_core_nagios.py +++ b/tests/unit/cmk_base/test_core_nagios.py @@ -29,7 +29,7 @@ def test_format_nagios_object(): """ % tuple(itertools.chain(*sorted(spec.items(), key=lambda x: x[0]))) -def ts(): +def ts_test_create_nagios_host_spec(): ts1 = Scenario().add_host("localhost") result1 = { '_ADDRESS_4': '127.0.0.1', @@ -123,7 +123,7 @@ def ts(): yield ts4, result4 -(a)pytest.mark.parametrize("ts,result", ts()) +(a)pytest.mark.parametrize("ts,result", ts_test_create_nagios_host_spec()) def test_create_nagios_host_spec(ts, result, monkeypatch): outfile = StringIO() cfg = core_nagios.NagiosConfig(outfile, ["localhost"])

5 years, 1 month

Moved service check_periods processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: deb1f70aa538259641b0becf298e5351ed6b657a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deb1f70aa53825… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 19:57:55 2019 +0200 Moved service check_periods processing to ConfigCache CMK-2030 Change-Id: Ieb901607987c09030470d64470ed8cc71562bbbf --- cmk_base/checking.py | 21 ++++++++++----------- cmk_base/config.py | 29 ++++++++++++----------------- tests/unit/cmk_base/test_config.py | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 3956293..7becbb1 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -240,8 +240,8 @@ def _do_all_checks_on_host(sources, host_config, ipaddress, only_check_plugin_na hostname, description): continue - success = execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, item, - params, description) + success = execute_check(config_cache, multi_host_sections, hostname, ipaddress, + check_plugin_name, item, params, description) if success: num_success += 1 elif success is None: @@ -260,21 +260,20 @@ def _do_all_checks_on_host(sources, host_config, ipaddress, only_check_plugin_na return num_success, missing_section_list -def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, item, params, - description): +def execute_check(config_cache, multi_host_sections, hostname, ipaddress, check_plugin_name, item, + params, description): # Make a bit of context information globally available, so that functions # called by checks now this context check_api_utils.set_service(check_plugin_name, description) item_state.set_item_state_prefix(check_plugin_name, item) # Skip checks that are not in their check period - period = config.check_period_of(hostname, description) - if period and not cmk_base.core.check_timeperiod(period): - console.verbose( - "Skipping service %s: currently not in timeperiod %s.\n" % (description, period)) - return None - - elif period: + period = config_cache.check_period_of_service(hostname, description) + if period is not None: + if not cmk_base.core.check_timeperiod(period): + console.verbose( + "Skipping service %s: currently not in timeperiod %s.\n" % (description, period)) + return None console.vverbose("Service %s: timeperiod %s is currently active.\n" % (description, period)) section_name = cmk_base.check_utils.section_name_of(check_plugin_name) diff --git a/cmk_base/config.py b/cmk_base/config.py index ecf56fe..0fa8ef9 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -735,23 +735,6 @@ def _host_is_member_of_site(config_cache, hostname, site): return True -# -# Misc -# - - -def check_period_of(hostname, service): - periods = get_config_cache().service_extra_conf(hostname, service, check_periods) - if periods: - period = periods[0] - if period == "24X7": - return None - - return period - - return None - - #. # .--Services------------------------------------------------------------. # | ____ _ | @@ -3115,6 +3098,18 @@ class ConfigCache(object): return None return entries[0] + def check_period_of_service(self, hostname, description): + # type: (str, Text) -> Optional[str] + entries = self.service_extra_conf(hostname, description, check_periods) + if not entries: + return None + + entry = entries[0] + if entry == "24X7": + return None + + return entry + 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 8c0777e..783fcc1 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1153,6 +1153,25 @@ def test_config_cache_service_level_of_service(monkeypatch, hostname, result): assert config_cache.service_level_of_service(hostname, "CPU load") == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", None), + ("testhost3", "xyz"), +]) +def test_config_cache_check_period_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset( + "check_periods", + [ + ("24X7", [], ["testhost2"], ["CPU load$"], {}), + ("xyz", [], ["testhost3"], ["CPU load$"], {}), + ("zzz", [], ["testhost3"], ["CPU load$"], {}), + ], + ) + config_cache = ts.apply(monkeypatch) + assert config_cache.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

7345 FIX Drop ancient scanparent_hosts configuration variable

by Lars Michelsen

Module: check_mk Branch: master Commit: d5d5715d0a0d1fd2ac53fb8b5dc6e02fd930f76e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5d5715d0a0d1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 3 12:07:21 2019 +0200 7345 FIX Drop ancient scanparent_hosts configuration variable The undocumented configuration variable <tt>scanparent_hosts</tt> was removed from Check_MK base. In the unlikely case you have configured this variable for some reason, you will have to remove it from your configuration. Change-Id: Ice7c9c6d9869f6c4d221963a59ad0aa5292f363e --- .werks/7345 | 12 ++++++++++++ cmk_base/default_config/base.py | 1 - cmk_base/parent_scan.py | 5 +---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.werks/7345 b/.werks/7345 new file mode 100644 index 0000000..989f851 --- /dev/null +++ b/.werks/7345 @@ -0,0 +1,12 @@ +Title: Drop ancient scanparent_hosts configuration variable +Level: 1 +Component: core +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1556877957 +Class: fix + +The undocumented configuration variable <tt>scanparent_hosts</tt> was removed +from Check_MK base. In the unlikely case you have configured this variable for +some reason, you will have to remove it from your configuration. diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index 0124af4..b324505 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -194,7 +194,6 @@ extra_host_conf = {} extra_service_conf = {} extra_nagios_conf = "" service_descriptions = {} -scanparent_hosts = [(_ALL_HOSTS)] host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command host_check_commands = [] # alternative host check instead of check_icmp diff --git a/cmk_base/parent_scan.py b/cmk_base/parent_scan.py index 3f888b1..724f644 100644 --- a/cmk_base/parent_scan.py +++ b/cmk_base/parent_scan.py @@ -48,10 +48,7 @@ def do_scan_parents(hosts): config_cache = config.get_config_cache() if not hosts: - hosts = [ - h for h in config_cache.all_active_realhosts() - if config_cache.in_binary_hostlist(h, config.scanparent_hosts) - ] + hosts = config_cache.all_active_realhosts() parent_hosts = [] parent_ips = {}

5 years, 1 month

Nagios: Fix Discovery service intervals

by Lars Michelsen

Module: check_mk Branch: master Commit: 98693b5f6f434e3779bc728d2889ffe91509b97b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98693b5f6f434e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 17:29:04 2019 +0200 Nagios: Fix Discovery service intervals Change-Id: I0497dae372fd8ef99fbcab1b0a43b48fa7879fab --- cmk_base/core_nagios.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 3ebad36..bec4bab 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -497,14 +497,19 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): service_spec = { "use": config.inventory_check_template, "host_name": hostname, - "normal_check_interval": params["check_interval"], - "retry_check_interval": params["check_interval"], "service_description": service_discovery_name, } service_spec.update( core_config.get_service_attributes(hostname, service_discovery_name, config_cache)) + service_spec.update( _extra_service_conf_of(cfg, config_cache, hostname, service_discovery_name)) + + service_spec.update({ + "check_interval": params["check_interval"], + "retry_interval": params["check_interval"], + }) + outfile.write(_format_nagios_object("service", service_spec).encode("utf-8")) if have_at_least_one_service:

5 years, 1 month

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