diff --git a/charts/opentelemetry-collector/UPGRADING.md b/charts/opentelemetry-collector/UPGRADING.md index 752d9f605..017689950 100644 --- a/charts/opentelemetry-collector/UPGRADING.md +++ b/charts/opentelemetry-collector/UPGRADING.md @@ -4,7 +4,7 @@ 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.2 to 0.70.0 +## 0.69.3 to 0.70.0 The following deprecated fields have been removed. Please use the new values: @@ -13,6 +13,14 @@ The following deprecated fields have been removed. Please use the new values: - `secretMounts` -> `extraVolumes` - `containerLogs` -> `presets.logsCollection` +## 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 4b252301a..0ea64b7f4 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 @@ -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 6600b8da6..4ae1c9f2b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -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 69acf684f..ccf93a663 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: bf695adb86bdc0d215a2107a9a30f9fe2a7257990bd5cf98b55b132b57c28b46 + checksum/config: ccab9d99705eed0434bb4ffcd924aa81b3622af921df46de739520808aff3246 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 545f56d01..671145023 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 52c65ee6c3636a68394ce23bf3c80bc0268ffb85ffb9d4e0918e9876e2cd385d + checksum/config: 24b5ef86a727e5f75d401c67bee702751bbfff70f16cf50abac1de7d0cbe2873 labels: app.kubernetes.io/name: opentelemetry-collector 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 2fbc54cf5..b303cd83d 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 @@ -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 427e3f080..6cea5d925 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 104feda5fdcdd1a61da5189b1dbe78b99a43adfd748d4ca406d0017b805b7a39 + checksum/config: 73a39e4f304375d3b9e068d5c81234b4516fb1de436ef2543cb1f1f44767f477 labels: app.kubernetes.io/name: opentelemetry-collector 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 7e04f1d2f..41b0b53a9 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -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 d9dee63e7..db8a4de51 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: dabeb5d9ff6e0f62e283834ac94e2fe82fbedb1555c9a0ff1eddcf5dfc74d2b3 + checksum/config: cde6c4571da1a1b8e9efa472a125615a0d02751b0b71e0ceabcf8423b881656e labels: app.kubernetes.io/name: opentelemetry-collector 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 e98c2a7da..d86ef1d86 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 @@ -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 996ee00ff..3d60f445c 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 4c137255c3fac68f778376d6ab0e756b28318f4c35b1444ec9a51b31b637e392 + checksum/config: 2309aae86d18f4d766dee4f7c66dc18a33d5cee1f2a20ff4d9b1a7f1d8e06b18 labels: app.kubernetes.io/name: opentelemetry-collector 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 e98c2a7da..d86ef1d86 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -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 a4f8afec3..35526387c 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 4c137255c3fac68f778376d6ab0e756b28318f4c35b1444ec9a51b31b637e392 + checksum/config: 2309aae86d18f4d766dee4f7c66dc18a33d5cee1f2a20ff4d9b1a7f1d8e06b18 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index 6600b8da6..4ae1c9f2b 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -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 55d76f83e..18fe96225 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 52c65ee6c3636a68394ce23bf3c80bc0268ffb85ffb9d4e0918e9876e2cd385d + checksum/config: 24b5ef86a727e5f75d401c67bee702751bbfff70f16cf50abac1de7d0cbe2873 labels: app.kubernetes.io/name: opentelemetry-collector 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 955a0bebc..8cb120321 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -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 5d7e42dcb..2ff14b66b 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 23a22dbcea65b9d03e24f56501f996272656beff45353786020737b481ffe66a + checksum/config: a870cb9fafbd2b89ea7d94d1ba82beabb19266ea8cc59e7d07d18f9fef1e68ae labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 654568bf1..625c4b1b2 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml @@ -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 93f2f15bc..7d0f022c0 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 1f611234b164b938ab0870a20de11711b60051ea2b8456d961818058e886e0fe + checksum/config: ab42dfd87bc2e0501b0c739c20dbd1bb5f7d308caedef4f8fd42da9eace31248 labels: app.kubernetes.io/name: opentelemetry-collector 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 4c3cefaba..3c46f9b98 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -15,6 +15,7 @@ data: relay: | exporters: debug: {} + logging: {} extensions: health_check: {} memory_ballast: diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 594f43805..763c2a365 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 40f2f5ca55b3c0970623153697e57791541803e7aeb8ec58f3a2a19f13e997f0 + checksum/config: a8993a6c320e9994f1e7ce6fc85cafc0ff0f07927397bbd01d9be97bda935378 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/templates/NOTES.txt b/charts/opentelemetry-collector/templates/NOTES.txt index a8e48de83..bdb572d75 100644 --- a/charts/opentelemetry-collector/templates/NOTES.txt +++ b/charts/opentelemetry-collector/templates/NOTES.txt @@ -30,3 +30,11 @@ {{- if and (eq .Values.mode "daemonset") (eq .Values.service.internalTrafficPolicy "Cluster") }} [WARNING] Setting internalTrafficPolicy to 'Cluster' on Daemonset is not recommended. Consider using 'Local' instead. {{ 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 }} 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.