From b3fd7abb9dd04024c3cf4f724d2ea3744cd9be19 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:01:25 -0600 Subject: [PATCH 1/2] re-add the logging exporter config --- charts/opentelemetry-collector/Chart.yaml | 2 +- charts/opentelemetry-collector/UPGRADING.md | 9 +++++++++ .../rendered/configmap-agent.yaml | 3 ++- .../daemonset-and-deployment/rendered/configmap.yaml | 3 ++- .../daemonset-and-deployment/rendered/daemonset.yaml | 4 ++-- .../daemonset-and-deployment/rendered/deployment.yaml | 4 ++-- .../daemonset-and-deployment/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 3 ++- .../daemonset-collector-logs/rendered/daemonset.yaml | 4 ++-- .../rendered/serviceaccount.yaml | 2 +- .../daemonset-hostmetrics/rendered/configmap-agent.yaml | 3 ++- .../daemonset-hostmetrics/rendered/daemonset.yaml | 4 ++-- .../daemonset-hostmetrics/rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 3 ++- .../daemonset-lifecycle-hooks/rendered/daemonset.yaml | 4 ++-- .../rendered/serviceaccount.yaml | 2 +- .../daemonset-only/rendered/configmap-agent.yaml | 3 ++- .../examples/daemonset-only/rendered/daemonset.yaml | 4 ++-- .../examples/daemonset-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-only/rendered/configmap.yaml | 3 ++- .../examples/deployment-only/rendered/deployment.yaml | 4 ++-- .../examples/deployment-only/rendered/service.yaml | 2 +- .../deployment-only/rendered/serviceaccount.yaml | 2 +- .../deployment-otlp-traces/rendered/configmap.yaml | 3 ++- .../deployment-otlp-traces/rendered/deployment.yaml | 4 ++-- .../deployment-otlp-traces/rendered/service.yaml | 2 +- .../deployment-otlp-traces/rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../kubernetesAttributes/rendered/clusterrole.yaml | 2 +- .../rendered/clusterrolebinding.yaml | 2 +- .../kubernetesAttributes/rendered/configmap.yaml | 3 ++- .../kubernetesAttributes/rendered/deployment.yaml | 4 ++-- .../examples/kubernetesAttributes/rendered/service.yaml | 2 +- .../kubernetesAttributes/rendered/serviceaccount.yaml | 2 +- .../statefulset-only/rendered/configmap-statefulset.yaml | 3 ++- .../examples/statefulset-only/rendered/service.yaml | 2 +- .../statefulset-only/rendered/serviceaccount.yaml | 2 +- .../examples/statefulset-only/rendered/statefulset.yaml | 4 ++-- charts/opentelemetry-collector/values.yaml | 3 +++ 42 files changed, 72 insertions(+), 50 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 21f10e4f0..c04984e50 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.69.2 +version: 0.69.3 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 82ba2429b..3f7150a49 100644 --- a/charts/opentelemetry-collector/UPGRADING.md +++ b/charts/opentelemetry-collector/UPGRADING.md @@ -4,6 +4,15 @@ 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.69.0 to 0.69.1 & 0.69.2 + +The `loggingexporter` was replaced with the `debugexporter`. This ended up being an accidental breaking change for any user that depended on the default logging exporter config when explicitly listing the logging exporter in an exporter list. + +When using versions `0.69.1` or `0.69.2` you should explicitly list the debugging exporter instead of the logging exporter. You other option is to skip these version and use `0.69.3` or newer, which includes the logging exporter configuration. + +**The logging exporter will be removed in a future version.** We highly recommend switching to the debug exporter. + ## 0.67 to 0.68 The `preset.kubernetesEvents` preset now excludes `DELETED` watch types so that an log is not ingested when Kubernetes deletes an event. 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 1b4a3a7c2..42e6e9b4f 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} otlp: endpoint: example-opentelemetry-collector:4317 tls: 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 2259e8bc5..d0edf509d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: 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 467440712..2e19fa80d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 0d2b1da000e4b7d6d208e07628529cf6921195d5ff0d91ccd7e7f68a631be140 + checksum/config: f6983c7e3f4f3016c402231c15c83405c4b9c59ba72d60d5a6399f8e7bffa032 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 705396027..0fd367971 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 75762e02c29992ce96531edf43d4052c12fa1878ed1b9883bdad571b7cdb8259 + checksum/config: 9d8ea4520f7f4446e0d6850e955817e84b34ca98b9d406b53bdc62481f388bf9 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 03e5807f4..7e2246723 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 bec87d8e0..f2cac7c3b 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: 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 cc8292222..0550b42c1 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 967363d4a0f6c0c5566a21247e9203b52e9c792829f90b9b8b72c8b1b8d320c9 + checksum/config: 355c28bf928e9d42abfb318ac1a0a2adfeb276d362ed1237f68bcadf1c1edb5e 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 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 e48befa51..6a97868a7 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index f622cbd1e..c018f81bb 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 47cbdd3c97c73e5eea3a08d2470fe6568adba045d4cdf8d9a43cbf55df8dc754 + checksum/config: 3e53b1fd8cabf311fd307ab94bf0291bebec3897cf2ae0edd7ff7a3d313090d8 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 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 f6704d80a..11c96acbb 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: 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 7a6d73e62..bf750a0b6 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 771bf9e9c879637c16c3fe8e9ed3deb0d60ab30555f209a89d22b1b2e76113fd + checksum/config: 6943bef5a0e1ef63bb2dcc9e2f5c0fc29a56eaf91e4a626ddbee3f37bf4c9164 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 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 f6704d80a..11c96acbb 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index 88932ee3d..1ef53141e 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 771bf9e9c879637c16c3fe8e9ed3deb0d60ab30555f209a89d22b1b2e76113fd + checksum/config: 6943bef5a0e1ef63bb2dcc9e2f5c0fc29a56eaf91e4a626ddbee3f37bf4c9164 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 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index 2259e8bc5..d0edf509d 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 9f803bd08..dc5746698 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 75762e02c29992ce96531edf43d4052c12fa1878ed1b9883bdad571b7cdb8259 + checksum/config: 9d8ea4520f7f4446e0d6850e955817e84b34ca98b9d406b53bdc62481f388bf9 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 03e5807f4..7e2246723 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 8e126e347..91e88c115 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: 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 41b7331bd..55ab43f3e 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 1a99b517a1724bae71c73c1a4c9b00d06289f67743b32af2a0cbe5d3588c8b8e + checksum/config: a885ed1bdcf4b9d002fdc6699b1492ba2c9fe1ce51585717c6f49b9b1f2b4562 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 d23c000bf..22c446f01 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 6d0e8bfb8..ed569df9c 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 03e5807f4..7e2246723 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.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 765c638b5..3c3230a11 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 618944f89..f3dc4b0e6 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index ca3e9f8c5..783736e71 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 26a75e027..2cee2383b 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index 2e3c4090f..5d1f1df18 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 4abaa11dfd65d0a53eb0b01eb794107d0e251b1307cb2dcb496b237dd31bc2bf + checksum/config: 7ed39536d7f6aa7a0a0fe0c9a21a30bf32a14ce0287e7b2b3841e372fbfedf45 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml index 03e5807f4..7e2246723 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" 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 8c90aa217..f7d0bc3ae 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-statefulset namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index 94bf403ab..4bcbb57a8 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 765c638b5..3c3230a11 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 049374185..97fd2a528 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.69.2 + helm.sh/chart: opentelemetry-collector-0.69.3 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.86.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 7986e17c0c638b701109ffb8f708dc52700dd8c1d1efc31145e7657922655279 + checksum/config: 4aefd4b0d36200b8a7356144db4cb442c0d95a7e4834722736b168c85a635d7b labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index 5aa04e417..0d493c766 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -87,6 +87,9 @@ configMap: config: exporters: debug: {} + # Will be removed in a future release. + # Use the debug exporter instead. + logging: {} extensions: # The health_check extension is mandatory for this chart. # Without the health_check extension the collector will fail the readiness and liveliness probes. From 92cf8770a06ed93a265de83ae577a3a0beb0c6c9 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:03:53 -0600 Subject: [PATCH 2/2] Add warning in NOTES.txt --- charts/opentelemetry-collector/templates/NOTES.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/charts/opentelemetry-collector/templates/NOTES.txt b/charts/opentelemetry-collector/templates/NOTES.txt index edc448e72..4853de813 100644 --- a/charts/opentelemetry-collector/templates/NOTES.txt +++ b/charts/opentelemetry-collector/templates/NOTES.txt @@ -48,3 +48,11 @@ {{- if and (eq .Values.dnsPolicy "None") (not .Values.dnsConfig) }} {{- fail "[ERROR] dnsConfig should be provided when dnsPolicy is None" }} {{ end }} + +{{- if .Values.configMap.create }} +{{- range $key, $value := (((.Values.config).service).pipelines) }} +{{- if has "logging" ($value.exporters) }} +[WARNING] The logging exporter is deprecated. Use the debug exporter instead. +{{- end }} +{{- end }} +{{- end }}