fix up dependency direction

Change-Id: Id6fe9b618329480849e3f3225c8703d210cc1899

Author: mo-ki

cmk/base/automations/check_mk.py

@@ -104,10 +104,10 @@
     ConfigCache,
     EnforcedServicesTable,
     handle_ip_lookup_failure,
-    LoadedConfigFragment,
     snmp_default_community,
 )
 from cmk.base.configlib.checkengine import CheckingConfig, DiscoveryConfig
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.base.configlib.servicename import (
     FinalServiceNameConfig,
     PassiveServiceNameConfig,
@@ -648,7 +648,7 @@ def _get_discovery_preview(
     on_error: OnError,
     fetcher: FetcherFunction,
     file_cache_options: FileCacheOptions,
-    loaded_config: config.LoadedConfigFragment,
+    loaded_config: LoadedConfigFragment,
     service_name_config: PassiveServiceNameConfig,
     config_cache: config.ConfigCache,
     plugins: AgentBasedPlugins,
@@ -794,7 +794,7 @@ def compute_check_parameters_of_autocheck(
 
 
 def _execute_discovery(
-    loaded_config: config.LoadedConfigFragment,
+    loaded_config: LoadedConfigFragment,
     ruleset_matcher: RulesetMatcher,
     label_manager: LabelManager,
     host_name: HostName,
@@ -2588,7 +2588,7 @@ def _execute_silently(
     ip_address_of: ip_lookup.ConfiguredIPLookup[ip_lookup.CollectFailedHosts],
     ip_address_of_mgmt: ip_lookup.IPLookupOptional,
     hosts_config: Hosts,
-    loaded_config: config.LoadedConfigFragment,
+    loaded_config: LoadedConfigFragment,
     plugins: AgentBasedPlugins,
     hosts_to_update: set[HostName] | None,
     service_depends_on: Callable[[HostName, ServiceName], Sequence[ServiceName]],

cmk/base/config.py

@@ -45,6 +45,7 @@
 from cmk.base import default_config
 from cmk.base.configlib.checkengine import CheckingConfig
 from cmk.base.configlib.labels import LabelConfig
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.base.configlib.servicename import FinalServiceNameConfig, PassiveServiceNameConfig
 from cmk.base.default_config import *  # noqa: F403
 from cmk.base.parent_scan import ScanConfig as ParentScanConfig
@@ -104,7 +105,6 @@
 from cmk.fetchers.config import make_persisted_section_dir
 from cmk.fetchers.filecache import MaxAge
 from cmk.piggyback import backend as piggyback_backend
-from cmk.rrd.config import RRDObjectConfig  # pylint: disable=cmk-module-layer-violation
 from cmk.server_side_calls import v1 as server_side_calls_api
 from cmk.server_side_calls_backend import (
     ActiveCheck,
@@ -133,7 +133,6 @@
 from cmk.utils.experimental_config import load_experimental_config
 from cmk.utils.host_storage import (
     apply_hosts_file_to_object,
-    FolderAttributesForBase,
     get_host_storage_loaders,
 )
 from cmk.utils.http_proxy_config import http_proxy_config_from_user_setting, HTTPProxyConfig
@@ -186,9 +185,6 @@
 service_service_levels: list[RuleSpec[int]] = []
 host_service_levels: list[RuleSpec[int]] = []
 
-_AgentTargetVersion = None | str | tuple[str, str] | tuple[str, dict[str, str]]
-
-ShadowHosts = dict[HostName, dict[str, Any]]
 
 ObjectMacros = dict[str, AnyStr]
 
@@ -501,7 +497,6 @@ class CheckmkCheckParameters(NamedTuple):
 ObjectAttributes = dict[str, Any]
 
 GroupDefinitions = dict[str, str]
-RecurringDowntime = Mapping[str, int | str]  # TODO(sk): TypedDict here
 
 
 class _NestedExitSpec(ExitSpec, total=False):
@@ -550,86 +545,6 @@ def register(name: str, default_value: Any) -> None:
 #   '----------------------------------------------------------------------'
 
 
-@dataclasses.dataclass(frozen=True, kw_only=True)
-class LoadedConfigFragment:
-    """Return *some of* the values that have been loaded as part of the config loading process.
-
-    The config loading currently mostly manipulates a global state.
-    Return an instance of this class, to indicate that the config has been loaded.
-
-    Someday (TM): return the actual loaded config, at which point this class will be quite big
-    (compare cmk/base/default_config/base ...)
-    """
-
-    # TODO: get `HostAddress` VS. `str` right! Which is it at what point?!
-    # NOTE: all of the below is wishful typing, no parsing is done yet.
-    # for now we just copy what we find in default_config
-    folder_attributes: Mapping[str, FolderAttributesForBase]
-    discovery_rules: Mapping[RuleSetName, Sequence[RuleSpec]]
-    checkgroup_parameters: Mapping[str, Sequence[RuleSpec[Mapping[str, object]]]]
-    static_checks: Mapping[
-        str, list[RuleSpec[list[object]]]
-    ]  # a.k.a. "enforced_services". Keep the name for consistency
-    service_rule_groups: set[str]
-    service_descriptions: Mapping[str, str]
-    service_description_translation: Sequence[RuleSpec[Mapping[str, object]]]
-    use_new_descriptions_for: Container[str]
-    monitoring_core: Literal["nagios", "cmc"]
-    nagios_illegal_chars: str
-    cmc_illegal_chars: str
-    all_hosts: Sequence[str]
-    clusters: Mapping[HostAddress, Sequence[HostAddress]]
-    shadow_hosts: ShadowHosts
-    service_dependencies: Sequence[tuple]
-    fallback_agent_output_encoding: str
-    agent_config: Mapping[str, Sequence[RuleSpec]]
-    agent_port: int
-    agent_ports: Sequence[RuleSpec[int]]
-    tcp_connect_timeout: float
-    tcp_connect_timeouts: Sequence[RuleSpec[float]]
-    encryption_handling: Sequence[RuleSpec[Mapping[str, str]]]
-    piggyback_translation: Sequence[RuleSpec[Mapping[str, object]]]
-    agent_encryption: Sequence[RuleSpec[str | None]]
-    agent_exclude_sections: Sequence[RuleSpec[dict[str, str]]]
-    cmc_real_time_checks: RealTimeChecks | None
-    snmp_check_interval: list[
-        RuleSpec[
-            tuple[list[str], tuple[Literal["cached"], float] | tuple[Literal["uncached"], None]]
-        ]
-    ]
-    apply_bake_revision: bool
-    bake_agents_on_restart: bool
-    agent_bakery_logging: int | None
-    is_wato_slave_site: bool
-    simulation_mode: bool
-    use_dns_cache: bool
-    ipaddresses: Mapping[HostName, HostAddress]
-    ipv6addresses: Mapping[HostName, HostAddress]
-    fake_dns: str | None
-    tag_config: cmk.utils.tags.TagConfigSpec
-    host_tags: ruleset_matcher.TagsOfHosts
-    cmc_log_rrdcreation: Literal["terse", "full"] | None
-    cmc_host_rrd_config: Sequence[RuleSpec[Any]]
-    host_recurring_downtimes: Sequence[RuleSpec[RecurringDowntime]]
-    cmc_flap_settings: tuple[float, float, float]
-    cmc_host_flap_settings: Sequence[RuleSpec[tuple[float, float, float]]]
-    cmc_host_long_output_in_monitoring_history: Sequence[RuleSpec[bool]]
-    host_state_translation: Sequence[RuleSpec[Mapping[str, object]]]
-    cmc_smartping_settings: Sequence[RuleSpec[Mapping[str, float]]]
-    cmc_service_rrd_config: Sequence[RuleSpec[RRDObjectConfig]]
-    service_recurring_downtimes: Sequence[RuleSpec[Mapping[str, int | str]]]
-    cmc_service_flap_settings: Sequence[RuleSpec[tuple[float, float, float]]]
-    cmc_service_long_output_in_monitoring_history: Sequence[RuleSpec[bool]]
-    service_state_translation: Sequence[RuleSpec[Mapping[str, object]]]
-    cmc_check_timeout: int
-    cmc_service_check_timeout: Sequence[RuleSpec[int]]
-    cmc_graphite_host_metrics: Sequence[RuleSpec[Sequence[str]]]
-    cmc_graphite_service_metrics: Sequence[RuleSpec[Sequence[str]]]
-    cmc_influxdb_service_metrics: Sequence[RuleSpec[Mapping[str, object]]]
-    cmc_log_levels: Mapping[str, int]
-    cluster_max_cachefile_age: int
-
-
 @dataclasses.dataclass(frozen=True, kw_only=True)
 class LoadingResult:
     """Return the result of the config loading process.

cmk/base/configlib/loaded_config.py

@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+# Copyright (C) 2025 Checkmk GmbH - License: GNU General Public License v2
+# This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
+# conditions defined in the file COPYING, which is part of this source code package.
+
+
+import dataclasses
+from collections.abc import Container, Mapping, Sequence
+from typing import (
+    Any,
+    Literal,
+)
+
+import cmk.utils
+import cmk.utils.tags
+from cmk.base.default_config.cmc import RealTimeChecks
+from cmk.ccc.hostaddress import HostAddress, HostName
+from cmk.rrd.config import RRDObjectConfig  # pylint: disable=cmk-module-layer-violation
+from cmk.utils.host_storage import FolderAttributesForBase
+from cmk.utils.rulesets import ruleset_matcher, RuleSetName
+from cmk.utils.rulesets.ruleset_matcher import RuleSpec
+
+
+@dataclasses.dataclass(frozen=True, kw_only=True)
+class LoadedConfigFragment:
+    """Return *some of* the values that have been loaded as part of the config loading process.
+
+    The config loading currently mostly manipulates a global state.
+    Return an instance of this class, to indicate that the config has been loaded.
+
+    Someday (TM): return the actual loaded config, at which point this class will be quite big
+    (compare cmk/base/default_config/base ...)
+    """
+
+    # TODO: get `HostAddress` VS. `str` right! Which is it at what point?!
+    # NOTE: all of the below is wishful typing, no parsing is done yet.
+    # for now we just copy what we find in default_config
+    folder_attributes: Mapping[str, FolderAttributesForBase]
+    discovery_rules: Mapping[RuleSetName, Sequence[RuleSpec]]
+    checkgroup_parameters: Mapping[str, Sequence[RuleSpec[Mapping[str, object]]]]
+    static_checks: Mapping[
+        str, list[RuleSpec[list[object]]]
+    ]  # a.k.a. "enforced_services". Keep the name for consistency
+    service_rule_groups: set[str]
+    service_descriptions: Mapping[str, str]
+    service_description_translation: Sequence[RuleSpec[Mapping[str, object]]]
+    use_new_descriptions_for: Container[str]
+    monitoring_core: Literal["nagios", "cmc"]
+    nagios_illegal_chars: str
+    cmc_illegal_chars: str
+    all_hosts: Sequence[str]
+    clusters: Mapping[HostAddress, Sequence[HostAddress]]
+    shadow_hosts: dict[HostName, dict[str, Any]]
+    service_dependencies: Sequence[tuple]
+    fallback_agent_output_encoding: str
+    agent_config: Mapping[str, Sequence[RuleSpec]]
+    agent_port: int
+    agent_ports: Sequence[RuleSpec[int]]
+    tcp_connect_timeout: float
+    tcp_connect_timeouts: Sequence[RuleSpec[float]]
+    encryption_handling: Sequence[RuleSpec[Mapping[str, str]]]
+    piggyback_translation: Sequence[RuleSpec[Mapping[str, object]]]
+    agent_encryption: Sequence[RuleSpec[str | None]]
+    agent_exclude_sections: Sequence[RuleSpec[dict[str, str]]]
+    cmc_real_time_checks: RealTimeChecks | None
+    snmp_check_interval: list[
+        RuleSpec[
+            tuple[list[str], tuple[Literal["cached"], float] | tuple[Literal["uncached"], None]]
+        ]
+    ]
+    apply_bake_revision: bool
+    bake_agents_on_restart: bool
+    agent_bakery_logging: int | None
+    is_wato_slave_site: bool
+    simulation_mode: bool
+    use_dns_cache: bool
+    ipaddresses: Mapping[HostName, HostAddress]
+    ipv6addresses: Mapping[HostName, HostAddress]
+    fake_dns: str | None
+    tag_config: cmk.utils.tags.TagConfigSpec
+    host_tags: ruleset_matcher.TagsOfHosts
+    cmc_log_rrdcreation: Literal["terse", "full"] | None
+    cmc_host_rrd_config: Sequence[RuleSpec[Any]]
+    host_recurring_downtimes: Sequence[RuleSpec[Mapping[str, int | str]]]
+
+    cmc_flap_settings: tuple[float, float, float]
+    cmc_host_flap_settings: Sequence[RuleSpec[tuple[float, float, float]]]
+    cmc_host_long_output_in_monitoring_history: Sequence[RuleSpec[bool]]
+    host_state_translation: Sequence[RuleSpec[Mapping[str, object]]]
+    cmc_smartping_settings: Sequence[RuleSpec[Mapping[str, float]]]
+    cmc_service_rrd_config: Sequence[RuleSpec[RRDObjectConfig]]
+    service_recurring_downtimes: Sequence[RuleSpec[Mapping[str, int | str]]]
+    cmc_service_flap_settings: Sequence[RuleSpec[tuple[float, float, float]]]
+    cmc_service_long_output_in_monitoring_history: Sequence[RuleSpec[bool]]
+    service_state_translation: Sequence[RuleSpec[Mapping[str, object]]]
+    cmc_check_timeout: int
+    cmc_service_check_timeout: Sequence[RuleSpec[int]]
+    cmc_graphite_host_metrics: Sequence[RuleSpec[Sequence[str]]]
+    cmc_graphite_service_metrics: Sequence[RuleSpec[Sequence[str]]]
+    cmc_influxdb_service_metrics: Sequence[RuleSpec[Mapping[str, object]]]
+    cmc_log_levels: Mapping[str, int]
+    cluster_max_cachefile_age: int

cmk/base/core_factory.py

@@ -6,7 +6,7 @@
 from collections.abc import Callable, Mapping
 from typing import assert_never
 
-from cmk.base.config import LoadedConfigFragment
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.base.core_config import MonitoringCore
 from cmk.ccc.hostaddress import HostName
 from cmk.ccc.version import Edition, edition

cmk/base/diagnostics.py

@@ -30,7 +30,7 @@
 
 import cmk.ccc.version as cmk_version
 import cmk.utils.paths
-from cmk.base.config import LoadedConfigFragment
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.ccc import site, store, tty
 from cmk.ccc.hostaddress import HostName
 from cmk.ccc.i18n import _

cmk/base/modes/check_mk.py

@@ -46,6 +46,7 @@
     handle_ip_lookup_failure,
 )
 from cmk.base.configlib.checkengine import DiscoveryConfig
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.base.core_factory import create_core, get_licensing_handler_type
 from cmk.base.errorhandling import CheckResultErrorHandler, create_section_crash_dump
 from cmk.base.modes import Mode, modes, Option
@@ -2612,7 +2613,7 @@ def mode_check(options: _CheckingOptions, args: list[str]) -> ServiceState:
 
 # also used in precompiled host checks!
 def run_checking(
-    loaded_config: config.LoadedConfigFragment,
+    loaded_config: LoadedConfigFragment,
     plugins: AgentBasedPlugins,
     config_cache: ConfigCache,
     hosts_config: Hosts,

tests/unit/cmk/base/empty_config.py

@@ -3,7 +3,7 @@
 # This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
 # conditions defined in the file COPYING, which is part of this source code package.
 
-from cmk.base.config import LoadedConfigFragment
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.utils.labels import ABCLabelConfig, LabelManager, Labels
 from cmk.utils.rulesets.ruleset_matcher import RulesetMatcher
 

tests/unit/cmk/base/test_config.py

@@ -32,6 +32,7 @@
 from cmk.base.config import ConfigCache, EnforcedServicesTable
 from cmk.base.configlib.checkengine import CheckingConfig
 from cmk.base.configlib.labels import LabelConfig
+from cmk.base.configlib.loaded_config import LoadedConfigFragment
 from cmk.base.configlib.servicename import FinalServiceNameConfig, PassiveServiceNameConfig
 from cmk.base.default_config.base import _PeriodicDiscovery
 from cmk.ccc.exceptions import MKGeneralException
@@ -2564,7 +2565,7 @@ def test_host_config_add_discovery_check(
 
 
 def test_get_config_file_paths_with_confd(
-    folder_path_test_config: config.LoadedConfigFragment,
+    folder_path_test_config: LoadedConfigFragment,
 ) -> None:
     # NOTE: there are still some globals at play here, otherwise we would have to use
     # the folder_path_test_config somewhere.
@@ -2585,7 +2586,7 @@ def test_get_config_file_paths_with_confd(
     ]
 
 
-def test_load_config_folder_paths(folder_path_test_config: config.LoadedConfigFragment) -> None:
+def test_load_config_folder_paths(folder_path_test_config: LoadedConfigFragment) -> None:
     config_cache = config.ConfigCache(folder_path_test_config)
 
     assert config_cache.host_path(HostName("main-host")) == "/"
@@ -2640,7 +2641,7 @@ def test_load_config_folder_paths(folder_path_test_config: config.LoadedConfigFr
 @pytest.fixture(name="folder_path_test_config")
 def folder_path_test_config_fixture(
     monkeypatch: MonkeyPatch,
-) -> Iterator[config.LoadedConfigFragment]:
+) -> Iterator[LoadedConfigFragment]:
     config_dir = cmk.utils.paths.check_mk_config_dir
     config_dir.mkdir(parents=True, exist_ok=True)