Merge pull request #34 from alphagov/dependabot/docker/amazon/aws-ote…

…l-collector-v0.41.0 Bump amazon/aws-otel-collector from v0.40.2 to v0.41.0
alphagov · Oct 7, 2024 · 193254f · 193254f
2 parents 0b4349d + c6ac8f2
commit 193254f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazon/aws-otel-collector:v0.40.2@sha256:ef91d5acc79f2472740452c0177b0170fe38c8092a990114c35f504c04f6c1ac
+FROM amazon/aws-otel-collector:v0.41.0@sha256:7edf4972419b52c3259d1118a9506d883e15dbb7bfb4cc7d90dfc16b68594233
 
 ENV OTEL_LOG_LEVEL=INFO
 

diff --git a/config.yml b/config.yml
@@ -7,7 +7,7 @@ receivers:
       scrape_configs:
       - job_name: "adot-sidecar-scrape-application"
         static_configs:
-        - targets: [ "127.0.0.1:$APPLICATION_PORT" ]
+        - targets: [ "127.0.0.1:${APPLICATION_PORT}" ]
         honor_labels: true
         honor_timestamps: true
   awsecscontainermetrics:
@@ -132,7 +132,7 @@ processors:
 
 exporters:
   prometheusremotewrite:
-    endpoint: $PROMETHEUS_ENDPOINT_URL
+    endpoint: ${PROMETHEUS_ENDPOINT_URL}
     # We do not want to cause a mass discontinuity in all out existing metrics, so disable the new behaviour
     # which adds suffixes with the metrics type.
     add_metric_suffixes: false
@@ -166,15 +166,15 @@ exporters:
 
 extensions:
   sigv4auth:
-    region: $AWS_REGION
+    region: ${AWS_REGION}
     service: aps
     assume_role:
-      arn: $PROMETHEUS_WRITE_ASSUME_ROLE_ARN
+      arn: ${PROMETHEUS_WRITE_ASSUME_ROLE_ARN}
 
 service:
   telemetry:
     logs:
-      level: $OTEL_LOG_LEVEL
+      level: ${OTEL_LOG_LEVEL}
     metrics:
       level: none
   extensions: [sigv4auth]

diff --git a/tests/test-config.yml b/tests/test-config.yml
@@ -8,7 +8,7 @@ receivers:
       - job_name: "adot-sidecar-scrape-application"
         # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
         static_configs:
-          - targets: [ "test-app:$APPLICATION_PORT" ]
+          - targets: [ "test-app:${APPLICATION_PORT}" ]
         honor_labels: true
         honor_timestamps: true
 
@@ -46,7 +46,7 @@ processors:
 
 exporters:
   prometheusremotewrite:
-    endpoint: $PROMETHEUS_REMOTE_WRITE_URL
+    endpoint: ${PROMETHEUS_REMOTE_WRITE_URL}
     # We do not want to cause a mass discontinuity in all out existing metrics, so disable the new behaviour
     # which adds suffixes with the metrics type.
     add_metric_suffixes: false
@@ -58,7 +58,7 @@ exporters:
 service:
   telemetry:
     logs:
-      level: $OTEL_LOG_LEVEL
+      level: ${OTEL_LOG_LEVEL}
     metrics:
       level: none
   pipelines: