fixup

Author: vitkyrka

argo_rollouts/assets/configuration/spec.yaml

@@ -4,10 +4,10 @@ files:
 - name: argo_rollouts.yaml
   discovery:
     strategies:
-    - template: discovery/openmetrics_from_ports
+    - template: discovery/openmetrics_from_named_ports
       overrides:
-        port_hints:
-        - 8090
+        port_names:
+        - metrics
   options:
   - template: init_config
     options:
@@ -26,4 +26,4 @@ files:
     overrides:
       value.example:
       - argo-rollouts
-  - template: auto_conf/discovery
+  - template: auto_conf/discovery

argo_rollouts/datadog_checks/argo_rollouts/config_models/discovery.py

@@ -15,15 +15,15 @@
 from datadog_checks.argo_rollouts.config_models import discovery_overrides
 from datadog_checks.argo_rollouts.config_models.instance import InstanceConfig
 from datadog_checks.argo_rollouts.config_models.shared import SharedConfig
-from datadog_checks.base.utils.discovery import Service, candidate_ports
+from datadog_checks.base.utils.discovery import Service, candidate_ports_by_name
 
 
 def _generated_candidates(service: Service) -> Iterator[dict[str, Any]]:
     shared = SharedConfig.model_validate({}, context={'configured_fields': frozenset()}).model_dump(
         by_alias=True, mode='json', exclude_none=True
     )
-    # discovery[0]: from_ports
-    for port in candidate_ports(service, [8090]):
+    # discovery[0]: from_named_ports
+    for port in candidate_ports_by_name(service, ['metrics']):
         ctx = {'port': port}
         instance_data = {
             'openmetrics_endpoint': 'http://{service.host}:{port.number}/metrics'.format(service=service, **ctx),

argo_rollouts/tests/conftest.py

@@ -8,7 +8,7 @@
 
 from datadog_checks.dev import get_here
 from datadog_checks.dev.kind import kind_run
-from datadog_checks.dev.kube_discovery import save_kube_discovery_state, setup_discovery_agent
+from datadog_checks.dev.kube_discovery import setup_discovery_agent
 from datadog_checks.dev.kube_port_forward import port_forward
 from datadog_checks.dev.subprocess import run_command
 
@@ -30,7 +30,6 @@ def setup_argo_rollouts():
 def dd_environment():
     with kind_run(conditions=[setup_argo_rollouts], sleep=30) as kubeconfig, ExitStack() as stack:
         setup_discovery_agent(kubeconfig)
-        save_kube_discovery_state(kubeconfig)
         argo_rollouts_host, argo_rollouts_port = stack.enter_context(
             port_forward(kubeconfig, 'argo-rollouts', 8090, 'deployment', 'argo-rollouts')
         )