Merge branch 'main' into fix-healthcheck

elastic · Jun 11, 2024 · 8ae9cc3 · 8ae9cc3
2 parents ac9efb3 + 2f8c1c2
commit 8ae9cc3
Show file tree

Hide file tree

Showing 44 changed files with 1,714 additions and 1,504 deletions.
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -84,6 +84,14 @@ if command -v docker &>/dev/null; then
     unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET
 fi
 
+echo "--- Setting up the :github: environment..."
+# release.mk uses gh cli to know the current release tag. release.mk is used by the root Makefile
+# regardless is explicitly used, so it's loaded with the include directive.
+# this will avoid printing warnings about the missing gh cli configurations
+# VAULT_GITHUB_TOKEN is a primitive env variable created by the Buildkite automation.
+GH_TOKEN="${VAULT_GITHUB_TOKEN}"
+export GH_TOKEN
+
 echo "--- Setting up the :golang: environment..."
 GO_VERSION=$(cat .go-version)
 WORKSPACE=$(git rev-parse --show-toplevel)

diff --git a/.buildkite/package.yml b/.buildkite/package.yml
@@ -7,7 +7,7 @@ notify:
 env:
   IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2004"
   IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
-  GENERATE_CHAINGUARD_IMAGES: true
+  GENERATE_WOLFI_IMAGES: true
 
 steps:
   - group: "Package"

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -40,6 +40,11 @@ updates:
       dependencies:
         patterns:
           - "*"
+  # docker
+  - package-ecosystem: "docker"
+    directory: "/packaging/docker/"
+    schedule:
+      interval: "weekly"
 
   # GitHub actions
   - package-ecosystem: "github-actions"

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -166,7 +166,7 @@ jobs:
 
       # Notify failure to Slack only on schedule (nightly run)
       - if: failure() && github.event_name == 'schedule'
-        uses: elastic/oblt-actions/slack/notify-result@v1.8.1
+        uses: elastic/oblt-actions/slack/notify-result@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: "#apm-server"

diff --git a/.github/workflows/bump-elastic-stack.yml b/.github/workflows/bump-elastic-stack.yml
@@ -30,15 +30,15 @@ jobs:
         with:
           ref: ${{ matrix.branch }}
 
-      - uses: elastic/oblt-actions/updatecli/run@v1.8.1
+      - uses: elastic/oblt-actions/updatecli/run@v1.9.1
         with:
           command: --experimental apply --config .ci/bump-elastic-stack-snapshot.yml
         env:
           BRANCH: ${{ matrix.branch }}
           GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
 
       - if: ${{ failure()  }}
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           channel-id: '#apm-server'
           message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"

diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml
@@ -16,14 +16,14 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: elastic/oblt-actions/updatecli/run@v1.8.1
+      - uses: elastic/oblt-actions/updatecli/run@v1.9.1
         with:
           command: --experimental apply --config .ci/bump-golang.yml
         env:
           GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
 
       - if: ${{ failure() }}
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: "#apm-server"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,6 +68,7 @@ jobs:
           GOTESTFLAGS: "-v -json"
           OUTPUT_JSON_FILE: "build/TEST-go-system_tests.out.json"
           OUTPUT_JUNIT_FILE: "build/TEST-go-system_tests.xml"
+          GH_TOKEN: ${{ github.token }}
         run: |
           go run -modfile=tools/go.mod gotest.tools/gotestsum \
           --no-color -f standard-quiet --jsonfile "$OUTPUT_JSON_FILE" --junitfile "$OUTPUT_JUNIT_FILE" \
@@ -95,7 +96,7 @@ jobs:
     # If no PR event or if a PR event that's caused by a non-fork and non dependabot actor
     if: github.event_name != 'pull_request' || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' )
     env:
-      GENERATE_CHAINGUARD_IMAGES: true
+      GENERATE_WOLFI_IMAGES: true
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

diff --git a/.github/workflows/microbenchmark.yml b/.github/workflows/microbenchmark.yml
@@ -22,7 +22,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Run buildkite pipeline
-        uses: elastic/oblt-actions/buildkite/run@v1.8.1
+        uses: elastic/oblt-actions/buildkite/run@v1.9.1
         with:
           token: ${{ secrets.BUILDKITE_TOKEN }}
           pipeline: apm-agent-microbenchmark

diff --git a/.github/workflows/prepare-release/action.yml b/.github/workflows/prepare-release/action.yml
@@ -17,6 +17,9 @@ outputs:
   release-branch:
     description: "Release branch (relevant for minor releases)"
     value: ${{ steps.generate.outputs.release-branch }}
+  release-type:
+    description: "Release type"
+    value: ${{ inputs.type }}
   release-version:
     description: "Release version"
     value: ${{ steps.generate.outputs.release-version }}

diff --git a/.github/workflows/run-minor-release.yml b/.github/workflows/run-minor-release.yml
@@ -26,6 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       release-branch: ${{ steps.prepare.outputs.release-branch }}
+      release-type: ${{ steps.prepare.outputs.release-type }}
       release-version: ${{ steps.prepare.outputs.release-version }}
       slack-thread: ${{ steps.prepare.outputs.slack-thread }}
     steps:
@@ -42,12 +43,13 @@ jobs:
     needs: [ prepare ]
     env:
       RELEASE_BRANCH: ${{ needs.prepare.outputs.release-branch }}
+      RELEASE_TYPE: ${{ needs.prepare.outputs.release-type }}
       RELEASE_VERSION: ${{ needs.prepare.outputs.release-version }}
     permissions:
       contents: write
     steps:
 
-      - uses: elastic/oblt-actions/slack/send@v1.8.1
+      - uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: ${{ env.SLACK_CHANNEL }}
@@ -80,7 +82,7 @@ jobs:
       - run: make minor-release
 
       - if: success()
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: ${{ env.SLACK_CHANNEL }}
@@ -90,7 +92,7 @@ jobs:
           thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }}
 
       - if: failure()
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: ${{ env.SLACK_CHANNEL }}

diff --git a/.github/workflows/run-patch-release.yml b/.github/workflows/run-patch-release.yml
@@ -26,6 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       release-branch: ${{ steps.prepare.outputs.release-branch }}
+      release-type: ${{ steps.prepare.outputs.release-type }}
       release-version: ${{ steps.prepare.outputs.release-version }}
       slack-thread: ${{ steps.prepare.outputs.slack-thread }}
     steps:
@@ -43,6 +44,7 @@ jobs:
     needs: [ prepare ]
     env:
       RELEASE_BRANCH: ${{ needs.prepare.outputs.release-branch }}
+      RELEASE_TYPE: ${{ needs.prepare.outputs.release-type }}
       RELEASE_VERSION: ${{ needs.prepare.outputs.release-version }}
     permissions:
       contents: write
@@ -73,7 +75,7 @@ jobs:
       - run: make patch-release
 
       - if: success()
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: ${{ env.SLACK_CHANNEL }}
@@ -83,7 +85,7 @@ jobs:
           thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }}
 
       - if: failure()
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: ${{ env.SLACK_CHANNEL }}

diff --git a/.github/workflows/smoke-tests-schedule.yml b/.github/workflows/smoke-tests-schedule.yml
@@ -54,7 +54,7 @@ jobs:
         uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
         with:
           needs: ${{ toJSON(needs) }}
-      - uses: elastic/oblt-actions/slack/notify-result@v1.8.1
+      - uses: elastic/oblt-actions/slack/notify-result@v1.9.1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: "#apm-server"

diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml
@@ -33,15 +33,15 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - uses: elastic/oblt-actions/updatecli/run@v1.8.1
+      - uses: elastic/oblt-actions/updatecli/run@v1.9.1
         with:
           command: --experimental apply --config .ci/update-beats.yml
         env:
           BRANCH_NAME: ${{ matrix.branch }}
           GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
 
       - if: ${{ failure()  }}
-        uses: elastic/oblt-actions/slack/send@v1.8.1
+        uses: elastic/oblt-actions/slack/send@v1.9.1
         with:
           channel-id: '#apm-server'
           message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"

diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ version.asciidoc.bck
 .imported-java-agent-pubkey
 /agent
 go.work
+go.work.*
 testing/docker/metricbeat/apm-server.yml
 cmd/intake-receiver/intake-receiver
 cmd/intake-receiver/events
@@ -50,4 +51,4 @@ testing/smoke/**/main.tf
 !testing/smoke/supported-os/main.tf
 !testing/smoke/managed/main.tf
 testing/rally-cloud/build
-.bck
+.bck
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.3
+1.22.4