From bc819dee752d5ca67d3f31d74b299aac08ea0a16 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:02:49 -0400 Subject: [PATCH 01/10] [Automation][7.17] Bump Golang version to 1.21.11 (#39832) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update x-pack/libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * Add changelog. * chore: Update libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update x-pack/libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update x-pack/libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * Use same changeset exclusions as main. https://github.com/elastic/beats/pull/39851 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie --- .buildkite/scripts/changesets.sh | 2 +- .go-version | 2 +- .golangci.yml | 8 ++++---- CHANGELOG.next.asciidoc | 1 + auditbeat/Dockerfile | 2 +- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- filebeat/Dockerfile | 2 +- heartbeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/nats/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/libbeat/Dockerfile | 2 +- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 20 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.buildkite/scripts/changesets.sh b/.buildkite/scripts/changesets.sh index 7e79d2d31647..1ab80edc585c 100644 --- a/.buildkite/scripts/changesets.sh +++ b/.buildkite/scripts/changesets.sh @@ -15,7 +15,7 @@ definePattern() { } defineExclusions() { - exclude="^$beatPath\/module\/(.*(? Date: Tue, 18 Jun 2024 18:00:39 +0300 Subject: [PATCH 02/10] [7.17](backport #39879) Migrate github checks to buildkite for winlogbeat and x-pack/winlogbeat (#39886) * Update (#39879) (cherry picked from commit 9e2ef861d608d9299985a87569229207dc4a3bd3) # Conflicts: # .github/workflows/check-winlogbeat.yml * Delete check-winlogbeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/winlogbeat/pipeline.winlogbeat.yml | 26 +++++++++++++++++++ .../x-pack/pipeline.xpack.winlogbeat.yml | 26 +++++++++++++++++++ .github/workflows/check-winlogbeat.yml | 25 ------------------ 3 files changed, 52 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/check-winlogbeat.yml diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml index 5ee9d8cb49a4..7c809c48aadb 100644 --- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml +++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml @@ -22,6 +22,32 @@ env: DOCKER_PULL: 0 steps: + - group: "Winlogbeat Check/Update" + key: "winlogbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C winlogbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "winlogbeat: 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: "winlogbeat-check-update" + - group: "Winlogbeat Mandatory Tests" key: "winlogbeat-mandatory-tests" diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml index c14efffd8371..e8b91c652bc0 100644 --- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml @@ -19,6 +19,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/winlogbeat Check/Update" + key: "x-pack-winlogbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/winlogbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/winlogbeat: 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: "x-pack-winlogbeat-check-update" + - group: "x-pack/winlogbeat Mandatory Tests" key: "x-pack-winlogbeat-mandatory-tests" steps: diff --git a/.github/workflows/check-winlogbeat.yml b/.github/workflows/check-winlogbeat.yml deleted file mode 100644 index e048d585fa8b..000000000000 --- a/.github/workflows/check-winlogbeat.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: check-winlogbeat - -on: - pull_request: - paths: - - '.github/workflows/check-winlogbeat.yml' - - 'winlogbeat/**' - - 'x-pack/winlogbeat/**' - -env: - BEAT_MODULE: 'winlogbeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From 7eb36d43ba45a88f97ecf4d739c8dd2f7db364cf Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 18:00:57 +0300 Subject: [PATCH 03/10] Update pipeline.xpack.dockerlogbeat.yml (#39890) (#39919) (cherry picked from commit 3b1d7c30362c6a144304f3af903bf11ed1db1025) Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .../x-pack/pipeline.xpack.dockerlogbeat.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml index c74ff8773a7f..8c935d8e59a8 100644 --- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml @@ -18,6 +18,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/dockerlogbeat Check/Update" + key: "x-pack-dockerlogbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/dockerlogbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/dockerlogbeat: 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: "x-pack-dockerlogbeat-check-update" + - group: "x-pack/dockerlogbeat Mandatory Tests" key: "xpack-dockerlogbeat-mandatory-tests" steps: From b0de1c74227536a58e1dde59f3763a6877e2b54d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 18:01:17 +0300 Subject: [PATCH 04/10] Update pipeline.xpack.osquerybeat.yml (#39888) (#39917) (cherry picked from commit e71bf8220525e6f004f9db5165ff015ad241abaa) Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .../x-pack/pipeline.xpack.osquerybeat.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 05f4765e5c76..60bccb4a8e15 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -20,6 +20,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/osquerybeat Check/Update" + key: "x-pack-osquerybeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/osquerybeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/osquerybeat: 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: "x-pack-osquerybeat-check-update" + - group: "x-pack/osquerybeat Mandatory Tests" key: "x-pack-osquerybeat-mandatory-tests" From 13a2492dfaf972df5c1ee84f712e49c1537373b9 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Wed, 19 Jun 2024 10:27:56 +0300 Subject: [PATCH 05/10] fixed typo (#39931) Fixed typo for macOS step GH notification --- .buildkite/metricbeat/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 86c0a59a704e..ab2434438225 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -209,7 +209,7 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: EmacOS x86_64 Unit Tests" + context: "metricbeat: macOS x86_64 Unit Tests" - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed From 77e33bdedd392f646a70bacf74e7b00ec47e7af3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:37:34 +0300 Subject: [PATCH 06/10] [7.17](backport #39841) Migrate github checks to buildkite pipeline for heartbeat and x-pack/heartbeat (#39943) * Migrate github checks to buildkite pipeline for heartbeat and x-pack/heartbeat (#39841) * Updates * Update * Update pipeline.xpack.filebeat.yml * Update (cherry picked from commit 4496e21d4aeaa7d409a7c32eb68477ea630a1ce4) # Conflicts: # .github/workflows/check-xpack-heartbeat.yml * Delete check-xpack-heartbeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/heartbeat/heartbeat-pipeline.yml | 27 +++++++++++++++++++ .../x-pack/pipeline.xpack.heartbeat.yml | 27 +++++++++++++++++++ .github/workflows/check-xpack-heartbeat.yml | 25 ----------------- 3 files changed, 54 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/check-xpack-heartbeat.yml diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index b0bd67b036ac..5d5d3c354337 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -26,6 +26,33 @@ env: TEST_COVERAGE: "true" steps: + - group: "Heartbeat Check/Update" + key: "heartbeat-check-update" + + steps: + - label: "Run check/update" + command: | + make -C heartbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "hearbeat: 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: "heartbeat-check-update" + - group: "Heartbeat Mandatory Testing" key: "heartbeat-mandatory-tests" diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 959caebebcc9..d8bda333c0bb 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -31,6 +31,33 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/heartbeat Check/Update" + key: "x-pack-heartbeat-check-update" + + steps: + - label: "Run check/update" + command: | + make -C x-pack/heartbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/heartbeat: 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: "x-pack-heartbeat-check-update" + - group: "x-pack/heartbeat Mandatory Tests" key: "x-pack-heartbeat-mandatory-tests" steps: diff --git a/.github/workflows/check-xpack-heartbeat.yml b/.github/workflows/check-xpack-heartbeat.yml deleted file mode 100644 index c9b77cbebb38..000000000000 --- a/.github/workflows/check-xpack-heartbeat.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: check-x-pack-heartbeat - -on: - pull_request: - paths: - - '.github/workflows/check-xpack-heartbeat.yml' - - 'x-pack/heartbeat/**' - - 'heartbeat/**' - -env: - BEAT_MODULE: 'x-pack/heartbeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From 429cebaf6730fbade7b07398cddb861e883ad1a8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:38:06 +0300 Subject: [PATCH 07/10] [7.17](backport #39870) Migrate github checks to buildkite for metricbeat and x-pack/metricbeat (#39941) * Migrate github checks to buildkite for metricbeat and x-pack/metricbeat (#39870) * Update * Update pipeline.xpack.metricbeat.yml * Update version of image (cherry picked from commit 9e7099337559076dcaeda2193e793ad557c80dfd) # Conflicts: # .github/workflows/check-metricbeat.yml * Delete check-metricbeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/metricbeat/pipeline.yml | 26 +++++++++++++++++++ .../x-pack/pipeline.xpack.metricbeat.yml | 26 +++++++++++++++++++ .github/workflows/check-metricbeat.yml | 25 ------------------ 3 files changed, 52 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/check-metricbeat.yml diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index ab2434438225..1b59e5140d39 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -28,6 +28,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "Metricbeat Check/Update" + key: "metricbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C metricbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "metricbeat: 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: "metricbeat-check-update" + - group: "Metricbeat Mandatory Tests" key: "metricbeat-mandatory-tests" steps: diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index a68ba388b43e..7ab0e851ffc2 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -26,6 +26,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/metricbeat Check/Update" + key: "x-pack-metricbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/metricbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/metricbeat: 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: "x-pack-metricbeat-check-update" + - group: "x-pack/metricbeat Mandatory Tests" key: "x-pack-metricbeat-mandatory-tests" steps: diff --git a/.github/workflows/check-metricbeat.yml b/.github/workflows/check-metricbeat.yml deleted file mode 100644 index 452f0dbedc1c..000000000000 --- a/.github/workflows/check-metricbeat.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: check-metricbeat - -on: - pull_request: - paths: - - '.github/workflows/check-metricbeat.yml' - - 'metricbeat/**' - - 'x-pack/metricbeat/**' - -env: - BEAT_MODULE: 'metricbeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From b5f78874c8a491de260802ff46d06323739e8c8d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:20:55 +0000 Subject: [PATCH 08/10] [7.17](backport #39939) Remove requirements_aix.txt (#39948) * Remove requirements_aix.txt. (#39939) (cherry picked from commit 2f10d0840326ecfad15704e9a7dccebe9f5a9e97) # Conflicts: # libbeat/tests/system/requirements_aix.txt * Remove requirements aix --------- Co-authored-by: Craig MacKenzie --- libbeat/tests/system/requirements_aix.txt | 52 ----------------------- 1 file changed, 52 deletions(-) delete mode 100644 libbeat/tests/system/requirements_aix.txt diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt deleted file mode 100644 index ffadc2dbdd40..000000000000 --- a/libbeat/tests/system/requirements_aix.txt +++ /dev/null @@ -1,52 +0,0 @@ -requests==2.31.0 -urllib3==1.26.18 -docker==6.1.3 -docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix -attrs==19.3.0 -autopep8==1.5.4 -backports.ssl-match-hostname==3.5.0.1 -cached-property==1.4.2 -certifi==2018.1.18 -chardet==3.0.4 -deepdiff==4.2.0 -docker-pycreds==0.4.0 -dockerpty==0.4.1 -docopt==0.6.2 -elasticsearch==7.8.1 -enum34==1.1.6 -idna==2.6 -importlib-metadata==1.7.0 -iniconfig==1.0.1 -ipaddress==1.0.19 -Jinja2==2.11.3 -jsondiff==1.1.2 -jsonschema==3.2.0 -kafka-python==1.4.3 -MarkupSafe==1.1.1 -more-itertools==8.4.0 -opentelemetry-api==1.11.0 -opentelemetry-exporter-otlp==1.11.0 -opentelemetry-sdk==1.11.0 -ordered-set==3.1.1 -packaging==20.4 -parameterized==0.7.0 -pluggy==0.13.1 -py==1.11.0 -pycodestyle==2.6.0 -pyparsing==2.4.7 -pyrsistent==0.16.0 -pytest==7.3.2 -pytest-rerunfailures==9.1.1 -pytest-timeout==1.4.2 -PyYAML==5.3.1 -redis==2.10.6 -semver==2.8.1 -setuptools==47.3.2 -six==1.15.0 -stomp.py==4.1.22 -termcolor==1.1.0 -texttable==0.9.1 -toml==0.10.1 -wcwidth==0.2.5 -websocket-client==0.47.0 -zipp>=1.2.0,<=3.1.0 From 463307e37b6bb63bd88e71aac4650defd3d53168 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:56:17 +0000 Subject: [PATCH 09/10] chore: Update snapshot.yml (#39955) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- testing/environments/snapshot.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml index bfbfe0ea7d1c..f75d48577ee8 100644 --- a/testing/environments/snapshot.yml +++ b/testing/environments/snapshot.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22-b8cfff19-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.23-dc0072d1-SNAPSHOT healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] retries: 300 @@ -22,7 +22,7 @@ services: - "ingest.geoip.downloader.enabled=false" logstash: - image: docker.elastic.co/logstash/logstash:7.17.22-b8cfff19-SNAPSHOT + image: docker.elastic.co/logstash/logstash:7.17.23-dc0072d1-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 600 @@ -32,7 +32,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:7.17.22-b8cfff19-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.17.23-dc0072d1-SNAPSHOT healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"] retries: 600 From 5a16c8f74ec91c01e4ce20bbff7e61a5e72d0597 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Thu, 20 Jun 2024 14:50:18 +0300 Subject: [PATCH 10/10] updated pipeline (#39911) Updated packetbeat pipeline to match common styling && steps from Jenkins on 7.17 branch --- .buildkite/packetbeat/pipeline.packetbeat.yml | 125 ++++-------------- 1 file changed, 25 insertions(+), 100 deletions(-) diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index eef5fc153809..c4ff374fdabe 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -4,18 +4,18 @@ name: "beats-packetbeat" env: AWS_ARM_INSTANCE_TYPE: "m6g.xlarge" AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" + GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8" GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16" GCP_WIN_MACHINE_TYPE: "n2-standard-8" + IMAGE_MACOS_ARM: "generic-13-ventura-arm" IMAGE_MACOS_X86_64: "generic-13-ventura-x64" IMAGE_RHEL9_X86_64: "family/platform-ingest-beats-rhel-9" IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" IMAGE_WIN_10: "family/platform-ingest-beats-windows-10" - IMAGE_WIN_11: "family/platform-ingest-beats-windows-11" IMAGE_WIN_2016: "family/platform-ingest-beats-windows-2016" IMAGE_WIN_2019: "family/platform-ingest-beats-windows-2019" - IMAGE_WIN_2022: "family/platform-ingest-beats-windows-2022" #Deps ASDF_MAGE_VERSION: 1.15.0 @@ -53,8 +53,9 @@ steps: - group: "packetbeat Mandatory Tests" key: "packetbeat-mandatory-tests" + steps: - - label: ":linux: Ubuntu Unit Tests" + - label: ":ubuntu: Packetbeat Linux x86_64 Unit Tests" command: | cd packetbeat mage build unitTest @@ -70,11 +71,13 @@ steps: - "packetbeat/build/*.json" notify: - github_commit_status: - context: "packetbeat: Ubuntu Unit Tests" + context: "packetbeat: Linux x86_64 Unit Tests" - - label: ":linux: Ubuntu ARM Unit Tests" + - label: ":ubuntu: Packetbeat Linux arm64 Unit Tests" key: "linux-arm64-unit-tests" - command: "cd packetbeat && mage build unitTest" + command: | + cd packetbeat + mage build unitTest retry: automatic: - limit: 3 @@ -87,9 +90,9 @@ steps: - "packetbeat/build/*.json" notify: - github_commit_status: - context: "packetbeat: Ubuntu ARM Unit Tests" + context: "packetbeat: Linux arm64 Unit Tests" - - label: ":windows: Windows 2019 Unit Tests" + - label: ":windows: Packetbeat Win-2019 Unit Tests" command: | Set-Location -Path packetbeat mage build unitTest @@ -107,33 +110,14 @@ steps: - "packetbeat/build/*.json" notify: - github_commit_status: - context: "packetbeat: Windows 2019 Unit Tests" + context: "packetbeat: Win-2019 Unit Tests" - - group: "Extended Windows Tests" + - group: "Packetbeat Extended Windows Tests" key: "packetbeat-extended-windows-tests" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ - steps: - - label: ":windows: Windows 2016 Unit Tests" - command: | - Set-Location -Path packetbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2016}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "packetbeat/build/*.xml" - - "packetbeat/build/*.json" - notify: - - github_commit_status: - context: "packetbeat: Extended Windows 2016 Unit Tests" - - label: ":windows: Windows 2022 Unit Tests" + steps: + - label: ":windows: Packetbeat Win-2016 Unit Tests" command: | Set-Location -Path packetbeat mage build unitTest @@ -151,9 +135,9 @@ steps: - "packetbeat/build/*.json" notify: - github_commit_status: - context: "packetbeat: Extended Windows 2022 Unit Tests" + context: "packetbeat: Win-2016 Unit Tests" - - label: ":windows: Windows 10 Unit Tests" + - label: ":windows: Packetbeat Win 10 Unit Tests" command: | Set-Location -Path packetbeat mage build unitTest @@ -171,33 +155,13 @@ steps: - "packetbeat/build/*.json" notify: - github_commit_status: - context: "packetbeat: Extended Windows 10 Unit Tests" - - - label: ":windows: Windows 11 Unit Tests" - command: | - Set-Location -Path packetbeat - mage build unitTest - key: "extended-win-11-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_11}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "packetbeat/build/*.xml" - - "packetbeat/build/*.json" - notify: - - github_commit_status: - context: "packetbeat: Extended Windows 11 Unit Tests" + context: "packetbeat: Win 10 Unit Tests" - - group: "Extended Tests" + - group: "Packetbeat Extended Tests" key: "extended-tests" + steps: - - label: ":mac: MacOS x86_64 Unit Tests" + - label: ":mac: Packetbeat macOS x86_64 Unit Tests" key: "macos-x86-64-unit-tests-extended" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ command: | @@ -216,46 +180,7 @@ steps: - "packetbeat/build/*.json" notify: - github_commit_status: - context: "packetbeat: Extended MacOS x86_64 Unit Tests" - - - label: ":mac: MacOS arm64 Unit Tests" - key: "macos-arm64-unit-tests-extended" - if: build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/ - command: | - set -euo pipefail - source .buildkite/scripts/install_macos_tools.sh - cd packetbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "orka" - imagePrefix: "${IMAGE_MACOS_ARM}" - artifact_paths: - - "packetbeat/build/*.xml" - - "packetbeat/build/*.json" - notify: - - github_commit_status: - context: "packetbeat: Extended MacOS arm64 Unit Tests" - - - label: ":linux: Ubuntu ARM Unit Tests" - key: "linux-arm64-unit-tests-extended" - command: "cd packetbeat && mage build unitTest" - if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ - retry: - automatic: - - limit: 3 - agents: - provider: "aws" - imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" - instanceType: "${AWS_ARM_INSTANCE_TYPE}" - artifact_paths: - - "packetbeat/build/*.xml" - - "packetbeat/build/*.json" - notify: - - github_commit_status: - context: "packetbeat: Extended Ubuntu ARM Unit Tests" + context: "packetbeat: macOS x86_64 Unit Tests" - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed @@ -267,7 +192,7 @@ steps: - group: "Packetbeat Packaging" key: "packaging" steps: - - label: ":linux: Packaging Linux" + - label: ":ubuntu: Packetbeat Packaging Linux" key: "packaging-linux" command: | cd packetbeat @@ -288,7 +213,7 @@ steps: - github_commit_status: context: "packetbeat: Packaging Linux" - - label: ":linux: Packaging ARM" + - label: ":ubuntu: Packetbeat Packaging arm64" key: "packaging-arm" command: | cd packetbeat @@ -306,4 +231,4 @@ steps: PACKAGES: "docker" notify: - github_commit_status: - context: "packetbeat: Packaging Linux ARM" + context: "packetbeat: Packaging Linux arm64"