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

Jump to bottom

Merge v0.41.1 changes #2879

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Merge v0.41.1 changes #2879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17b1965
Fix environment variable substitution syntax in configuration example…
Aneurysm9 Oct 8, 2024
2ffec33
bump version to v0.41.1
roystchiang Oct 15, 2024
be293e1
Merge pull request #2876 from aws-observability/prepare-release-v0.41.1
roystchiang Oct 15, 2024
9127574
Merge remote-tracking branch 'origin/release/v0.41.x' into merge-41x
roystchiang Oct 16, 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 VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.41.0
v0.41.1
6 changes: 3 additions & 3 deletions config/ecs/ecs-amp-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extensions:
health_check:
sigv4auth:
region: $AWS_REGION
region: ${env:AWS_REGION}

receivers:
awsecscontainermetrics:
Expand All @@ -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:
Expand Down Expand Up @@ -41,7 +41,7 @@ processors:

exporters:
prometheusremotewrite:
endpoint: $AWS_PROMETHEUS_ENDPOINT
endpoint: ${env:AWS_PROMETHEUS_ENDPOINT}
auth:
authenticator: sigv4auth
resource_to_telemetry_conversion:
Expand Down
6 changes: 3 additions & 3 deletions config/ecs/ecs-amp-xray-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extensions:
health_check:
sigv4auth:
region: $AWS_REGION
region: ${env:AWS_REGION}

receivers:
otlp:
Expand All @@ -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:
Expand Down Expand Up @@ -51,7 +51,7 @@ processors:
exporters:
awsxray:
prometheusremotewrite:
endpoint: $AWS_PROMETHEUS_ENDPOINT
endpoint: ${env:AWS_PROMETHEUS_ENDPOINT}
auth:
authenticator: sigv4auth
resource_to_telemetry_conversion:
Expand Down
4 changes: 2 additions & 2 deletions config/ecs/ecs-amp-xray.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extensions:
health_check:
sigv4auth:
region: $AWS_REGION
region: ${env:AWS_REGION}

receivers:
otlp:
Expand Down Expand Up @@ -42,7 +42,7 @@ processors:
exporters:
awsxray:
prometheusremotewrite:
endpoint: $AWS_PROMETHEUS_ENDPOINT
endpoint: ${env:AWS_PROMETHEUS_ENDPOINT}
auth:
authenticator: sigv4auth
resource_to_telemetry_conversion:
Expand Down
4 changes: 2 additions & 2 deletions config/ecs/ecs-amp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extensions:
health_check:
sigv4auth:
region: $AWS_REGION
region: ${env:AWS_REGION}

receivers:
otlp:
Expand Down Expand Up @@ -38,7 +38,7 @@ processors:

exporters:
prometheusremotewrite:
endpoint: $AWS_PROMETHEUS_ENDPOINT
endpoint: ${env:AWS_PROMETHEUS_ENDPOINT}
auth:
authenticator: sigv4auth
resource_to_telemetry_conversion:
Expand Down
7 changes: 7 additions & 0 deletions docs/releases/v0.41.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Changelog

## [v0.41.1](https://github.com/aws-observability/aws-otel-collector/tree/v0.41.1) (2024-10-15)

[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.41.0...v0.41.1)

* Fix environment variable substitution syntax in configuration examples (#2866)
2 changes: 1 addition & 1 deletion examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml
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: "test-prometheus-sample-app"
static_configs:
- targets: [ $PROMETHEUS_SAMPLE_APP ]
- targets: [ ${env:PROMETHEUS_SAMPLE_APP} ]
awsecscontainermetrics:
collection_interval: 20s

Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/windows/aws-otel-collector.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
Name="ADOT Collector"
Version="0.41.0"
Version="0.41.1"
Codepage='1252'
Manufacturer="Amazon.com, Inc."
Language="1033">
Expand Down
Loading