Merge branch '8.17' into mergify/bp/8.17/pr-8605

Author: pkoutsovasilis

.buildkite/bk.integration.pipeline.yml

@@ -6,12 +6,15 @@ env:
 
   # The following images are defined here and their values will be updated by updatecli
   # Please do not change them manually.
-  IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1749258065"
-  IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1749258065"
-  IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1749258065"
-  IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1749258065"
-  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749258065"
-  IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1749258065"
+  IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1751072471"
+  IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1751072471"
+  IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1751072471"
+  IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1751072471"
+  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
+  IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1751072471"
+  # Remove AGENT_VERSION pinning once 8.17.9 DRA and stack are released
+  AGENT_VERSION: "8.17.8-SNAPSHOT"
+
 
 # This section is used to define the plugins that will be used in the pipeline.
 # See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -130,6 +133,8 @@ steps:
       - label: "Win2022:sudo:{{matrix}}"
         depends_on:
           - packaging-windows
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
           .buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -155,6 +160,8 @@ steps:
       - label: "Win2022:non-sudo:{{matrix}}"
         depends_on:
           - packaging-windows
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
           .buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -174,6 +181,8 @@ steps:
       - label: "Win2025:sudo:{{matrix}}"
         depends_on:
           - packaging-windows
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
           .buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -200,6 +209,8 @@ steps:
       - label: "Win2025:non-sudo:{{matrix}}"
         depends_on:
           - packaging-windows
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
           .buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -226,6 +237,8 @@ steps:
     steps:
       - label: "x86_64:non-sudo: {{matrix}}"
         depends_on: packaging-ubuntu-x86-64
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -246,6 +259,8 @@ steps:
         depends_on:
           - packaging-ubuntu-x86-64
         # due to deb group present in matrix tar.gz and deb packages artifacts are required
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -277,6 +292,8 @@ steps:
       - label: "arm:sudo: {{matrix}}"
         depends_on:
           - packaging-ubuntu-arm64
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -310,6 +327,8 @@ steps:
         skip: true
         depends_on:
           - packaging-ubuntu-arm64
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -336,6 +355,8 @@ steps:
     steps:
       - label: "x86_64:non-sudo: {{matrix}}"
         depends_on: packaging-ubuntu-x86-64
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -356,6 +377,8 @@ steps:
         depends_on:
           - packaging-ubuntu-x86-64
         # due to deb group present in matrix tar.gz and deb packages artifacts are required
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -397,6 +420,8 @@ steps:
       - label: "x86_64:sudo:rpm"
         depends_on:
           - packaging-ubuntu-x86-64
+        env:
+          TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
           .buildkite/scripts/steps/integration_tests_tf.sh rpm true

.buildkite/integration.pipeline.yml

@@ -2,6 +2,9 @@
 
 env:
   VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
+  # Remove AGENT_PACKAGE_VERSION and AGENT_VERSION pinning once 8.17.8 DRA and stack are released
+  AGENT_PACKAGE_VERSION: "8.17.8"
+  BEAT_VERSION: "8.17.8"
 
 steps:
   - group: "Integration tests: packaging"

.buildkite/pipeline.yml

@@ -5,12 +5,12 @@ env:
 
   # The following images are defined here and their values will be updated by updatecli
   # Please do not change them manually.
-  IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1749258065"
-  IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1749258065"
-  IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1749258065"
-  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749258065"
-  IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1749258065"
-  IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1749258065"
+  IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1751072471"
+  IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1751072471"
+  IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1751072471"
+  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
+  IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1751072471"
+  IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1751072471"
 
 steps:
   - label: "check-ci"

.buildkite/scripts/buildkite-integration-tests.ps1

@@ -25,9 +25,11 @@ go install gotest.tools/gotestsum
 gotestsum --version
 
 $env:TEST_BINARY_NAME = "elastic-agent"
-# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
-$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
-$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
+if (-not $env:AGENT_VERSION) {
+    # Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
+    $AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
+    $env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
+}
 
 Write-Output "~~~ Agent version: $env:AGENT_VERSION"
 $env:SNAPSHOT = $true

.buildkite/scripts/buildkite-integration-tests.sh

@@ -32,9 +32,12 @@ echo "~~~ Running integration tests as $USER"
 
 make install-gotestsum
 
-# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
-AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
-AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
+if [[ -z "${AGENT_VERSION:-}" ]]; then
+  # Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
+  AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
+  AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
+fi
+
 export AGENT_VERSION
 echo "~~~ Agent version: ${AGENT_VERSION}"
 

.buildkite/scripts/common.sh

@@ -9,8 +9,11 @@ fi
 if [[ -z "${SETUP_GVM_VERSION-""}" ]]; then
     SETUP_GVM_VERSION="v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
 fi
-BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
-export BEAT_VERSION
+
+if [[ -z "${BEAT_VERSION-""}" ]]; then
+  BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
+  export BEAT_VERSION
+fi
 
 getOSOptions() {
   case $(uname | tr '[:upper:]' '[:lower:]') in

.buildkite/scripts/steps/integration_tests_tf.sh

@@ -36,7 +36,6 @@ if [[ "${BUILDKITE_RETRY_COUNT}" -gt 0 ]]; then
   echo "~~~ The steps is retried, starting the ESS stack again"
   trap 'ess_down' EXIT
   ess_up $OVERRIDE_STACK_VERSION || (echo -e "^^^ +++\nFailed to start ESS stack")
-  preinstall_fleet_packages
 else
   # For the first run, we start the stack in the start_ess.sh step and it sets the meta-data
   echo "~~~ Receiving ESS stack metadata"

changelog/fragments/1751037802-Stop-logging-that-unprivileged-installations-are-in-beta.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: Remove incorrect logging that unprivileged installations are in beta.
+
+# 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: "Unprivileged installations went GA in 8.15.0: https://www.elastic.co/docs/reference/fleet/elastic-agent-unprivileged"
+
+# 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/elastic/elastic-agent/pull/8715
+
+# 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/elastic/elastic-agent/issues/8689

deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/kustomization.yaml

@@ -15,7 +15,7 @@ configMapGenerator:
 
 resources:
   - ./base
-  - https://github.com/kubernetes/kube-state-metrics
+  - https://github.com/kubernetes/kube-state-metrics/?ref=v2.15.0
 
 patches:
 - path: environmental-variables-remove.yaml

deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/kustomization.yaml

@@ -16,7 +16,7 @@ configMapGenerator:
 
 resources:
   - ./base
-  - https://github.com/kubernetes/kube-state-metrics/
+  - https://github.com/kubernetes/kube-state-metrics/?ref=v2.15.0
 
 patches:
 - path: environmental-variables-remove.yaml