Merge branch 'main' into add-metricbeat-status-reporter

elastic · Jul 1, 2024 · d0fc62c · d0fc62c
2 parents c7b9766 + cb09004
commit d0fc62c
Show file tree

Hide file tree

Showing 105 changed files with 13,784 additions and 9,413 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -27,11 +27,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Auditbeat Check/Update"
+  - group: "Check/Update"
     key: "auditbeat-check-update"
 
     steps:
-      - label: "Run check/update"
+      - label: "Auditbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C auditbeat check update
@@ -47,19 +47,19 @@ steps:
         notify:
           - github_commit_status:
               context: "auditbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
     # this allows building DRA artifacts even if there is flakiness in check/update step
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "auditbeat-check-update"
 
-  - group: "Auditbeat Mandatory Testing"
+  - group: "Mandatory Testing"
     key: "auditbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Auditbeat Unit Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu x86_64 Unit Tests"
         command: |
           set -euo pipefail
           cd auditbeat
@@ -76,9 +76,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Ubuntu Unit Tests"
+              context: "auditbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":rhel: Auditbeat Unit Tests"
+      - label: ":rhel: Auditbeat: RHEL9 Unit Tests"
         command: |
           set -euo pipefail
           cd auditbeat
@@ -95,9 +95,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: RHEL Unit Tests"
+              context: "auditbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-2016 Unit Tests"
+      - label: ":windows: Auditbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
@@ -115,9 +115,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Windows 2016 Unit Tests"
+              context: "auditbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-2022 Unit Tests"
+      - label: ":windows: Auditbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
@@ -135,9 +135,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Windows 2022 Unit Tests"
+              context: "auditbeat: Win 2022 Unit Tests"
 
-      - label: ":linux: Auditbeat Crosscompile"
+      - label: ":ubuntu: Auditbeat: Crosscompile"
         command: |
           make -C auditbeat crosscompile
         env:
@@ -153,12 +153,12 @@ steps:
           - github_commit_status:
               context: "auditbeat: Crosscompile"
 
-  - group: "Auditbeat Extended Tests"
+  - group: "Extended Tests"
     key: "auditbeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" ||  build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm|integrations).*/
 
     steps:
-      - label: ":linux: Auditbeat Ubuntu Integration Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu x86_64 Integration Tests"
         key: "auditbeat-extended-integ-tests"
         if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
         command: |
@@ -177,9 +177,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Linux Integration Tests"
+              context: "auditbeat: Ubuntu x86_64 Integration Tests"
 
-      - label: ":linux: Auditbeat Ubuntu arm64 Integration Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu arm64 Integration Tests"
         key: "auditbeat-extended-arm64-integ-tests"
         if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
         command: |
@@ -198,9 +198,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Linux arm64 Integration Tests"
+              context: "auditbeat: Ubuntu arm64 Integration Tests"
 
-      - label: ":linux: Auditbeat Ubuntu arm64 Unit Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu arm64 Unit Tests"
         key: "auditbeat-extended-arm64-unit-tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
@@ -219,9 +219,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Linux arm64 Unit Tests"
+              context: "auditbeat: Ubuntu arm64 Unit Tests"
 
-      - label: ":mac: Auditbeat macOS x86_64 Unit Tests"
+      - label: ":mac: Auditbeat: macOS x86_64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -241,7 +241,7 @@ steps:
           - github_commit_status:
               context: "auditbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: Auditbeat macOS arm64 ARM Unit Tests"
+      - label: ":mac: Auditbeat: macOS arm64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -261,12 +261,12 @@ steps:
           - github_commit_status:
               context: "auditbeat: macOS arm64 Unit Tests"
 
-  - group: "Auditbeat Windows Extended Testing"
+  - group: "Extended Windows Tests"
     key: "auditbeat-extended-tests-win"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: Auditbeat Win-2019 Unit Tests"
+      - label: ":windows: Auditbeat: Win 2019 Unit Tests"
         key: "auditbeat-extended-win-2019-unit-tests"
         command: |
           Set-Location -Path auditbeat
@@ -285,9 +285,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Extended Windows 2019 Unit Tests"
+              context: "auditbeat: Win 2019 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-10 Unit Tests"
+      - label: ":windows: Auditbeat: Win 10 Unit Tests"
         key: "auditbeat-extended-win-10-unit-tests"
         command: |
           Set-Location -Path auditbeat
@@ -306,9 +306,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Extended Windows 10 Unit Tests"
+              context: "auditbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-11 Unit Tests"
+      - label: ":windows: Auditbeat: Win 11 Unit Tests"
         key: "auditbeat-extended-win-11-unit-tests"
         command: |
           Set-Location -Path auditbeat
@@ -327,7 +327,7 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Extended Windows 11 Unit Tests"
+              context: "auditbeat: Win 11 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -336,10 +336,10 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "auditbeat-mandatory-tests"
 
-  - group: "Auditbeat Packaging"
+  - group: "Packaging"
     key: "auditbeat-packaging"
     steps:
-      - label: ":ubuntu: Auditbeat/Packaging Linux"
+      - label: ":ubuntu: Auditbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
@@ -360,7 +360,7 @@ steps:
           - github_commit_status:
               context: "auditbeat: Packaging Linux"
 
-      - label: ":linux: Auditbeat/Packaging Linux arm64"
+      - label: ":ubuntu: Auditbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm64"
         env:
           PLATFORMS: "linux/arm64"

diff --git a/.buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh b/.buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh
@@ -2,15 +2,18 @@
 
 set -euo pipefail
 
-source .buildkite/env-scripts/util.sh
-
 export KUBECONFIG="${WORKSPACE}/kubecfg"
 export BIN="${WORKSPACE}/bin"
-add_bin_path
 
-echo "--- Installing kind & kubectl"
+echo "--- Add ${BIN} to PATH"
+if [[ ! -d "${BIN}" ]]; then
+  mkdir -p "${BIN}"
+fi
+export PATH="${PATH}:${BIN}"
+
+echo "~~~ Installing kind & kubectl"
 asdf plugin add kind
-asdf install kind $ASDF_KIND_VERSION
+asdf install kind "$ASDF_KIND_VERSION"
 
 echo "~~~ Setting up kind"
 max_retries=3

diff --git a/.buildkite/env-scripts/env.sh b/.buildkite/env-scripts/env.sh