diff --git a/cmk/base/config.py b/cmk/base/config.py index afb4e71548d..ed61ff3f9ae 100644 --- a/cmk/base/config.py +++ b/cmk/base/config.py @@ -1885,7 +1885,10 @@ def initialize(self) -> ConfigCache: self._nodes_cache, ) = _make_clusters_nodes_maps() - self._autochecks_manager = AutochecksManager() + # TODO: remove this from the config cache. It is a completely + # self-contained object that should be passed around (if it really + # has to exist at all). + self.autochecks_manager = AutochecksManager() self._effective_host_cache: dict[ tuple[HostName, ServiceName, tuple[tuple[str, str], ...], tuple[HostName, ...]], HostName, @@ -2149,7 +2152,7 @@ def check_table( config_cache=self, skip_ignored=skip_ignored, filter_mode=filter_mode, - get_autochecks=self._autochecks_manager.get_autochecks, + get_autochecks=self.autochecks_manager.get_autochecks, configure_autochecks=self._service_configurer.configure_autochecks, plugins=plugins, ) @@ -3537,7 +3540,7 @@ def get_explicit_service_custom_variables( def get_discovered_services(self, hostname: HostName) -> Sequence[ConfiguredService]: return self._service_configurer.configure_autochecks( - hostname, self._autochecks_manager.get_autochecks(hostname) + hostname, self.autochecks_manager.get_autochecks(hostname) ) def section_name_of(self, section: str) -> str: diff --git a/tests/testlib/unit/base_configuration_scenario.py b/tests/testlib/unit/base_configuration_scenario.py index da708565318..ab7d692d6a7 100644 --- a/tests/testlib/unit/base_configuration_scenario.py +++ b/tests/testlib/unit/base_configuration_scenario.py @@ -194,7 +194,7 @@ def apply(self, monkeypatch: MonkeyPatch) -> ConfigCache: if self._autochecks_mocker.raw_autochecks: monkeypatch.setattr( self.config_cache, - "_autochecks_manager", + "autochecks_manager", self._autochecks_mocker, raising=False, ) diff --git a/tests/unit/cmk/checkengine/test_autochecks.py b/tests/unit/cmk/checkengine/test_autochecks.py index 3d539eb80fd..99d1e166c97 100644 --- a/tests/unit/cmk/checkengine/test_autochecks.py +++ b/tests/unit/cmk/checkengine/test_autochecks.py @@ -103,7 +103,7 @@ def test_manager_get_autochecks_of( ts.add_host(HostName("host")) config_cache = ts.apply(monkeypatch) - manager = config_cache._autochecks_manager + manager = config_cache.autochecks_manager result = manager.get_autochecks(HostName("host")) assert result == expected_result