From 476c95228ae9c6e8b9f28ecfa1c3f6fddcc44a40 Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Tue, 8 Oct 2024 16:59:56 +0000 Subject: [PATCH] ensure all example configs use ${env:...} replacement syntax Signed-off-by: Anthony J Mirabella --- config/ecs/ecs-amp-prometheus.yaml | 6 +++--- config/ecs/ecs-amp-xray-prometheus.yaml | 6 +++--- config/ecs/ecs-amp-xray.yaml | 4 ++-- config/ecs/ecs-amp.yaml | 4 ++-- examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/ecs/ecs-amp-prometheus.yaml b/config/ecs/ecs-amp-prometheus.yaml index 2a15bca1a..ed794db9e 100644 --- a/config/ecs/ecs-amp-prometheus.yaml +++ b/config/ecs/ecs-amp-prometheus.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: ${AWS_REGION} + region: ${env:AWS_REGION} receivers: awsecscontainermetrics: @@ -13,7 +13,7 @@ receivers: scrape_configs: - job_name: "otel-collector" static_configs: - - targets: [$AWS_PROMETHEUS_SCRAPING_ENDPOINT] + - targets: [${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}] processors: batch/metrics: @@ -41,7 +41,7 @@ processors: exporters: prometheusremotewrite: - endpoint: ${AWS_PROMETHEUS_ENDPOINT} + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/config/ecs/ecs-amp-xray-prometheus.yaml b/config/ecs/ecs-amp-xray-prometheus.yaml index e3ac07ad0..5534b963a 100644 --- a/config/ecs/ecs-amp-xray-prometheus.yaml +++ b/config/ecs/ecs-amp-xray-prometheus.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: ${AWS_REGION} + region: ${env:AWS_REGION} receivers: otlp: @@ -19,7 +19,7 @@ receivers: scrape_configs: - job_name: "otel-collector" static_configs: - - targets: [$AWS_PROMETHEUS_SCRAPING_ENDPOINT] + - targets: [${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}] processors: batch/traces: @@ -51,7 +51,7 @@ processors: exporters: awsxray: prometheusremotewrite: - endpoint: ${AWS_PROMETHEUS_ENDPOINT} + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/config/ecs/ecs-amp-xray.yaml b/config/ecs/ecs-amp-xray.yaml index 7020c3aa3..e583990d6 100644 --- a/config/ecs/ecs-amp-xray.yaml +++ b/config/ecs/ecs-amp-xray.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: ${AWS_REGION} + region: ${env:AWS_REGION} receivers: otlp: @@ -42,7 +42,7 @@ processors: exporters: awsxray: prometheusremotewrite: - endpoint: ${AWS_PROMETHEUS_ENDPOINT} + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/config/ecs/ecs-amp.yaml b/config/ecs/ecs-amp.yaml index 806a0891e..4d5f88c49 100644 --- a/config/ecs/ecs-amp.yaml +++ b/config/ecs/ecs-amp.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: ${AWS_REGION} + region: ${env:AWS_REGION} receivers: otlp: @@ -38,7 +38,7 @@ processors: exporters: prometheusremotewrite: - endpoint: ${AWS_PROMETHEUS_ENDPOINT} + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml b/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml index 86a33ade8..09e60e685 100644 --- a/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml +++ b/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml @@ -7,7 +7,7 @@ receivers: scrape_configs: - job_name: "test-prometheus-sample-app" static_configs: - - targets: [ $PROMETHEUS_SAMPLE_APP ] + - targets: [ ${env:PROMETHEUS_SAMPLE_APP} ] awsecscontainermetrics: collection_interval: 20s