Merge branch '9.1' into mergify/bp/9.1/pr-10728

Author: theletterf

.ci/scripts/update-otel.sh

@@ -52,6 +52,6 @@ else
 fi
 elastic-agent-changelog-tool new "$changelog_fragment_name"
 sed -i.bak "s/^kind:.*$/kind: enhancement/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
-sed -i.bak "s/^summary:.*$/summary: Update OTel components to ${next_contrib}/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
+sed -i.bak "s/^summary:.*$/summary: Update OTel Collector components to ${next_contrib}/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
 sed -i.bak "s/^component:.*$/component: elastic-agent/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
 rm ./changelog/fragments/*-"${changelog_fragment_name}".yaml.bak

.golangci.yml

@@ -59,6 +59,7 @@ linters:
         - github.com/google/gopacket
         - github.com/insomniacslk/dhcp
         - github.com/meraki/dashboard-api-go/v3
+        - go.opentelemetry.io/otel/exporters/prometheus
       replace-local: false
     gomodguard:
       blocked:

.package-version

@@ -1,8 +1,8 @@
 {
   "version": "9.1.7-SNAPSHOT",
-  "build_id": "9.1.7-d350bfcc",
-  "manifest_url": "https://snapshots.elastic.co/9.1.7-d350bfcc/manifest-9.1.7-SNAPSHOT.json",
-  "summary_url": "https://snapshots.elastic.co/9.1.7-d350bfcc/summary-9.1.7-SNAPSHOT.html",
+  "build_id": "9.1.7-51a997be",
+  "manifest_url": "https://snapshots.elastic.co/9.1.7-51a997be/manifest-9.1.7-SNAPSHOT.json",
+  "summary_url": "https://snapshots.elastic.co/9.1.7-51a997be/summary-9.1.7-SNAPSHOT.html",
   "core_version": "9.1.7",
-  "stack_build_id": "9.1.7-d350bfcc-SNAPSHOT"
+  "stack_build_id": "9.1.7-51a997be-SNAPSHOT"
 }

NOTICE-fips.txt

@@ -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: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Update OTel Collector components to v0.135.0
+
+# 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: elastic-agent
+
+# 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

NOTICE.txt

@@ -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 quoting of boolean values in Helm charts.
+
+# 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: elastic-agent
+
+# 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

changelog/fragments/1757406841-update-otel-components-to-v0.135.0.yaml

@@ -258,10 +258,10 @@ Mutate an agent preset based on agent.fleet
 {{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_ENROLLMENT_TOKEN" "value" $.Values.agent.fleet.token) -}}
 {{- end -}}
 {{- if $.Values.agent.fleet.insecure -}}
-{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_INSECURE" "value" (quote $.Values.agent.fleet.insecure)) -}}
+{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_INSECURE" "value" (printf "%t" $.Values.agent.fleet.insecure)) -}}
 {{- end -}}
 {{- if $.Values.agent.fleet.force -}}
-{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_FORCE" "value" (quote $.Values.agent.fleet.force)) -}}
+{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_FORCE" "value" (printf "%t"  $.Values.agent.fleet.force)) -}}
 {{- end -}}
 {{- if $.Values.agent.fleet.tokenName -}}
 {{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_TOKEN_NAME" "value" $.Values.agent.fleet.tokenName) -}}