From ae75ea6b593a2496015a08f72f2ec76d63a779da Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Mon, 17 Jun 2024 17:40:14 +0300 Subject: [PATCH 1/7] Update metricbeat to match common styling && Jenkins steps on 7.17 (#39908) Updated metricbeat pipeline to match common styling && steps from Jenkins on 7.17 --- .buildkite/metricbeat/pipeline.yml | 155 ++++++++--------------------- 1 file changed, 42 insertions(+), 113 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 98a18c3bfdb..975d2b62f12 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -2,7 +2,8 @@ name: "beats-metricbeat" env: - AWS_ARM_INSTANCE_TYPE: "t4g.xlarge" + 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" @@ -10,16 +11,13 @@ env: IMAGE_MACOS_ARM: "generic-13-ventura-arm" IMAGE_MACOS_X86_64: "generic-13-ventura-x64" - IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" 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" # Integration Tests - K8S_VERSION: "v1.29.0" + K8S_VERSION: "v1.21.1" ASDF_KIND_VERSION: "0.20.0" # Other deps @@ -33,9 +31,11 @@ steps: - group: "Metricbeat Mandatory Tests" key: "metricbeat-mandatory-tests" steps: - - label: ":linux: Ubuntu Unit Tests" + - label: ":ubuntu: Metricbeat Linux x86_64 Unit Tests" key: "mandatory-linux-unit-test" - command: "cd metricbeat && mage build unitTest" + command: | + cd metricbeat + mage build unitTest retry: automatic: - limit: 3 @@ -48,28 +48,20 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: Ubuntu Unit Tests" + context: "metricbeat: Linux x86_64 Unit Tests" - - label: ":go: Go Integration Tests" + - label: ":ubuntu: Metricbeat Go Integration Tests" key: "mandatory-int-test" command: | set -euo pipefail # defines the MODULE env var based on what's changed in a PR source .buildkite/scripts/changesets.sh defineModuleFromTheChangeSet metricbeat - echo "~~~ Running tests" - - # TODO move this section to base image / pre-command hook - # echo "~~~ Installing kind" - # asdf plugin add kind - # asdf install kind $ASDF_KIND_VERSION - - # .buildkite/deploy/kubernetes/scripts/kind-setup.sh echo "~~~ Running tests" - # uncomment line below (which causes skipping of module kubeconfig) when https://github.com/elastic/beats/issues/38874 has been resolved. - # export KUBECONFIG="$$PWD/kubecfg" - cd metricbeat && mage goIntegTest + export KUBECONFIG="$$PWD/kubecfg" + cd metricbeat + mage goIntegTest retry: automatic: - limit: 3 @@ -84,25 +76,18 @@ steps: - github_commit_status: context: "metricbeat: Go Integration Tests" - - label: ":python: Python Integration Tests" + - label: ":ubuntu: Python Integration Tests" key: "mandatory-python-int-test" command: | set -euo pipefail # defines the MODULE env var based on what's changed in a PR source .buildkite/scripts/changesets.sh defineModuleFromTheChangeSet metricbeat - echo "~~~ Running tests" - - # TODO move this section to base image / pre-command hook - echo "~~~ Installing kind" - asdf plugin add kind - asdf install kind $ASDF_KIND_VERSION - - .buildkite/deploy/kubernetes/scripts/kind-setup.sh echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" - cd metricbeat && mage pythonIntegTest + cd metricbeat + mage pythonIntegTest retry: automatic: - limit: 3 @@ -117,7 +102,7 @@ steps: - github_commit_status: context: "metricbeat: Python Integration Tests" - - label: ":negative_squared_cross_mark: Cross compile" + - label: ":ubuntu: Metricbeat Crosscompile" key: "mandatory-cross-compile" command: "make -C metricbeat crosscompile" retry: @@ -132,40 +117,19 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: Cross compile" + context: "metricbeat: Crosscompile" - - label: ":windows: Windows 2016 Unit Tests" + - label: ":windows: Metricbeat Win-2019 Unit Tests" command: | Set-Location -Path metricbeat mage build unitTest - key: "mandatory-win-2016-unit-tests" + key: "mandatory-win-2019-unit-tests" 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: - - "metricbeat/build/*.xml" - - "metricbeat/build/*.json" - notify: - - github_commit_status: - context: "metricbeat: Windows 2016 Unit Tests" - - - label: ":windows: Windows 2022 Unit Tests" - command: | - Set-Location -Path metricbeat - mage build unitTest - key: "mandatory-win-2022-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2022}" + image: "${IMAGE_WIN_2019}" machine_type: "${GCP_WIN_MACHINE_TYPE}" disk_size: 100 disk_type: "pd-ssd" @@ -174,13 +138,14 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: Windows 2022 Unit Tests" + context: "metricbeat: Win-2019 Unit Tests" - group: "Metricbeat Extended Windows Tests" key: "metricbeat-extended-win-tests" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ + steps: - - label: ":windows: Windows 10 Unit Tests" + - label: ":windows: Metricbeat Win 10 Unit Tests" command: | Set-Location -Path metricbeat mage build unitTest @@ -199,40 +164,19 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: Extended Windows 10 Unit Tests" - - - label: ":windows: Windows 11 Unit Tests" - command: | - Set-Location -Path metricbeat - 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: - - "metricbeat/build/*.xml" - - "metricbeat/build/*.json" - notify: - - github_commit_status: - context: "metricbeat: Extended Windows 11 Unit Tests" + context: "metricbeat: Win 10 Unit Tests" - - label: ":windows: Windows 2019 Unit Tests" + - label: ":windows: Metricbeat Win-2016 Unit Tests" command: | Set-Location -Path metricbeat mage build unitTest - key: "extended-win-2019-unit-tests" + key: "extended-win-2016-unit-tests" retry: automatic: - limit: 3 agents: provider: "gcp" - image: "${IMAGE_WIN_2019}" + image: "${IMAGE_WIN_2016}" machineType: "${GCP_WIN_MACHINE_TYPE}" disk_size: 100 disk_type: "pd-ssd" @@ -241,13 +185,14 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: Extended Windows 2019 Unit Tests" + context: "metricbeat: Win-2016 Unit Tests" - - group: "Metricbeat Extended MacOS Tests" + - group: "Metricbeat Extended macOS Tests" key: "metricbeat-extended-macos-tests" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ + steps: - - label: ":mac: MacOS x64_64 Unit Tests" + - label: ":mac: Metricbeat macOS x64_64 Unit Tests" key: "extended-macos-x64-64-unit-tests" command: | set -euo pipefail @@ -264,27 +209,7 @@ steps: - "metricbeat/build/*.json" notify: - github_commit_status: - context: "metricbeat: Extended MacOS x86_64 Unit Tests" - - - label: ":mac: MacOS arm64 Unit Tests" - key: "extended-macos-arm64-unit-tests" - skip: "due to https://github.com/elastic/beats/issues/33035" - command: | - set -euo pipefail - source .buildkite/scripts/install_macos_tools.sh - cd metricbeat && mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "orka" - imagePrefix: "${IMAGE_MACOS_ARM}" - artifact_paths: - - "metricbeat/build/*.xml" - - "metricbeat/build/*.json" - notify: - - github_commit_status: - context: "metricbeat: Extended MacOS arm64 Unit Tests" + context: "metricbeat: EmacOS x86_64 Unit Tests" - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed @@ -296,9 +221,11 @@ steps: - group: "Metricbeat Packaging" key: "metricbeat-packaging" steps: - - label: ":linux: Packaging Linux" + - label: ":ubuntu: Metricbeat Packaging Linux" key: "packaging-linux" - command: "cd metricbeat && mage package" + command: | + cd metricbeat + mage package retry: automatic: - limit: 3 @@ -315,20 +242,22 @@ steps: - github_commit_status: context: "metricbeat: Packaging Linux" - - label: ":linux: Packaging ARM" + - label: ":ubuntu: Metricbeat Packaging Linux arm64" key: "packaging-arm" - command: "cd metricbeat && mage package" + command: | + cd metricbeat + mage package retry: automatic: - limit: 3 timeout_in_minutes: 20 agents: provider: "aws" - imagePrefix: "${IMAGE_UBUNTU_ARM_64}" + imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" instanceType: "${AWS_ARM_INSTANCE_TYPE}" env: PLATFORMS: "linux/arm64" PACKAGES: "docker" notify: - github_commit_status: - context: "metricbeat: Packaging Linux ARM" + context: "metricbeat: Packaging Linux arm64" From a145b49717bcf0025bba64057c007fdbe5ec331f Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Mon, 17 Jun 2024 17:43:07 +0300 Subject: [PATCH 2/7] updated pipline (#39912) Updated winlogbeat pipeline to match common styling and steps from Jenkins on 7.17 branch --- .buildkite/winlogbeat/pipeline.winlogbeat.yml | 40 +++++-------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml index 857593cce88..5ee9d8cb49a 100644 --- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml +++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml @@ -8,7 +8,6 @@ env: 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" @@ -42,7 +41,7 @@ steps: - "winlogbeat/build/*.json" notify: - github_commit_status: - context: "Winlogbeat: Crosscompile" + context: "winlogbeat: Crosscompile" - label: ":windows: Winlogbeat Win-2019 Unit Tests" command: | @@ -63,7 +62,7 @@ steps: - "winlogbeat/build/*.json" notify: - github_commit_status: - context: "Winlogbeat: Win-2019 Unit Tests" + context: "winlogbeat: Win-2019 Unit Tests" - label: ":windows: Winlogbeat Win-2022 Unit Tests" command: | @@ -84,7 +83,7 @@ steps: - "winlogbeat/build/*.json" notify: - github_commit_status: - context: "Winlogbeat: Win-2022 Unit Tests" + context: "winlogbeat: Win-2022 Unit Tests" - group: "Winlogbeat Extended Windows Tests" key: "winlogbeat-extended-win-tests" @@ -110,28 +109,7 @@ steps: - "winlogbeat/build/*.json" notify: - github_commit_status: - context: "Winlogbeat: Win-10 Unit Tests" - - - label: ":windows: Winlogbeat Win-11 Unit Tests" - command: | - Set-Location -Path winlogbeat - 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: - - "winlogbeat/build/*.xml" - - "winlogbeat/build/*.json" - notify: - - github_commit_status: - context: "Winlogbeat: Win-11 Unit Tests" + context: "winlogbeat: Win-10 Unit Tests" - label: ":windows: Winlogbeat Win-2016 Unit Tests" command: | @@ -152,16 +130,20 @@ steps: - "winlogbeat/build/*.json" notify: - github_commit_status: - context: "Winlogbeat: Win-2016 Unit Tests" + context: "winlogbeat: Win-2016 Unit Tests" - wait: ~ + # with PRs, we want to run packaging only if mandatory tests succeed + # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in mandatory tests if: build.env("BUILDKITE_PULL_REQUEST") != "false" depends_on: "winlogbeat-mandatory-tests" - group: "Winlogbeat Packaging" key: "winlogbeat-packaging" + steps: - - label: ":ubuntu: Winlogbeat Packaging Ubuntu x86_64" + - label: ":ubuntu: Winlogbeat Packaging Linux" key: "packaging-linux" command: | cd winlogbeat @@ -178,4 +160,4 @@ steps: PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64" notify: - github_commit_status: - context: "Winlogbeat: Packaging Ubuntu x86_64" + context: "winlogbeat: Packaging Linux" From 145c03566b672cd844c3c84dafdd60cc65ea0947 Mon Sep 17 00:00:00 2001 From: Elastic Machine Date: Tue, 18 Jun 2024 01:34:05 +1000 Subject: [PATCH 3/7] [Release] update version (#39849) Co-authored-by: Pierre HILBERT --- libbeat/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/version/version.go b/libbeat/version/version.go index 2f5e1cb435f..b965a1aa914 100644 --- a/libbeat/version/version.go +++ b/libbeat/version/version.go @@ -18,4 +18,4 @@ // Code generated by dev-tools/set_version package version -const defaultBeatVersion = "7.17.22" +const defaultBeatVersion = "7.17.23" From 4c8c13cdabaeef40fd4982aa4a10cb0e2b495106 Mon Sep 17 00:00:00 2001 From: Elastic Machine Date: Tue, 18 Jun 2024 02:09:56 +1000 Subject: [PATCH 4/7] docs: Prepare Changelog for 7.17.22 (#39855) * docs: Close changelog for 7.17.22 * Update CHANGELOG.asciidoc * Update CHANGELOG.asciidoc --------- Co-authored-by: Pierre HILBERT Co-authored-by: Julien Lind --- CHANGELOG.asciidoc | 18 ++++++++++++++++++ CHANGELOG.next.asciidoc | 6 +++--- libbeat/docs/release.asciidoc | 1 + 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index a09b2dada04..39120196123 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -3,6 +3,24 @@ :issue: https://github.com/elastic/beats/issues/ :pull: https://github.com/elastic/beats/pull/ +[[release-notes-7.17.22]] +=== Beats version 7.17.22 +https://github.com/elastic/beats/compare/v7.17.21\...v7.17.22[View commits] + +==== Bugfixes + +*Auditbeat* + +- Prevent scenario of losing children-related file events in a directory for recursive fsnotify backend of Auditbeat file integrity module. {pull}39133[39133] +- Fix losing events in FIM for MacOS X by allowing always to walk an added directory to monitor. {pull}39362[39362] + +==== Added + +*Affecting all Beats* + +- Upgrade to Go 1.21.10. {pull}39468[39468] + + [[release-notes-7.17.21]] === Beats version 7.17.21 https://github.com/elastic/beats/compare/v7.17.20\...v7.17.21[View commits] diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 3e09a9efc06..5cc785f66d5 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -35,8 +35,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Auditbeat* -- Prevent scenario of losing children-related file events in a directory for recursive fsnotify backend of auditbeat file integrity module {pull}39133[39133] -- Fix losing events in FIM for OS X by allowing always to walk an added directory to monitor {pull}39362[39362] *Filebeat* @@ -64,7 +62,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Affecting all Beats* -- Upgrade to Go 1.21.10. {pull}39468[39468] *Auditbeat* @@ -130,6 +127,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d + + + diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc index 05a88bf045c..6961c787977 100644 --- a/libbeat/docs/release.asciidoc +++ b/libbeat/docs/release.asciidoc @@ -8,6 +8,7 @@ This section summarizes the changes in each release. Also read <> for more detail about changes that affect upgrade. +* <> * <> * <> * <> From 931c563cf615a52074f54cb0bbad163216378423 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:17:03 +0000 Subject: [PATCH 5/7] [updatecli] update elastic stack version for testing 7.17.22-273f1998 (#39669) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli * chore: Update snapshot.yml Made with ❤️️ by updatecli --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Pierre HILBERT --- 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 e80124bd3a6..bfbfe0ea7d1 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-13d5abd0-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22-b8cfff19-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-13d5abd0-SNAPSHOT + image: docker.elastic.co/logstash/logstash:7.17.22-b8cfff19-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-13d5abd0-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.17.22-b8cfff19-SNAPSHOT healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"] retries: 600 From 1cd6070001a642c88fb5fb996a4b385859451df1 Mon Sep 17 00:00:00 2001 From: Elastic Machine Date: Tue, 18 Jun 2024 02:38:09 +1000 Subject: [PATCH 6/7] docs: update docs versions 7.17.22 (#39847) * docs: update docs * fix: make update changes --------- Co-authored-by: Pierre HILBERT --- deploy/kubernetes/auditbeat-kubernetes.yaml | 2 +- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 2 +- deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml | 2 +- deploy/kubernetes/filebeat-kubernetes.yaml | 2 +- deploy/kubernetes/heartbeat-kubernetes.yaml | 2 +- deploy/kubernetes/metricbeat-kubernetes.yaml | 2 +- libbeat/docs/version.asciidoc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/kubernetes/auditbeat-kubernetes.yaml b/deploy/kubernetes/auditbeat-kubernetes.yaml index 369e10c0ce9..b54cd64348c 100644 --- a/deploy/kubernetes/auditbeat-kubernetes.yaml +++ b/deploy/kubernetes/auditbeat-kubernetes.yaml @@ -109,7 +109,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: auditbeat - image: docker.elastic.co/beats/auditbeat:7.17.21 + image: docker.elastic.co/beats/auditbeat:7.17.22 args: [ "-c", "/etc/auditbeat.yml", "-e", diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index a0f337989bf..25b8497ec6f 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -22,7 +22,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:7.17.21 + image: docker.elastic.co/beats/elastic-agent:7.17.22 env: - name: FLEET_ENROLL value: "1" diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index d0dc1659451..4df0d2cbae3 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -471,7 +471,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:7.17.21 + image: docker.elastic.co/beats/elastic-agent:7.17.22 args: [ "-c", "/etc/agent.yml", "-e", diff --git a/deploy/kubernetes/filebeat-kubernetes.yaml b/deploy/kubernetes/filebeat-kubernetes.yaml index 3961dae3581..a8802531dfc 100644 --- a/deploy/kubernetes/filebeat-kubernetes.yaml +++ b/deploy/kubernetes/filebeat-kubernetes.yaml @@ -64,7 +64,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: filebeat - image: docker.elastic.co/beats/filebeat:7.17.21 + image: docker.elastic.co/beats/filebeat:7.17.22 args: [ "-c", "/etc/filebeat.yml", "-e", diff --git a/deploy/kubernetes/heartbeat-kubernetes.yaml b/deploy/kubernetes/heartbeat-kubernetes.yaml index 3597abf284b..9a3329e35ce 100644 --- a/deploy/kubernetes/heartbeat-kubernetes.yaml +++ b/deploy/kubernetes/heartbeat-kubernetes.yaml @@ -74,7 +74,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: heartbeat - image: docker.elastic.co/beats/heartbeat:7.17.21 + image: docker.elastic.co/beats/heartbeat:7.17.22 args: [ "-c", "/etc/heartbeat.yml", "-e", diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml index b8c5ff35e38..5e535256f25 100644 --- a/deploy/kubernetes/metricbeat-kubernetes.yaml +++ b/deploy/kubernetes/metricbeat-kubernetes.yaml @@ -151,7 +151,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: metricbeat - image: docker.elastic.co/beats/metricbeat:7.17.21 + image: docker.elastic.co/beats/metricbeat:7.17.22 args: [ "-c", "/etc/metricbeat.yml", "-e", diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 6c127331a30..931446a22a2 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,4 +1,4 @@ -:stack-version: 7.17.21 +:stack-version: 7.17.22 :doc-branch: 7.17 :go-version: 1.21.10 :release-state: unreleased From 666c44627e62bc4bbdd6409b8aa16bce7b99f19d Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 17 Jun 2024 15:22:31 -0400 Subject: [PATCH 7/7] [7.17] Fix Kubernetes module metricbeat Go integration tests (#39928) * Always use mage -v goIntegTest * Switch to batch/v1 for CronJobs. --- .buildkite/filebeat/filebeat-pipeline.yml | 2 +- .buildkite/heartbeat/heartbeat-pipeline.yml | 2 +- .buildkite/libbeat/pipeline.libbeat.yml | 2 +- .buildkite/metricbeat/pipeline.yml | 2 +- .buildkite/scripts/go_int_tests.sh | 2 +- .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.filebeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.metricbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.osquerybeat.yml | 2 +- metricbeat/module/kubernetes/kubernetes.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index cf1f07175bf..5a0dcc9e0a3 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -92,7 +92,7 @@ steps: - label: ":ubuntu: Filebeat Go Integration Tests" command: | cd filebeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index 5c1d1af7113..b0bd67b036a 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -96,7 +96,7 @@ steps: echo "~~~ Running tests" cd heartbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml index 3d3247b9da9..9cff63eefca 100644 --- a/.buildkite/libbeat/pipeline.libbeat.yml +++ b/.buildkite/libbeat/pipeline.libbeat.yml @@ -72,7 +72,7 @@ steps: command: | set -euo pipefail cd libbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 975d2b62f12..86c0a59a704 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -61,7 +61,7 @@ steps: echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" cd metricbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/scripts/go_int_tests.sh b/.buildkite/scripts/go_int_tests.sh index b4c519f4512..0a5d6b0efac 100755 --- a/.buildkite/scripts/go_int_tests.sh +++ b/.buildkite/scripts/go_int_tests.sh @@ -7,6 +7,6 @@ set -euo pipefail echo "--- Run Go Intergration Tests for $BEATS_PROJECT_NAME" pushd "${BEATS_PROJECT_NAME}" > /dev/null -mage goIntegTest +mage -v goIntegTest popd > /dev/null diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml index 5fd432e282e..c74ff8773a7 100644 --- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml @@ -49,7 +49,7 @@ steps: defineModuleFromTheChangeSet x-pack/dockerlogbeat echo "~~~ Running tests" cd x-pack/dockerlogbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index c0b8bc048b3..4daa38c7d86 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -94,7 +94,7 @@ steps: key: "x-pack-filebeat-mandatory-int-test" command: | cd x-pack/filebeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index dca98f61909..959caebebcc 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -65,7 +65,7 @@ steps: npm install -g @elastic/synthetics echo "~~~ Running tests" cd x-pack/heartbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index 6cb1825b7a1..58b13925627 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -72,7 +72,7 @@ steps: key: "mandatory-int-test" command: | cd x-pack/libbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index 2dc75406a9d..a68ba388b43 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -56,7 +56,7 @@ steps: source .buildkite/scripts/changesets.sh defineModuleFromTheChangeSet x-pack/metricbeat echo "~~~ Running tests" - cd x-pack/metricbeat && mage goIntegTest + cd x-pack/metricbeat && mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 5ce7755c790..05f4765e5c7 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -47,7 +47,7 @@ steps: key: "mandatory-int-test" command: | cd x-pack/osquerybeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/metricbeat/module/kubernetes/kubernetes.yml b/metricbeat/module/kubernetes/kubernetes.yml index d87cb4f5f9b..7c4ffb58ae9 100644 --- a/metricbeat/module/kubernetes/kubernetes.yml +++ b/metricbeat/module/kubernetes/kubernetes.yml @@ -108,7 +108,7 @@ spec: requests: storage: 1Mi --- -apiVersion: batch/v1beta1 +apiVersion: batch/v1 kind: CronJob metadata: name: basic-cronjob