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

Remove unneeded config from cloud provider resource detectors #316

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Remove unneeded config from cloud provider resource detectors #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
828008e
Remove unnecessary config
matej-g Oct 26, 2023
72d0362
Bump chart and update CHANGELOG
matej-g Oct 26, 2023
bd5157b
Merge remote-tracking branch 'origin/master' into remove-config-cloud…
matej-g Oct 26, 2023
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
3 changes: 3 additions & 0 deletions otel-integration/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## OpenTelemtry-Integration

### v0.0.25 / 2023-10-26
* [CHORE] Remove unnecessary cloud resource detector configuration.

### v0.0.24 / 2023-10-26
* [FIX] service::pipelines::logs: references exporter "k8sattributes" which is not configured

Expand Down
2 changes: 1 addition & 1 deletion otel-integration/k8s-helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: otel-integration
description: OpenTelemetry Integration
version: 0.0.24
version: 0.0.25
keywords:
- OpenTelemetry Collector
- OpenTelemetry Agent
Expand Down
12 changes: 0 additions & 12 deletions otel-integration/k8s-helm/values-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,6 @@ opentelemetry-agent-windows:
detectors: ["gcp", "ec2"]
timeout: 2s
override: true
gcp:
resource_attributes:
cloud.region:
enabled: true
cloud.availability_zone:
enabled: true
ec2:
resource_attributes:
cloud.region:
enabled: true
cloud.availability_zone:
enabled: true
k8sattributes:
filter:
node_from_env_var: KUBE_NODE_NAME
Expand Down
24 changes: 0 additions & 24 deletions otel-integration/k8s-helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,6 @@ opentelemetry-agent:
detectors: ["gcp", "ec2"]
timeout: 2s
override: true
gcp:
resource_attributes:
cloud.region:
enabled: true
cloud.availability_zone:
enabled: true
ec2:
resource_attributes:
cloud.region:
enabled: true
cloud.availability_zone:
enabled: true
k8sattributes:
filter:
node_from_env_var: KUBE_NODE_NAME
Expand Down Expand Up @@ -377,18 +365,6 @@ opentelemetry-cluster-collector:
detectors: ["gcp", "ec2"]
timeout: 2s
override: true
gcp:
resource_attributes:
cloud.region:
enabled: true
cloud.availability_zone:
enabled: true
ec2:
resource_attributes:
cloud.region:
enabled: true
cloud.availability_zone:
enabled: true
# Will get the k8s resource limits
memory_limiter: null

Expand Down
Loading