diff --git a/changelog/fragments/1764348725-fix_templates_for_helm_4.yaml b/changelog/fragments/1764348725-fix_templates_for_helm_4.yaml new file mode 100644 index 00000000000..8ccfe0dee42 --- /dev/null +++ b/changelog/fragments/1764348725-fix_templates_for_helm_4.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: bug-fix + +# Change summary; a 80ish characters long description of the change. +summary: fix null template evaluation for Helm v4 + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +#description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +#pr: https://github.com/owner/repo/1234 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +#issue: https://github.com/owner/repo/1234 diff --git a/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml b/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml index e950a4b0818..b9aeb665ea2 100644 --- a/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml +++ b/deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml @@ -233,7 +233,7 @@ collectors: endpoint: ${env:MY_POD_IP}:4317 http: endpoint: ${env:MY_POD_IP}:4318 - processors: + processors: {} exporters: debug: otlp/ingest: diff --git a/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml b/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml index d67c44daeeb..c85decc41ed 100644 --- a/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml +++ b/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml @@ -544,7 +544,7 @@ collectors: endpoint: ${env:MY_POD_IP}:4317 http: endpoint: ${env:MY_POD_IP}:4318 - processors: + processors: {} exporters: debug: otlp/ingest_logs: diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml index 23fb61aad01..fa456ad2511 100644 --- a/deploy/helm/edot-collector/kube-stack/values.yaml +++ b/deploy/helm/edot-collector/kube-stack/values.yaml @@ -590,7 +590,7 @@ collectors: metrics/aggregated-otel-metrics: receivers: - elasticapm - processors: + processors: [] exporters: - debug - elasticsearch/otel @@ -599,6 +599,7 @@ collectors: instrumentation: name: elastic-instrumentation enabled: true # Enable/disable auto-instrumentation. + env: [] exporter: endpoint: http://opentelemetry-kube-stack-daemon-collector.opentelemetry-operator-system.svc.cluster.local:4318 # The daemonset OpenTelemetry Collector endpoint where telemetry data will be exported. propagators: