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

elastic · Feb 13, 2025 · 20b2184 · 20b2184
2 parents 280a505 + e6bcfba
commit 20b2184
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 45 deletions.
diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml
@@ -28,7 +28,7 @@ steps:
     steps:
       - label: "Win2022:sudo:{{matrix}}"
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/integration-tests.ps1 {{matrix}} true
         artifact_paths:
           - build/**
@@ -45,7 +45,7 @@ steps:
 
       - label: "Win2022:non-sudo:{{matrix}}"
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/integration-tests.ps1 {{matrix}} false
         artifact_paths:
           - build/**
@@ -63,8 +63,9 @@ steps:
       - integration-ess
     steps:
       - label: "x86_64:non-sudo: {{matrix}}"
+        # only packaging-ubuntu-x86-64 artifact dependency is required
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
         artifact_paths:
           - build/**
@@ -77,8 +78,9 @@ steps:
           - default
 
       - label: "x86_64:sudo: {{matrix}}"
+        # due to deb group present in matrix tar.gz and deb packages artifacts are required
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
         artifact_paths:
           - build/**
@@ -102,7 +104,7 @@ steps:
       - label: "arm:sudo: {{matrix}}"
         skip: true
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
         artifact_paths:
           - build/**
@@ -126,7 +128,7 @@ steps:
       - label: "arm:non-sudo: {{matrix}}"
         skip: true
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
         artifact_paths:
           - build/**
@@ -145,7 +147,7 @@ steps:
     steps:
       - label: "x86_64:sudo:rpm"
         command: |
-          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          buildkite-agent artifact download build/distributions/** . --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
           .buildkite/scripts/steps/integration_tests_tf.sh rpm true
         artifact_paths:
           - build/**

diff --git a/.buildkite/integration.pipeline.yml b/.buildkite/integration.pipeline.yml
@@ -5,80 +5,131 @@ env:
   VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
 
 steps:
-  - label: "Integration tests: packaging"
-    key: "package-it"
-    command: ".buildkite/scripts/steps/integration-package.sh"
-    artifact_paths:
-      - build/distributions/**
-    agents:
-      provider: "gcp"
-      machineType: "n1-standard-8"
+  - group: "Integration tests: packaging"
+    key: "int-packaging"
+    steps:
+      - label: "Packaging: Ubuntu x86_64"
+        key: "packaging-ubuntu-x86-64"
+        env:
+          PACKAGES: "tar.gz"
+          PLATFORMS: "linux/amd64"
+        command: ".buildkite/scripts/steps/integration-package.sh"
+        artifact_paths:
+        - build/distributions/**
+        agents:
+          provider: "gcp"
+          machineType: "n2-standard-8"
+
+      - label: "Packaging: Ubuntu arm64"
+        key: "packaging-ubuntu-arm64"
+        env:
+          PACKAGES: "tar.gz"
+          PLATFORMS: "linux/arm64"
+        command: ".buildkite/scripts/steps/integration-package.sh"
+        artifact_paths:
+          - build/distributions/**
+        agents:
+          provider: "gcp"
+          machineType: "n2-standard-8"
+
+      - label: "Packaging: Windows"
+        key: "packaging-windows"
+        env:
+          PACKAGES: "zip"
+          PLATFORMS: "windows/amd64"
+        command: ".buildkite/scripts/steps/integration-package.sh"
+        artifact_paths:
+          - build/distributions/**
+        agents:
+          provider: "gcp"
+          machineType: "n2-standard-8"
+
+      - label: "Packaging: Containers {{matrix.ext}} {{matrix.arch}}"
+        key: "packaging-containers"
+        env:
+          PACKAGES: "{{matrix.ext}}"
+          PLATFORMS: "{{matrix.arch}}"
+        command: ".buildkite/scripts/steps/integration-package.sh"
+        artifact_paths:
+          - build/distributions/**
+        agents:
+          provider: "gcp"
+          machineType: "n2-standard-8"
+        matrix:
+          setup:
+            arch:
+              - linux/amd64
+              - linux/arm64
+            ext:
+              - rpm
+              - deb
 
   - label: "Serverless integration test"
     key: "serverless-integration-tests"
     depends_on:
-      - package-it
+      - int-packaging
     concurrency_group: elastic-agent-extended-testing/serverless-integration
     concurrency: 8
     env:
       # we run each step in a different data center to spread the load
       TEST_INTEG_AUTH_GCP_DATACENTER: "us-central1-a"
     command: |
-      buildkite-agent artifact download build/distributions/** . --step 'package-it'
+      buildkite-agent artifact download "build/distributions/**" . $BUILDKITE_BUILD_ID
       .buildkite/scripts/steps/integration_tests.sh serverless integration:single TestLogIngestionFleetManaged #right now, run a single test in serverless mode as a sort of smoke test, instead of re-running the entire suite
     artifact_paths:
       - "build/TEST-**"
       - "build/diagnostics/*"
     agents:
       provider: "gcp"
-      machineType: "n1-standard-8"
+      machineType: "n2-standard-8"
     notify:
       - github_commit_status:
           context: "buildkite/elastic-agent-extended-testing - Serverless integration test"
 
   - label: "Extended runtime leak tests"
     key: "extended-integration-tests"
     depends_on:
-      - package-it
+      - int-packaging
     concurrency_group: elastic-agent-extended-testing/leak-tests
     concurrency: 8
     env:
       TEST_INTEG_AUTH_GCP_DATACENTER: "us-central1-b"
     command: |
-      buildkite-agent artifact download build/distributions/** . --step 'package-it'
+      buildkite-agent artifact download "build/distributions/**" . $BUILDKITE_BUILD_ID
       .buildkite/scripts/steps/integration_tests.sh stateful integration:TestForResourceLeaks
     artifact_paths:
       - "build/TEST-**"
       - "build/diagnostics/*"
     agents:
       provider: "gcp"
-      machineType: "n1-standard-8"
+      machineType: "n2-standard-8"
     notify:
       - github_commit_status:
           context: "buildkite/elastic-agent-extended-testing - Extended runtime leak tests"
 
   - label: "Triggering Integration tests"
     depends_on:
-      - package-it
+      - int-packaging
     trigger: "elastic-agent-extended-testing-bk"
     build:
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
 
   - label: "Serverless Beats Tests"
+    # To speedup the build process only packaging-ubuntu-x86-64 artifact dependency is required
     depends_on:
-      - package-it
+      - packaging-ubuntu-x86-64
     key: "serverless-beats-integration-tests"
     concurrency_group: elastic-agent-extended-testing/beats-integration
     concurrency: 8
     env:
       TEST_INTEG_AUTH_GCP_DATACENTER: "us-central1-a"
     command: |
-      buildkite-agent artifact download build/distributions/** . --step 'package-it'
+      buildkite-agent artifact download "build/distributions/**" . $BUILDKITE_BUILD_ID
       .buildkite/scripts/steps/beats_tests.sh
     agents:
       provider: "gcp"
-      machineType: "n1-standard-8"
+      machineType: "n2-standard-8"
     notify:
       - github_commit_status:
           context: "buildkite/elastic-agent-extended-testing - Serverless Beats Tests"

diff --git a/.buildkite/scripts/steps/integration-package.sh b/.buildkite/scripts/steps/integration-package.sh
@@ -3,4 +3,7 @@ set -euo pipefail
 
 source .buildkite/scripts/common.sh
 
-PACKAGES=tar.gz,zip,rpm,deb PLATFORMS=linux/amd64,linux/arm64,windows/amd64  SNAPSHOT=true EXTERNAL=true  mage package
+export SNAPSHOT="true"
+export EXTERNAL="true"
+
+mage package
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.9
+1.22.12
diff --git a/.golangci.yml b/.golangci.yml
@@ -120,7 +120,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.11"
+    go: "1.22.12"
 
   nolintlint:
     # Enable to ensure that nolint directives are all used. Default is true.
@@ -136,17 +136,17 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.11"
+    go: "1.22.12"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.11"
+    go: "1.22.12"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.11"
+    go: "1.22.12"
 
   gosec:
     excludes:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22.11
+ARG GO_VERSION=1.22.12
 FROM circleci/golang:${GO_VERSION}
 
 

diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22.11
+ARG GO_VERSION=1.22.12
 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
 ARG AGENT_VERSION=8.9.0-SNAPSHOT
 ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"

diff --git a/changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml b/changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..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: security
+
+# Change summary; a 80ish characters long description of the change.
+summary: Upgrade to Go 1.22.12.
+
+# 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/elastic/elastic-agent/pull/6700
+
+# 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/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
@@ -90,13 +90,15 @@ stringData:
           metricsets:
           - cpu
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.diskio
             type: metrics
           diskio.include_devices: null
           metricsets:
           - diskio
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.filesystem
             type: metrics
@@ -106,6 +108,7 @@ stringData:
           processors:
           - drop_event.when.regexp:
               system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.fsstat
             type: metrics
@@ -115,6 +118,7 @@ stringData:
           processors:
           - drop_event.when.regexp:
               system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
+          system.hostfs: /hostfs
         - condition: ${host.platform} != 'windows'
           data_stream:
             dataset: system.load
@@ -128,6 +132,7 @@ stringData:
           metricsets:
           - memory
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.network
             type: metrics
@@ -148,18 +153,21 @@ stringData:
           process.include_top_n.by_memory: 5
           processes:
           - .*
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.process_summary
             type: metrics
           metricsets:
           - process_summary
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.socket_summary
             type: metrics
           metricsets:
           - socket_summary
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.uptime
             type: metrics
@@ -295,7 +303,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 535875b1a8f244fc529158f3467dec1983ca2ef19d365518da249fd46e22d0ef
+        checksum/config: dc3e48e999091f8db08e8ce2c2de127239731b26d598b6399ad93ef3636a3245
     spec:
       automountServiceAccountToken: true
       containers: