From 828008e94c88a80072f67230cb5af064212bc3a0 Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Thu, 26 Oct 2023 11:15:41 +0200 Subject: [PATCH 1/2] Remove unnecessary config Signed-off-by: Matej Gera --- otel-integration/k8s-helm/Chart.yaml | 2 +- otel-integration/k8s-helm/values-windows.yaml | 12 ---------- otel-integration/k8s-helm/values.yaml | 24 ------------------- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index 23a63982..efa6893f 100644 --- a/otel-integration/k8s-helm/Chart.yaml +++ b/otel-integration/k8s-helm/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: otel-integration description: OpenTelemetry Integration -version: 0.0.23 +version: 0.0.25 keywords: - OpenTelemetry Collector - OpenTelemetry Agent diff --git a/otel-integration/k8s-helm/values-windows.yaml b/otel-integration/k8s-helm/values-windows.yaml index 8cfa97cc..d6b9e779 100644 --- a/otel-integration/k8s-helm/values-windows.yaml +++ b/otel-integration/k8s-helm/values-windows.yaml @@ -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 diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index 21f387fa..7ec618ed 100644 --- a/otel-integration/k8s-helm/values.yaml +++ b/otel-integration/k8s-helm/values.yaml @@ -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 @@ -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 From 72d036299897543f4b97c4c019ca01ad3c23140c Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Thu, 26 Oct 2023 11:16:41 +0200 Subject: [PATCH 2/2] Bump chart and update CHANGELOG Signed-off-by: Matej Gera --- otel-integration/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index 1332be0d..90e5d85d 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,9 @@ ## OpenTelemtry-Integration +### v0.0.24 / 2023-10-26 +* [CHORE] Remove unnecessary cloud resource detector configuration. + ### v0.0.23 / 2023-10-26 * [FEATURE] Add k8sattributes and resourcedetecion processor for logs and traces in agent.