Revert "OTel: resolve the custom service ruleset per host"

Revert submission 149558

Reason for revert: https://tribe29.slack.com/archives/C085MHGLPJ6/p1786458273376609

Reverted changes: /q/submissionid:149558

Change-Id: I5c34577059a7752dd135e36bfd067bbd885189fd

Author: TimotheusBachinger

cmk/base/config/_impl.py

@@ -38,10 +38,7 @@
 from cmk.base.configlib.agent import make_only_from_config
 from cmk.base.configlib.checkengine import CheckingConfig
 from cmk.base.configlib.exit_code import make_exit_code_spec
-from cmk.base.configlib.fetchers import (
-    make_tcp_fetcher_config,
-    make_telemetry_custom_service_config,
-)
+from cmk.base.configlib.fetchers import make_tcp_fetcher_config
 from cmk.base.configlib.inventory import make_inventory_config
 from cmk.base.configlib.labels import LabelConfig
 from cmk.base.configlib.loaded_config import BaseConfig, CustomCheck
@@ -1452,9 +1449,6 @@ def make_source_config(
             tcp_fetcher_config=make_tcp_fetcher_config(
                 self._loaded_config, self.ruleset_matcher, self.label_manager.labels_of_host
             ),
-            telemetry_custom_service=make_telemetry_custom_service_config(
-                self._loaded_config, self.ruleset_matcher, self.label_manager.labels_of_host
-            ),
             is_cmc=self._loaded_config.monitoring_core == "cmc",
             uuid_lookup_dir=cmk.utils.paths.uuid_lookup_dir,
         )

cmk/base/configlib/fetchers.py

@@ -4,7 +4,7 @@
 # conditions defined in the file COPYING, which is part of this source code package.
 
 
-from collections.abc import Callable, Mapping, Sequence
+from collections.abc import Callable, Mapping
 
 from cmk.base.configlib.loaded_config import BaseConfig
 from cmk.ccc.hostaddress import HostName
@@ -51,23 +51,6 @@ def make_tcp_fetcher_config(
     )
 
 
-def make_telemetry_custom_service_config(
-    loaded_config: BaseConfig,
-    ruleset_matcher: RulesetMatcher,
-    labels_of_host: Callable[[HostName], Labels],
-) -> Callable[[HostName], Sequence[Mapping[str, object]]]:
-    """Resolve the custom telemetry service ruleset for a single host.
-
-    The ruleset's eval type is ALL, so every matching rule contributes; the caller
-    gets them in rule order.
-    """
-    return SingleHostRulesetMatcher(
-        host_ruleset=loaded_config.telemetry_custom_service,
-        matcher=ruleset_matcher,
-        labels_of_host=labels_of_host,
-    )
-
-
 def make_parsed_snmp_fetch_intervals_config(
     loaded_config: BaseConfig,
     ruleset_matcher: RulesetMatcher,

cmk/base/configlib/loaded_config.py

@@ -107,7 +107,6 @@ class BaseConfig:  # type: ignore[explicit-any]
     piggyback_max_cachefile_age: int
     agent_encryption: Sequence[RuleSpec[str | None]]
     agent_exclude_sections: Sequence[RuleSpec[dict[str, str]]]
-    telemetry_custom_service: Sequence[RuleSpec[Mapping[str, object]]]
     cmc_real_time_checks: RealTimeChecks | None
     snmp_check_interval: list[
         RuleSpec[

cmk/base/default_config/base.py

@@ -46,7 +46,6 @@
 agent_encryption: list[RuleSpec[str | None]] = []
 encryption_handling: list[RuleSpec[Mapping[str, str]]] = []
 agent_exclude_sections: list[RuleSpec[dict[str, str]]] = []
-telemetry_custom_service: list[RuleSpec[Mapping[str, object]]] = []
 # UDP ports used for SNMP
 snmp_ports: list[RuleSpec[int]] = []
 tcp_connect_timeout = 5.0

packages/cmk-check-engine/cmk/checkengine/source_abc/_config.py

@@ -44,7 +44,6 @@ def __init__(
         program_commandline: Callable[[HostName, _AddressFamily, HostAddress | None, str], str],
         snmp_fetcher_config: SNMPFetcherConfig,
         tcp_fetcher_config: TCPFetcherConfig,
-        telemetry_custom_service: Callable[[HostName], Sequence[Mapping[str, object]]],
         is_cmc: bool,
         uuid_lookup_dir: Path,
     ) -> None:
@@ -57,7 +56,6 @@ def __init__(
         self._management_credentials: Final = management_credentials
         self.snmp_fetcher_config: Final = snmp_fetcher_config
         self.tcp_fetcher_config: Final = tcp_fetcher_config
-        self.telemetry_custom_service: Final = telemetry_custom_service
         self.is_cmc: Final = is_cmc
         self.uuid_lookup_dir: Final = uuid_lookup_dir
 

packages/cmk-check-engine/cmk/checkengine/source_abc/_optional.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 import abc
-from collections.abc import Callable, Mapping, Sequence, Sized
+from collections.abc import Sized
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Self
@@ -36,7 +36,6 @@ class SourceContext:
     omd_root: Path
     metrics_association: str | None
     check_mk_check_interval: float
-    telemetry_custom_service: Callable[[HostName], Sequence[Mapping[str, object]]]
 
 
 class OptionalSource[TRawData: Sized](Source[TRawData], abc.ABC):

packages/cmk-check-engine/cmk/checkengine/source_builder.py

@@ -120,7 +120,6 @@ def __init__(
                 omd_root=self.omd_root,
                 metrics_association=self._metrics_association,
                 check_mk_check_interval=self.check_mk_check_interval,
-                telemetry_custom_service=source_config.telemetry_custom_service,
             )
         )
 

tests/testlib/common/empty_config.py

@@ -39,7 +39,6 @@
     piggyback_max_cachefile_age=3600,
     agent_encryption=(),
     agent_exclude_sections=(),
-    telemetry_custom_service=(),
     cmc_real_time_checks=None,
     snmp_check_interval=[],
     agent_bakery_logging=None,