From 417e5dacdfd28660f876ef9de96a122fe90f56fc Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 10 Jan 2025 17:12:18 -0800 Subject: [PATCH] use correct image, use endpoint instead of hardcoding the port --- .../collector/config.d.linux/receivers/envoy.discovery.yaml | 2 +- .../discovery/bundle/bundle.d/receivers/envoy.discovery.yaml | 2 +- .../bundle/bundle.d/receivers/envoy.discovery.yaml.tmpl | 2 +- tests/receivers/envoy/testdata/expected.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/otelcol/config/collector/config.d.linux/receivers/envoy.discovery.yaml b/cmd/otelcol/config/collector/config.d.linux/receivers/envoy.discovery.yaml index c2d633ab70..bd9b58fb0b 100644 --- a/cmd/otelcol/config/collector/config.d.linux/receivers/envoy.discovery.yaml +++ b/cmd/otelcol/config/collector/config.d.linux/receivers/envoy.discovery.yaml @@ -20,7 +20,7 @@ # metrics_path: /stats/prometheus # scrape_interval: 10s # static_configs: -# - targets: ['`host`:9901'] +# - targets: ['`endpoint`'] # metric_relabel_configs: # - source_labels: [__name__] # action: keep diff --git a/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml b/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml index 9555df3474..0197204dad 100644 --- a/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml +++ b/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml @@ -16,7 +16,7 @@ prometheus: metrics_path: /stats/prometheus scrape_interval: 10s static_configs: - - targets: ['`host`:9901'] + - targets: ['`endpoint`'] metric_relabel_configs: - source_labels: [__name__] action: keep diff --git a/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml.tmpl b/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml.tmpl index 0a1d4a1509..50e41bf1bb 100644 --- a/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml.tmpl +++ b/internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml.tmpl @@ -12,7 +12,7 @@ metrics_path: /stats/prometheus scrape_interval: 10s static_configs: - - targets: ['`host`:9901'] + - targets: ['`endpoint`'] metric_relabel_configs: - source_labels: [__name__] action: keep diff --git a/tests/receivers/envoy/testdata/expected.yaml b/tests/receivers/envoy/testdata/expected.yaml index 05d8d67eb7..0fb0d5ec6e 100644 --- a/tests/receivers/envoy/testdata/expected.yaml +++ b/tests/receivers/envoy/testdata/expected.yaml @@ -3,7 +3,7 @@ resourceMetrics: attributes: - key: container.image.name value: - stringValue: envoyproxy/envoy + stringValue: quay.io/splunko11ytest/envoy - key: http.scheme value: stringValue: http