Merge branch '8.12' into update-version-next-8.12.1

.buildkite/pipeline.yml

@@ -243,15 +243,6 @@ steps:
       manual:
         allowed: true
 
-  - wait: ~
-    continue_on_failure: true
-  - label: "Processing test results"
-    agents:
-      provider: "gcp"
-    plugins:
-      - junit-annotate#v2.4.1:
-          artifacts: build/TEST-go-integration*.xml
-
   # Triggers a dynamic step: Sync K8s
   # Runs only on main and if k8s files are changed
   - label: "Trigger k8s sync"

.buildkite/scripts/steps/beats_tests.sh

@@ -13,7 +13,7 @@ STACK_PROVISIONER="${1:-"serverless"}"
 
 run_test_for_beat(){
     local beat_name=$1
-    
+
     #build
     export WORKSPACE="build/beats/x-pack/${beat_name}"
     SNAPSHOT=true PLATFORMS=linux/amd64 PACKAGES=tar.gz,zip mage package
@@ -36,7 +36,7 @@ mage -l
 mkdir -p build
 cd build
 
-git clone --filter=tree:0 git@github.com:elastic/beats.git
+git clone --depth=1 git@github.com:elastic/beats.git
 cd ..
 
 # export WORKSPACE=beats/x-pack/metricbeat

.go-version

@@ -1 +1 @@
-1.20.11
+1.20.12

.golangci.yml

@@ -116,7 +116,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.11"
+    go: "1.20.12"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -136,17 +136,17 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.11"
+    go: "1.20.12"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.11"
+    go: "1.20.12"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.11"
+    go: "1.20.12"
 
   gosec:
     excludes:

.mergify.yml

@@ -280,3 +280,16 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
+  - name: backport patches to 8.12 branch
+    conditions:
+      - merged
+      - label=backport-v8.12.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.12"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.11
+ARG GO_VERSION=1.20.12
 FROM circleci/golang:${GO_VERSION}
 
 

Dockerfile.skaffold

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.11
+ARG GO_VERSION=1.20.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"