From 0a6efaf2dcdce0b4f43f4a9bee62d682700b3449 Mon Sep 17 00:00:00 2001 From: Jakob Demler Date: Mon, 31 Jul 2023 22:39:26 +0200 Subject: [PATCH] [collector] Respect pipeline order when enabling kubernetesAttributes (#844) * fix pipeline order when enabling k8sattributes * bump collector and document breakage * kubernetesAttributes example * regenerate examples * Update charts/opentelemetry-collector/UPGRADING.md Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- charts/opentelemetry-collector/Chart.yaml | 2 +- charts/opentelemetry-collector/UPGRADING.md | 5 + .../rendered/configmap-agent.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/deployment.yaml | 4 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../daemonset-only/rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../deployment-only/rendered/configmap.yaml | 2 +- .../deployment-only/rendered/deployment.yaml | 4 +- .../deployment-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/deployment.yaml | 4 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/clusterrole.yaml | 22 ++++ .../rendered/clusterrolebinding.yaml | 20 ++++ .../rendered/configmap.yaml | 112 ++++++++++++++++++ .../rendered/deployment.yaml | 90 ++++++++++++++ .../rendered/service.yaml | 47 ++++++++ .../rendered/serviceaccount.yaml | 12 ++ .../examples/kubernetesAttributes/values.yaml | 15 +++ .../rendered/configmap-statefulset.yaml | 2 +- .../statefulset-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/statefulset.yaml | 4 +- .../templates/_config.tpl | 6 +- 43 files changed, 369 insertions(+), 46 deletions(-) create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 94a5e32b151..ad0e0bc01b7 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.62.4 +version: 0.63.0 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/UPGRADING.md b/charts/opentelemetry-collector/UPGRADING.md index 51df61f4297..282ff1c572d 100644 --- a/charts/opentelemetry-collector/UPGRADING.md +++ b/charts/opentelemetry-collector/UPGRADING.md @@ -4,6 +4,11 @@ These upgrade guidelines only contain instructions for version upgrades which re If the version you want to upgrade to is not listed here, then there is nothing to do for you. Just upgrade and enjoy. +## 0.62 to 0.63 + +The `kubernetesAttributes` preset now respects order of processors in logs, metrics and traces pipelines. +This implicitly might break your pipelines if you relied on having the `k8sAttributes` processor rendered as the first processor but also explicitly listed it in the signal's pipeline somewhere else. + ## 0.55.2 to 0.56 The `tpl` function has been added to references of pod labels and ingress hosts. This adds the ability to add some reusability in diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml index 2eaee448045..9d8c2bbbcf6 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml index 7339c5bf737..3462634912f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml index 7305347b150..6c8245e8cb4 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 85ae03b0c589edfc8755577efead28357ac385ab95f9654da9857677e474ffba + checksum/config: 05d49ab2d6fdf2c4ae24177bd3388603215677eeb0d7f8d04212d08eea78eef1 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml index b5086941440..7b51da85478 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 34f672027386c92c78dd0089dc78d10e96b785a2c22b0237d81c3f95139bc6ee + checksum/config: dd398f20da75dec2d48ef955e86c97aee60643ddcd278c25bd84840b5e830b42 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml index db683dd0777..060fefe2ecf 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml index c46f83535aa..cde45c79862 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml index 30389a3e1e9..05a12975a3f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 997d8049580bc8c94d18e5ca5a2396299d6158b6c713e92954149b44d82cc1d6 + checksum/config: a2d9141949d6cf51dfef0603067bafca8027ffb1c06b1405c1b71120dff56856 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml index 1169204eb3c..3bbf6989833 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index 8260d684df3..fc248fa4aab 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: d1160787fc40ca202ce0ab5d0c2ec70c043927113df313aa4333ce63a0620177 + checksum/config: d16cfa5c657cfcc941c3fd5bc99a87e24b35acb9d9d1d0c8761b1093beadad34 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml index e13a3dd72cc..a8ee9648fea 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml index 3edb23286d8..0d200a2035e 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: d0dd464b0f0c0fca81f77b098cf5f3558152de2c546f23297b85537b21cb7368 + checksum/config: 8982a0e14ff679dde9dd3dd0933aa80aa994f1e2005036a6039e7193ee2b70da labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml index e13a3dd72cc..a8ee9648fea 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index c7c21d3989e..d0c8ca18578 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: d0dd464b0f0c0fca81f77b098cf5f3558152de2c546f23297b85537b21cb7368 + checksum/config: 8982a0e14ff679dde9dd3dd0933aa80aa994f1e2005036a6039e7193ee2b70da labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index 7339c5bf737..3462634912f 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index c321adb1fc4..9047079c7d4 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 34f672027386c92c78dd0089dc78d10e96b785a2c22b0237d81c3f95139bc6ee + checksum/config: dd398f20da75dec2d48ef955e86c97aee60643ddcd278c25bd84840b5e830b42 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml index db683dd0777..060fefe2ecf 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml index 6ba52561c8b..e706fed3846 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml index 7a41a7ece1e..2cc0b2c570c 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 94ce15360df97555b0ef8bedfd08b42c143e289196234a1d50c82cd6b60a4fd3 + checksum/config: 38a1ad0d55e3809b1d504ead21cb56479a38d74934f60f910e7e9a47a54f5334 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml index ad25f65ed90..712888ce99a 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml index f2260b520e2..9264a19d8f3 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml index db683dd0777..060fefe2ecf 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml new file mode 100644 index 00000000000..cf177fbf1f8 --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml @@ -0,0 +1,22 @@ +--- +# Source: opentelemetry-collector/templates/clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.63.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.81.0" + app.kubernetes.io/managed-by: Helm +rules: + - apiGroups: [""] + resources: ["pods", "namespaces"] + verbs: ["get", "watch", "list"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml new file mode 100644 index 00000000000..d3e19109892 --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml @@ -0,0 +1,20 @@ +--- +# Source: opentelemetry-collector/templates/clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.63.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.81.0" + app.kubernetes.io/managed-by: Helm +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: example-opentelemetry-collector +subjects: +- kind: ServiceAccount + name: example-opentelemetry-collector + namespace: default diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml new file mode 100644 index 00000000000..0fb1e98e9db --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml @@ -0,0 +1,112 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.63.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.81.0" + app.kubernetes.io/managed-by: Helm +data: + relay: | + exporters: + logging: {} + extensions: + health_check: {} + memory_ballast: + size_in_percentage: 40 + processors: + batch: {} + k8sattributes: + extract: + metadata: + - k8s.namespace.name + - k8s.deployment.name + - k8s.statefulset.name + - k8s.daemonset.name + - k8s.cronjob.name + - k8s.job.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.start_time + passthrough: false + pod_association: + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: connection + memory_limiter: + check_interval: 5s + limit_percentage: 80 + spike_limit_percentage: 25 + receivers: + jaeger: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:14250 + thrift_compact: + endpoint: ${env:MY_POD_IP}:6831 + thrift_http: + endpoint: ${env:MY_POD_IP}:14268 + otlp: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:4317 + http: + endpoint: ${env:MY_POD_IP}:4318 + prometheus: + config: + scrape_configs: + - job_name: opentelemetry-collector + scrape_interval: 10s + static_configs: + - targets: + - ${env:MY_POD_IP}:8888 + zipkin: + endpoint: ${env:MY_POD_IP}:9411 + service: + extensions: + - health_check + - memory_ballast + pipelines: + logs: + exporters: + - logging + processors: + - k8sattributes + - memory_limiter + - batch + receivers: + - otlp + metrics: + exporters: + - logging + processors: + - k8sattributes + - memory_limiter + - batch + receivers: + - otlp + - prometheus + traces: + exporters: + - logging + processors: + - resource + - k8sattributes + - batch + receivers: + - otlp + - jaeger + - zipkin + telemetry: + metrics: + address: ${env:MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml new file mode 100644 index 00000000000..473832bf54a --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml @@ -0,0 +1,90 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.63.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.81.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + strategy: + type: RollingUpdate + template: + metadata: + annotations: + checksum/config: 289f6a2f54c3bc1e93d057a259d804252b847669bbad7413feab7b1cf3029ca2 + + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + + spec: + + serviceAccountName: example-opentelemetry-collector + securityContext: + {} + containers: + - name: opentelemetry-collector + command: + - /otelcol-contrib + - --config=/conf/relay.yaml + securityContext: + {} + image: "otel/opentelemetry-collector-contrib:0.81.0" + imagePullPolicy: IfNotPresent + ports: + - name: jaeger-compact + containerPort: 6831 + protocol: UDP + - name: jaeger-grpc + containerPort: 14250 + protocol: TCP + - name: jaeger-thrift + containerPort: 14268 + protocol: TCP + - name: otlp + containerPort: 4317 + protocol: TCP + - name: otlp-http + containerPort: 4318 + protocol: TCP + - name: zipkin + containerPort: 9411 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: example-opentelemetry-collector + items: + - key: relay + path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml new file mode 100644 index 00000000000..060fefe2ecf --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml @@ -0,0 +1,47 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.63.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.81.0" + app.kubernetes.io/managed-by: Helm + component: standalone-collector +spec: + type: ClusterIP + ports: + + - name: jaeger-compact + port: 6831 + targetPort: 6831 + protocol: UDP + - name: jaeger-grpc + port: 14250 + targetPort: 14250 + protocol: TCP + - name: jaeger-thrift + port: 14268 + targetPort: 14268 + protocol: TCP + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + - name: otlp-http + port: 4318 + targetPort: 4318 + protocol: TCP + - name: zipkin + port: 9411 + targetPort: 9411 + protocol: TCP + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml new file mode 100644 index 00000000000..fa4e23aac3f --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml @@ -0,0 +1,12 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.63.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.81.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml new file mode 100644 index 00000000000..0a84d08c6c7 --- /dev/null +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml @@ -0,0 +1,15 @@ +mode: deployment + +presets: + kubernetesAttributes: + enabled: true + +config: + service: + pipelines: + traces: + processors: + - resource + - k8sattributes + - batch + \ No newline at end of file diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml index 285e130ad97..99d75bf28ac 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-statefulset labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index 9610cbbb281..12cdc8aa4ae 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 7dbbe87ce5f..fa4e23aac3f 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 9142f38af73..357968e78f3 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.62.4 + helm.sh/chart: opentelemetry-collector-0.63.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.81.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 04ffdd0c7c63293cf9d57cd7e1cb8dac941f3e34226c58ba1f03f8cc66dcc898 + checksum/config: 564c0616e3b6290ae2297d55cb8f50bfd0c2e01d48bb6b6e7c5e7eb7f6b307c6 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/templates/_config.tpl b/charts/opentelemetry-collector/templates/_config.tpl index 2dc70fa8c14..f60b36aa72b 100644 --- a/charts/opentelemetry-collector/templates/_config.tpl +++ b/charts/opentelemetry-collector/templates/_config.tpl @@ -273,13 +273,13 @@ receivers: {{- define "opentelemetry-collector.applyKubernetesAttributesConfig" -}} {{- $config := mustMergeOverwrite (include "opentelemetry-collector.kubernetesAttributesConfig" .Values | fromYaml) .config }} -{{- if $config.service.pipelines.logs }} +{{- if and ($config.service.pipelines.logs) (not (has "k8sattributes" $config.service.pipelines.logs.processors)) }} {{- $_ := set $config.service.pipelines.logs "processors" (prepend $config.service.pipelines.logs.processors "k8sattributes" | uniq) }} {{- end }} -{{- if $config.service.pipelines.metrics }} +{{- if and ($config.service.pipelines.metrics) (not (has "k8sattributes" $config.service.pipelines.metrics.processors)) }} {{- $_ := set $config.service.pipelines.metrics "processors" (prepend $config.service.pipelines.metrics.processors "k8sattributes" | uniq) }} {{- end }} -{{- if $config.service.pipelines.traces }} +{{- if and ($config.service.pipelines.traces) (not (has "k8sattributes" $config.service.pipelines.traces.processors)) }} {{- $_ := set $config.service.pipelines.traces "processors" (prepend $config.service.pipelines.traces.processors "k8sattributes" | uniq) }} {{- end }} {{- $config | toYaml }}