Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump amazon/aws-otel-collector from v0.40.2 to v0.41.0 #34

Merged
merged 2 commits into from
Oct 7, 2024
+9 −9
Merged

Bump amazon/aws-otel-collector from v0.40.2 to v0.41.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85419ed
Bump amazon/aws-otel-collector from v0.40.2 to v0.41.0
dependabot[bot] Oct 4, 2024
c6ac8f2
Correctly reference env vars
jfharden Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 5 additions & 5 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions tests/test-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -58,7 +58,7 @@ exporters:
service:
telemetry:
logs:
level: $OTEL_LOG_LEVEL
level: ${OTEL_LOG_LEVEL}
metrics:
level: none
pipelines:
Expand Down
Loading