Merge branch 'main' into feat/chainguard-image

kruskall · Apr 22, 2024 · 262092f · 262092f
2 parents 9022753 + efbd3e6
commit 262092f
Show file tree

Hide file tree

Showing 63 changed files with 13,856 additions and 588 deletions.
diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml
@@ -96,15 +96,6 @@ targets:
       content: '{{ source "latestGoVersion" }}'
       file: .go-version
       matchpattern: '\d+.\d+.\d+'
-  update-dockerfile:
-    name: 'Update Dockerfile with Golang version {{ source "latestGoVersion" }}'
-    sourceid: latestGoVersion
-    scmid: default
-    kind: file
-    spec:
-      file: packaging/docker/Dockerfile
-      matchpattern: '(FROM golang):\d+.\d+.\d+'
-      replacepattern: '$1:{{ source "latestGoVersion" }}'
   update-gomod:
     name: 'Update go.mod files with {{ source "gomod" }}'
     sourceid: gomod

diff --git a/.github/workflows/add-to-docs-project.yml b/.github/workflows/add-to-docs-project.yml
@@ -3,6 +3,9 @@ on:
   issues:
     types:
       - labeled
+permissions:
+  contents: read
+
 jobs:
   add_to_project:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml
@@ -6,12 +6,15 @@ on:
       - opened
       - transferred
 
+permissions:
+  contents: read
+
 jobs:
   add-to-project:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v1.0.1
         with:
           project-url: https://github.com/orgs/elastic/projects/1286
           github-token: ${{ secrets.APM_TECH_USER_TOKEN }}
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -28,6 +28,9 @@ env:
   BENCHMARK_RESULT: benchmark-result.txt
   WORKING_DIRECTORY: testing/benchmark
 
+permissions:
+  contents: read
+
 jobs:
   benchmarks:
     runs-on: ubuntu-latest
@@ -67,7 +70,7 @@ jobs:
             echo "BENCHMARK_RUN=${{ inputs.benchmarkRun }}" >> "$GITHUB_ENV"
           fi
 
-      - uses: hashicorp/vault-action@v2.8.0
+      - uses: hashicorp/vault-action@v3.0.0
         env:
           AWS_CREDENTIALS_PATH: secret/observability-team/ci/elastic-observability-aws-account-auth
           BENCHMARK_CLOUD_CREDENTIALS_PATH: secret/observability-team/ci/benchmark-cloud
@@ -106,7 +109,7 @@ jobs:
         run: make apmbench $SSH_KEY terraform.tfvars
 
       - name: Override docker committed version
-        if: ${{ !github.event.inputs.runOnStable }}
+        if: ${{ ! inputs.runOnStable }}
         run: make docker-override-committed-version
 
       - name: Spin up benchmark environment
@@ -118,11 +121,11 @@ jobs:
           echo "-> infra setup done"
 
       - name: Run benchmarks autotuned
-        if: ${{ github.event.inputs.benchmarkAgents == '' }}
+        if: ${{ inputs.benchmarkAgents == '' }}
         run: make run-benchmark-autotuned index-benchmark-results
 
       - name: Run benchmarks self tuned
-        if: ${{ github.event.inputs.benchmarkAgents != '' }}
+        if: ${{ inputs.benchmarkAgents != '' }}
         run: make run-benchmark index-benchmark-results
 
       - name: Download PNG

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,3 +77,13 @@ jobs:
         with:
           name: test-results
           path: 'build/*.xml'
+
+  test-package:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: false
+      - run: make package-snapshot
diff --git a/.github/workflows/run-minor-release.yml b/.github/workflows/run-minor-release.yml
@@ -19,6 +19,7 @@ permissions:
 env:
   JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: "#apm-server"
+  GH_TOKEN: ${{ secrets.APM_SERVER_RELEASE_TOKEN }}
 
 jobs:
   prepare:
@@ -67,23 +68,14 @@ jobs:
       # Required to use a service account, otherwise PRs created by
       # GitHub bot won't trigger any CI builds.
       # See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081
-      - name: Configure github token
-        uses: elastic/apm-pipeline-library/.github/actions/github-token@current
-        with:
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
-
       - name: Configure git user
         uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
         with:
           username: ${{ env.GIT_USER }}
           email: ${{ env.GIT_EMAIL }}
-          token: ${{ env.GITHUB_TOKEN }}
+          token: ${{ env.GH_TOKEN }}
 
       - run: make minor-release
-        env:
-          GH_TOKEN: ${{ env.GITHUB_TOKEN }}
 
       - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current
         if: success()

diff --git a/.github/workflows/run-patch-release.yml b/.github/workflows/run-patch-release.yml
@@ -19,6 +19,7 @@ permissions:
 env:
   JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: "#apm-server"
+  GH_TOKEN: ${{ secrets.APM_SERVER_RELEASE_TOKEN }}
 
 jobs:
   prepare:
@@ -58,23 +59,14 @@ jobs:
       # Required to use a service account, otherwise PRs created by
       # GitHub bot won't trigger any CI builds.
       # See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081
-      - name: Configure github token
-        uses: elastic/apm-pipeline-library/.github/actions/github-token@current
-        with:
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
-
       - name: Configure git user
         uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
         with:
           username: ${{ env.GIT_USER }}
           email: ${{ env.GIT_EMAIL }}
-          token: ${{ env.GITHUB_TOKEN }}
+          token: ${{ env.GH_TOKEN }}
 
       - run: make patch-release
-        env:
-          GH_TOKEN: ${{ env.GITHUB_TOKEN }}
 
       - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current
         if: success()

diff --git a/.github/workflows/setup-cluster-env/action.yml b/.github/workflows/setup-cluster-env/action.yml
@@ -31,7 +31,7 @@ runs:
         cache-dependency-path: |
           go.sum
           tools/go.sum
-    - uses: hashicorp/vault-action@v2.8.0
+    - uses: hashicorp/vault-action@v3.0.0
       with:
         url: ${{ inputs.vault-url }}
         roleId: ${{ inputs.vault-role-id }}

diff --git a/.github/workflows/terraform-fmt.yml b/.github/workflows/terraform-fmt.yml
@@ -9,6 +9,9 @@ on:
       - '**.tf'
   merge_group:
 
+permissions:
+  contents: read
+
 jobs:
   terraform-fmt:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-reporter.yml b/.github/workflows/test-reporter.yml
@@ -7,6 +7,11 @@ on:
     types:
       - completed
 
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   system-test-results:
     runs-on: ubuntu-latest

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.21.6
+1.22.2
diff --git a/.mergify.yml b/.mergify.yml
@@ -332,3 +332,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.14 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.14
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.14"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -1,22 +1,24 @@
 // tag::list[]
-* <<release-notes-8.13>>
-* <<release-notes-8.12>>
-* <<release-notes-8.11>>
-* <<release-notes-8.10>>
-* <<release-notes-8.9>>
-* <<release-notes-8.8>>
-* <<release-notes-8.7>>
-* <<release-notes-8.6>>
-* <<release-notes-8.5>>
-* <<release-notes-8.4>>
-* <<release-notes-8.3>>
-* <<release-notes-8.2>>
-* <<release-notes-8.1>>
-* <<release-notes-8.0>>
+* <<apm-release-notes-8.14>>
+* <<apm-release-notes-8.13>>
+* <<apm-release-notes-8.12>>
+* <<apm-release-notes-8.11>>
+* <<apm-release-notes-8.10>>
+* <<apm-release-notes-8.9>>
+* <<apm-release-notes-8.8>>
+* <<apm-release-notes-8.7>>
+* <<apm-release-notes-8.6>>
+* <<apm-release-notes-8.5>>
+* <<apm-release-notes-8.4>>
+* <<apm-release-notes-8.3>>
+* <<apm-release-notes-8.2>>
+* <<apm-release-notes-8.1>>
+* <<apm-release-notes-8.0>>
 // end::list[]
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.14.asciidoc[]
 include::./changelogs/8.13.asciidoc[]
 include::./changelogs/8.12.asciidoc[]
 include::./changelogs/8.11.asciidoc[]

diff --git a/Makefile b/Makefile
@@ -172,7 +172,7 @@ testing/infra/terraform/modules/%/README.md: .FORCE
 # and just keep the JSON Schema there.
 docs/spec: go.mod
 	@$(GO) mod download github.com/elastic/apm-data
-	rsync -v --delete --chmod=Du+rwx,go+rx --chmod=Fu+rw,go+r -r $$($(GO) list -m -f {{.Dir}} github.com/elastic/apm-data)/input/elasticapm/docs/spec ./docs
+	rsync -v --delete --filter='P spec/openapi/' --chmod=Du+rwx,go+rx --chmod=Fu+rw,go+r -r $$($(GO) list -m -f {{.Dir}} github.com/elastic/apm-data)/input/elasticapm/docs/spec ./docs
 
 ##############################################################################
 # Beats synchronisation.
@@ -189,11 +189,6 @@ update-beats: update-beats-module update
 update-beats-module:
 	$(GO) get -d $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy
 
-.PHONY: update-beats-docs
-update-beats-docs:
-	$(GO) mod download $(BEATS_MODULE)
-	rsync -v -r --existing $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/libbeat/ ./docs/legacy/copied-from-beats
-
 ##############################################################################
 # Linting, style-checking, license header checks, etc.
 ##############################################################################