From 82a2eb06f06d584e635d39af6d40cb545b86be7c Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Wed, 26 Jun 2024 14:27:13 +0300 Subject: [PATCH] [otel-integration] Add azure to resource detection cloud list --- otel-integration/CHANGELOG.md | 3 +++ otel-integration/k8s-helm/Chart.yaml | 2 +- otel-integration/k8s-helm/e2e-test/expected_test.go | 8 ++++---- otel-integration/k8s-helm/values.yaml | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index d813ab19..d8502112 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,9 @@ ## OpenTelemtry-Integration +### v0.0.84 / 2024-06-26 +- [Fix] Add azure to resource detection processor + ### v0.0.83 / 2024-06-26 - [Fix] Add cluster.name and resource detection processors to gateway-collector metrics diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index e749be5a..0b6f8f38 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.83 +version: 0.0.84 keywords: - OpenTelemetry Collector - OpenTelemetry Agent diff --git a/otel-integration/k8s-helm/e2e-test/expected_test.go b/otel-integration/k8s-helm/e2e-test/expected_test.go index e7b2b0aa..6e5b5893 100644 --- a/otel-integration/k8s-helm/e2e-test/expected_test.go +++ b/otel-integration/k8s-helm/e2e-test/expected_test.go @@ -27,8 +27,8 @@ var expectedResourceAttributesKubeletstatreceiver = map[string]string{ "k8s.deployment.name": "", "cx.otel_integration.name": "coralogix-integration-helm", "k8s.cluster.name": "otel-integration-agent-e2e", - "k8s.node.name": "otel-integration-agent-e2e-control-plane", - "host.name": "otel-integration-agent-e2e-control-plane", + "k8s.node.name": "", + "host.name": "", "host.id": "", "os.type": "linux", } @@ -37,7 +37,7 @@ var expectedResourceAttributesHostmetricsreceiver = map[string]string{ "cx.otel_integration.name": "coralogix-integration-helm", "k8s.cluster.name": "otel-integration-agent-e2e", "k8s.node.name": "otel-integration-agent-e2e-control-plane", - "host.name": "otel-integration-agent-e2e-control-plane", + "host.name": "", "host.id": "", "os.type": "linux", } @@ -52,7 +52,7 @@ var expectedResourceAttributesPrometheusreceiver = map[string]string{ "cx.otel_integration.name": "coralogix-integration-helm", "k8s.cluster.name": "otel-integration-agent-e2e", "k8s.node.name": "otel-integration-agent-e2e-control-plane", - "host.name": "otel-integration-agent-e2e-control-plane", + "host.name": "", "host.id": "", "k8s.pod.ip": "", "k8s.pod.name": "", diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index 73613cb9..b67bb8de 100644 --- a/otel-integration/k8s-helm/values.yaml +++ b/otel-integration/k8s-helm/values.yaml @@ -5,7 +5,7 @@ global: defaultSubsystemName: "integration" logLevel: "warn" collectionInterval: "30s" - version: "0.0.83" + version: "0.0.84" extensions: kubernetesDashboard: @@ -205,7 +205,7 @@ opentelemetry-agent: host.id: enabled: true resourcedetection/region: - detectors: ["gcp", "ec2"] + detectors: ["gcp", "ec2", "azure"] timeout: 2s override: true transform/prometheus: @@ -535,7 +535,7 @@ opentelemetry-cluster-collector: timeout: 2s override: false resourcedetection/region: - detectors: ["gcp", "ec2"] + detectors: ["gcp", "ec2", "azure"] timeout: 2s override: true # Will get the k8s resource limits @@ -728,7 +728,7 @@ opentelemetry-gateway: host.id: enabled: true resourcedetection/region: - detectors: ["gcp", "ec2"] + detectors: ["gcp", "ec2", "azure"] timeout: 2s override: true batch: