diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index 77d961e2..293be2d8 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,9 @@ ## OpenTelemtry-Integration +### v0.0.82 / 2024-06-26 +- [Fix] Add k8s labels to gateway-collector metrics + ### v0.0.81 / 2024-06-26 - [Fix] Allow configuring max_unmatched_batch_size in multilineConfigs. Default is changed to max_unmatched_batch_size=1. - [Fix] Fix spanMetrics.spanNameReplacePattern preset does not work diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index f42335ca..896b48bb 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.81 +version: 0.0.82 keywords: - OpenTelemetry Collector - OpenTelemetry Agent diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index 21a7c28b..506f43f4 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.81" + version: "0.0.82" extensions: kubernetesDashboard: @@ -659,6 +659,14 @@ opentelemetry-gateway: secretKeyRef: name: coralogix-keys key: PRIVATE_KEY + - name: KUBE_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + presets: + kubernetesAttributes: + enabled: true config: extensions: @@ -692,10 +700,31 @@ opentelemetry-gateway: - "k8s.cronjob.name" - "service.name" processors: + # needed for self-monitored otel colector metrics + k8sattributes: + filter: + node_from_env_var: KUBE_NODE_NAME + extract: + metadata: + - "k8s.namespace.name" + # replace the below by `k8s.deployment.name` after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23067 + - "k8s.replicaset.name" + - "k8s.statefulset.name" + - "k8s.daemonset.name" + - "k8s.cronjob.name" + - "k8s.job.name" + - "k8s.pod.name" + - "k8s.node.name" batch: send_batch_size: 1024 send_batch_max_size: 2048 timeout: "1s" + transform/prometheus: + error_mode: ignore + metric_statements: + - context: resource + statements: + - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"] == "opentelemetry-collector" receivers: prometheus: config: @@ -728,6 +757,8 @@ opentelemetry-gateway: exporters: - coralogix processors: + - transform/prometheus + - k8sattributes - memory_limiter - batch receivers: