From 7e08819e515aba62ad1320386aa2966da3d4a47e Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Sat, 11 Jan 2025 20:28:25 -0800 Subject: [PATCH] fix docker test again --- .../docker_observer_discovery_test.go | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/tests/general/discoverymode/docker_observer_discovery_test.go b/tests/general/discoverymode/docker_observer_discovery_test.go index da5c22c1a7..e9cb07a125 100644 --- a/tests/general/discoverymode/docker_observer_discovery_test.go +++ b/tests/general/discoverymode/docker_observer_discovery_test.go @@ -275,32 +275,6 @@ func TestDockerObserver(t *testing.T) { "receivers": map[string]any{ "receiver_creator/discovery": map[string]any{ "receivers": map[string]any{ - "prometheus": map[string]any{ - "config": map[string]any{ - "config": map[string]any{ - "scrape_configs": []any{map[string]any{ - "job_name": "envoy", - "metric_relabel_configs": []any{ - map[string]any{ - "action": "keep", - "regex": "(envoy_cluster_upstream_cx_active|envoy_cluster_upstream_cx_total|envoy_cluster_upstream_cx_connect_fail|envoy_cluster_upstream_cx_connect_ms|envoy_cluster_upstream_rq_active|envoy_cluster_upstream_rq_total|envoy_cluster_upstream_rq_timeout|envoy_cluster_upstream_rq_pending_active|envoy_cluster_upstream_rq_pending_overflow|envoy_cluster_upstream_rq_time|envoy_cluster_membership_total|envoy_cluster_membership_degraded|envoy_cluster_membership_excluded|envoy_listener_downstream_cx_active|envoy_listener_downstream_cx_total|envoy_listener_downstream_cx_transport_socket_connect_timeout|envoy_listener_downstream_cx_overflow|envoy_listener_downstream_cx_overload_reject|envoy_listener_downstream_global_cx_overflow)", - "source_labels": []any{"__name__"}, - }, - }, - "metrics_path": "/stats/prometheus", - "scrape_interval": "10s", - "static_configs": []any{ - map[string]any{ - "targets": []any{"`endpoint`"}, - }, - }, - }, - }, - }, - }, - "resource_attributes": map[string]any{}, - "rule": "type == \"container\" and any([name, image, command], {# matches \"(?i)envoy\"}) and not (command matches \"splunk.discovery\")", - }, "prometheus_simple": map[string]any{ "config": map[string]any{ "collection_interval": "1s", @@ -357,24 +331,6 @@ processors: receivers: receiver_creator/discovery: receivers: - prometheus: - config: - config: - scrape_configs: - - job_name: envoy - metric_relabel_configs: - - action: keep - regex: (envoy_cluster_upstream_cx_active|envoy_cluster_upstream_cx_total|envoy_cluster_upstream_cx_connect_fail|envoy_cluster_upstream_cx_connect_ms|envoy_cluster_upstream_rq_active|envoy_cluster_upstream_rq_total|envoy_cluster_upstream_rq_timeout|envoy_cluster_upstream_rq_pending_active|envoy_cluster_upstream_rq_pending_overflow|envoy_cluster_upstream_rq_time|envoy_cluster_membership_total|envoy_cluster_membership_degraded|envoy_cluster_membership_excluded|envoy_listener_downstream_cx_active|envoy_listener_downstream_cx_total|envoy_listener_downstream_cx_transport_socket_connect_timeout|envoy_listener_downstream_cx_overflow|envoy_listener_downstream_cx_overload_reject|envoy_listener_downstream_global_cx_overflow) - source_labels: - - __name__ - metrics_path: /stats/prometheus - scrape_interval: 10s - static_configs: - - targets: - - '`+"`endpoint`"+`' - resource_attributes: {} - rule: type == "container" and any([name, image, command], {# matches "(?i)envoy"}) - and not (command matches "splunk.discovery") prometheus_simple: config: collection_interval: 1s