make_sources: simplify signature

Let's just not call the function on clusters.

Change-Id: I9b685de2641469df7826828387e3c6cfa20a32f2

Author: mo-ki

cmk/base/automations/check_mk.py

@@ -3230,6 +3230,9 @@ def _execute_agent(
         ip_address_of: ip_lookup.IPLookup,
     ) -> tuple[int, str]:
         hosts_config = config_cache.hosts_config
+        if host_name in hosts_config.clusters:
+            return 0, ""  # I think we never even call this for cluster hosts?
+
         ip_lookup_config = config_cache.ip_lookup_config()
         ip_family = ip_lookup_config.default_address_family(host_name)
         check_interval = config_cache.check_mk_check_interval(host_name)
@@ -3279,7 +3282,6 @@ def _execute_agent(
                 stored_walk_path=cmk.utils.paths.snmpwalks_dir,
                 walk_cache_path=walk_cache_path,
             ),
-            is_cluster=host_name in hosts_config.clusters,
             simulation_mode=config.simulation_mode,
             file_cache_options=file_cache_options,
             file_cache_max_age=MaxAge(
@@ -3754,6 +3756,7 @@ def execute(
         )
         config_cache = loading_result.config_cache
         hosts_config = config.make_hosts_config(loading_result.loaded_config)
+
         ip_lookup_config = config_cache.ip_lookup_config()
         ip_stack_config = ip_lookup_config.ip_stack_config(hostname)
         ip_family = ip_lookup_config.default_address_family(hostname)
@@ -3795,6 +3798,9 @@ def execute(
             )
 
             if ty == "agent":
+                if hostname in hosts_config.clusters:
+                    return GetAgentOutputResult(success, output, AgentRawData(info))
+
                 core_password_store_file = cmk.utils.password_store.core_password_store_path()
                 for source in sources.make_sources(
                     plugins,
@@ -3825,7 +3831,6 @@ def execute(
                         stored_walk_path=cmk.utils.paths.snmpwalks_dir,
                         walk_cache_path=walk_cache_path,
                     ),
-                    is_cluster=hostname in hosts_config.clusters,
                     simulation_mode=config.simulation_mode,
                     file_cache_options=file_cache_options,
                     file_cache_max_age=MaxAge(

cmk/base/checkers.py

@@ -467,7 +467,6 @@ def __call__(
                         stored_walk_path=cmk.utils.paths.snmpwalks_dir,
                         walk_cache_path=walk_cache_path,
                     ),
-                    is_cluster=current_host_name in hosts_config.clusters,
                     force_snmp_cache_refresh=(
                         self.force_snmp_cache_refresh if not is_cluster else False
                     ),

cmk/base/dump_host.py

@@ -217,56 +217,61 @@ def dump_host(
     )
     used_password_store = cmk.utils.password_store.pending_password_store_path()
     passwords = cmk.utils.password_store.load(used_password_store)
-    agenttypes = [
-        dump_source(source)
-        for source in sources.make_sources(
-            plugins,
-            hostname,
-            primary_family,
-            ipaddress,
-            ip_stack_config,
-            fetcher_factory=config_cache.fetcher_factory(
-                config_cache.make_service_configurer(plugins.check_plugins, service_name_config),
-                ip_address_of,
-                service_name_config,
-                enforced_services_table,
-            ),
-            snmp_fetcher_config=SNMPFetcherConfig(
-                scan_config=SNMPScanConfig(
-                    on_error=OnError.RAISE,
-                    missing_sys_description=config_cache.missing_sys_description(hostname),
-                    oid_cache_dir=oid_cache_dir,
-                ),
-                selected_sections=NO_SELECTION,
-                backend_override=None,
-                stored_walk_path=stored_walk_path,
-                walk_cache_path=walk_cache_path,
-            ),
-            is_cluster=hostname in hosts_config.clusters,
-            file_cache_options=FileCacheOptions(),
-            simulation_mode=simulation_mode,
-            file_cache_max_age=MaxAge.zero(),
-            snmp_backend=config_cache.get_snmp_backend(hostname),
-            file_cache_path=file_cache_path,
-            tcp_cache_path=tcp_cache_path,
-            tls_config=tls_config,
-            computed_datasources=config_cache.computed_datasources(hostname),
-            datasource_programs=config_cache.datasource_programs(hostname),
-            tag_list=config_cache.host_tags.tag_list(hostname),
-            management_ip=ip_address_of_mgmt(hostname, primary_family),
-            management_protocol=config_cache.management_protocol(hostname),
-            special_agent_command_lines=config_cache.special_agent_command_lines(
+    agenttypes = (
+        []
+        if hostname in hosts_config.clusters
+        else [
+            dump_source(source)
+            for source in sources.make_sources(
+                plugins,
                 hostname,
                 primary_family,
                 ipaddress,
-                password_store_file=used_password_store,
-                passwords=passwords,
-                ip_address_of=ip_address_of,
-            ),
-            agent_connection_mode=config_cache.agent_connection_mode(hostname),
-            check_mk_check_interval=config_cache.check_mk_check_interval(hostname),
-        )
-    ]
+                ip_stack_config,
+                fetcher_factory=config_cache.fetcher_factory(
+                    config_cache.make_service_configurer(
+                        plugins.check_plugins, service_name_config
+                    ),
+                    ip_address_of,
+                    service_name_config,
+                    enforced_services_table,
+                ),
+                snmp_fetcher_config=SNMPFetcherConfig(
+                    scan_config=SNMPScanConfig(
+                        on_error=OnError.RAISE,
+                        missing_sys_description=config_cache.missing_sys_description(hostname),
+                        oid_cache_dir=oid_cache_dir,
+                    ),
+                    selected_sections=NO_SELECTION,
+                    backend_override=None,
+                    stored_walk_path=stored_walk_path,
+                    walk_cache_path=walk_cache_path,
+                ),
+                file_cache_options=FileCacheOptions(),
+                simulation_mode=simulation_mode,
+                file_cache_max_age=MaxAge.zero(),
+                snmp_backend=config_cache.get_snmp_backend(hostname),
+                file_cache_path=file_cache_path,
+                tcp_cache_path=tcp_cache_path,
+                tls_config=tls_config,
+                computed_datasources=config_cache.computed_datasources(hostname),
+                datasource_programs=config_cache.datasource_programs(hostname),
+                tag_list=config_cache.host_tags.tag_list(hostname),
+                management_ip=ip_address_of_mgmt(hostname, primary_family),
+                management_protocol=config_cache.management_protocol(hostname),
+                special_agent_command_lines=config_cache.special_agent_command_lines(
+                    hostname,
+                    primary_family,
+                    ipaddress,
+                    password_store_file=used_password_store,
+                    passwords=passwords,
+                    ip_address_of=ip_address_of,
+                ),
+                agent_connection_mode=config_cache.agent_connection_mode(hostname),
+                check_mk_check_interval=config_cache.check_mk_check_interval(hostname),
+            )
+        ]
+    )
 
     if config_cache.is_ping_host(hostname):
         agenttypes.append("PING only")

cmk/base/modes/check_mk.py

@@ -703,7 +703,6 @@ def mode_dump_agent(options: Mapping[str, object], hostname: HostName) -> None:
                 stored_walk_path=stored_walk_path,
                 walk_cache_path=walk_cache_path,
             ),
-            is_cluster=False,
             simulation_mode=config.simulation_mode,
             file_cache_options=file_cache_options,
             file_cache_max_age=MaxAge(

cmk/base/sources/_builder.py

@@ -54,7 +54,6 @@ def __init__(
         *,
         simulation_mode: bool,
         fetcher_factory: FetcherFactory,
-        is_cluster: bool,
         snmp_fetcher_config: SNMPFetcherConfig,
         max_age_agent: MaxAge,
         max_age_snmp: MaxAge,
@@ -72,7 +71,6 @@ def __init__(
         check_mk_check_interval: float,
     ) -> None:
         super().__init__()
-        assert not is_cluster
 
         self.plugins: Final = plugins
         self.host_name: Final = host_name
@@ -308,7 +306,6 @@ def make_sources(
     ip_stack_config: IPStackConfig,
     *,
     fetcher_factory: FetcherFactory,
-    is_cluster: bool,
     force_snmp_cache_refresh: bool = False,
     snmp_fetcher_config: SNMPFetcherConfig,
     snmp_backend: SNMPBackendEnum,
@@ -328,10 +325,6 @@ def make_sources(
     check_mk_check_interval: float,
 ) -> Sequence[Source]:
     """Sequence of sources available for `host_config`."""
-    if is_cluster:
-        # Cluster hosts do not have any actual data sources
-        # Instead all data is provided by the nodes
-        return ()
 
     def max_age_snmp() -> MaxAge:
         if simulation_mode:
@@ -359,7 +352,6 @@ def max_age_agent() -> MaxAge:
         fetcher_factory=fetcher_factory,
         snmp_fetcher_config=snmp_fetcher_config,
         snmp_backend=snmp_backend,
-        is_cluster=is_cluster,
         max_age_agent=max_age_agent(),
         max_age_snmp=max_age_snmp(),
         file_cache_path=file_cache_path,

tests/unit/cmk/base/sources/test_data_sources.py

@@ -75,7 +75,6 @@ def _make_sources(
             stored_walk_path=tmp_path,
             walk_cache_path=tmp_path,
         ),
-        is_cluster=False,
         simulation_mode=True,
         file_cache_options=FileCacheOptions(),
         file_cache_max_age=MaxAge.zero(),