Merge branch 'main' into bump/go1.23

elastic · Sep 11, 2024 · 1049529 · 1049529
2 parents d9ba875 + eb0f130
commit 1049529
Show file tree

Hide file tree

Showing 38 changed files with 3,022 additions and 1,281 deletions.
diff --git a/.agent-versions.json b/.agent-versions.json
@@ -1,8 +1,9 @@
 {
   "testVersions": [
-    "8.15.1-SNAPSHOT",
-    "8.15.0",
+    "8.15.2-SNAPSHOT",
+    "8.15.1",
     "8.14.3",
+    "7.17.24",
     "7.17.24-SNAPSHOT"
   ]
 }
diff --git a/.github/workflows/updatecli-compose.yml b/.github/workflows/updatecli-compose.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+      - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.mergify.yml b/.mergify.yml
@@ -122,10 +122,10 @@ pull_request_rules:
           This pull request does not have a backport label. Could you fix it @{{author}}? 🙏
           To fixup this pull request, you need to add the backport labels for the needed
           branches, such as:
-          * `backport-v./d./d.0` is the label to automatically backport to the `8./d` branch. `/d` is the digit
-  - name: add backport-v8.x label for main only
+          * `backport-./d./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit
+  - name: add backport-8.x label for main only
     conditions:
-      - -label~=^backport-v8.x
+      - -label~=^backport-8.x
       - base=main
       - -merged
       - -closed
@@ -135,11 +135,11 @@ pull_request_rules:
           `backport-v8.x` has been added to help with the transition to the new branch `8.x`.
       label:
         add:
-          - backport-v8.x
+          - backport-8.x
   - name: backport patches to 7.17 branch
     conditions:
       - merged
-      - label=backport-v7.17.0
+      - label~=^(backport-v7.17.0|backport-7.17)$
     actions:
       backport:
         assignees:
@@ -321,7 +321,7 @@ pull_request_rules:
   - name: backport patches to 8.15 branch
     conditions:
       - merged
-      - label=backport-v8.15.0
+      - label~=^(backport-v8.15.0|backport-8.15)$
     actions:
       backport:
         assignees:
@@ -334,7 +334,7 @@ pull_request_rules:
   - name: backport patches to 8.x branch
     conditions:
       - merged
-      - label=backport-v8.x
+      - label~=^(backport-v8.x|backport-8.x)$
     actions:
       backport:
         assignees:

diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -24,7 +24,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -39,7 +39,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -54,7 +54,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -106,7 +106,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -395,7 +395,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -571,7 +571,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -696,7 +696,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -930,7 +930,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -1013,7 +1013,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -1035,7 +1035,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -1057,7 +1057,7 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
@@ -1080,12 +1080,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 8.16.0
+  version: 9.0.0
   configRef:
     secretName: agent-pernode-example
   elasticsearchRefs:
@@ -1122,7 +1122,7 @@ spec:
         containers:
           - name: agent
             imagePullPolicy: IfNotPresent
-            image: "docker.elastic.co/beats/elastic-agent:8.16.0-SNAPSHOT"
+            image: "docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT"
             securityContext:
               capabilities:
                 add:
@@ -1184,12 +1184,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 8.16.0
+  version: 9.0.0
   configRef:
     secretName: agent-clusterwide-example
   elasticsearchRefs:
@@ -1210,7 +1210,7 @@ spec:
         containers:
           - name: agent
             imagePullPolicy: IfNotPresent
-            image: "docker.elastic.co/beats/elastic-agent:8.16.0-SNAPSHOT"
+            image: "docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT"
             securityContext:
               capabilities:
                 add:
@@ -1254,12 +1254,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.16.0
+    app.kubernetes.io/version: 9.0.0
     app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 8.16.0
+  version: 9.0.0
   configRef:
     secretName: agent-ksmsharded-example
   elasticsearchRefs:
@@ -1321,7 +1321,7 @@ spec:
                 type: RuntimeDefault
           - name: agent
             imagePullPolicy: IfNotPresent
-            image: "docker.elastic.co/beats/elastic-agent:8.16.0-SNAPSHOT"
+            image: "docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT"
             securityContext:
               capabilities:
                 add: