From f8d3880d13194ae9aaafcfaddcda21c7845cdf14 Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Thu, 24 Oct 2024 06:41:03 -0700 Subject: [PATCH 1/6] Update go-quark to v0.2.0 (#41408) Update go-quark to v0.2.0. This version of go-quark includes a bugfix from libquark that fixes use of kprobes on newer Linux kernels. This also removes the license override for go-quark; the license in it should now be detected properly, removing the need for the override. --- NOTICE.txt | 208 +++++++++++++++++++++++++++++++- dev-tools/notice/overrides.json | 1 - go.mod | 2 +- go.sum | 4 +- 4 files changed, 207 insertions(+), 8 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e6ebacd0ffe..e473b3040b5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -14747,14 +14747,214 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-quark -Version: v0.1.2 +Version: v0.2.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-quark@v0.1.2/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-quark@v0.2.0/LICENSE.txt: + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. -Source code in this repository is licensed under the Apache License Version 2.0, -an Apache compatible license. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -------------------------------------------------------------------------------- diff --git a/dev-tools/notice/overrides.json b/dev-tools/notice/overrides.json index a50cac02e0f..bb82c97ebe4 100644 --- a/dev-tools/notice/overrides.json +++ b/dev-tools/notice/overrides.json @@ -19,4 +19,3 @@ {"name": "github.com/JohnCGriffin/overflow", "licenceType": "MIT"} {"name": "github.com/elastic/ebpfevents", "licenceType": "Apache-2.0"} {"name": "go.opentelemetry.io/collector/config/configopaque", "licenceType": "Apache-2.0"} -{"name": "github.com/elastic/go-quark", "licenceType": "Apache-2.0"} diff --git a/go.mod b/go.mod index 252fea01997..e4352b97565 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ require ( github.com/elastic/elastic-agent-libs v0.12.1 github.com/elastic/elastic-agent-system-metrics v0.11.1 github.com/elastic/go-elasticsearch/v8 v8.14.0 - github.com/elastic/go-quark v0.1.2 + github.com/elastic/go-quark v0.2.0 github.com/elastic/go-sfdc v0.0.0-20241010131323-8e176480d727 github.com/elastic/mito v1.15.0 github.com/elastic/tk-btf v0.1.0 diff --git a/go.sum b/go.sum index 3eadfda4509..a2b78a384f4 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko= github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 h1:q8n4QjcLa4q39Q3fqHRknTBXBtegjriHFrB42YKgXGI= github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod h1:s09U1b4P1ZxnKx2OsqY7KlHdCesqZWIhyq0Gs/QC/Us= -github.com/elastic/go-quark v0.1.2 h1:Hnov9q8D9ofS976SODWWYAZ23IpgPILxTUCiccmhw0c= -github.com/elastic/go-quark v0.1.2/go.mod h1:/ngqgumD/Z5vnFZ4XPN2kCbxnEfG5/Uc+bRvOBabVVA= +github.com/elastic/go-quark v0.2.0 h1:r2BL4NzvhESrrL/yA3AcHt8mwF7fvQDssBAUiOL1sdg= +github.com/elastic/go-quark v0.2.0/go.mod h1:/ngqgumD/Z5vnFZ4XPN2kCbxnEfG5/Uc+bRvOBabVVA= github.com/elastic/go-seccomp-bpf v1.4.0 h1:6y3lYrEHrLH9QzUgOiK8WDqmPaMnnB785WxibCNIOH4= github.com/elastic/go-seccomp-bpf v1.4.0/go.mod h1:wIMxjTbKpWGQk4CV9WltlG6haB4brjSH/dvAohBPM1I= github.com/elastic/go-sfdc v0.0.0-20241010131323-8e176480d727 h1:yuiN60oaQUz2PtNpNhDI2H6zrCdfiiptmNdwV5WUaKA= From d3876d7c444cbbdbb43e4e8f0e4eb72421a1b91b Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Thu, 24 Oct 2024 17:11:33 +0300 Subject: [PATCH 2/6] Added weekly macos pipeline (#41308) --- .buildkite/macos-tests-pipeline.yml | 27 +++++++++++++++++++ catalog-info.yaml | 41 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 .buildkite/macos-tests-pipeline.yml diff --git a/.buildkite/macos-tests-pipeline.yml b/.buildkite/macos-tests-pipeline.yml new file mode 100644 index 00000000000..94f3f00248a --- /dev/null +++ b/.buildkite/macos-tests-pipeline.yml @@ -0,0 +1,27 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json + +env: + IMAGE_MACOS_ARM: "generic-13-ventura-arm" + IMAGE_MACOS_X86_64: "generic-13-ventura-x64" + + # Other deps + ASDF_MAGE_VERSION: 1.15.0 + ASDF_NODEJS_VERSION: 18.17.1 + ASDF_PYTHON_VERSION: 3.10.9 + + # Unit tests + RACE_DETECTOR: "true" + TEST_COVERAGE: "true" + +steps: + - label: ":mac: Auditbeat: macOS x86_64 Unit Tests" + command: echo "test!" + retry: + automatic: + - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability + agents: + provider: "orka" + imagePrefix: "${IMAGE_MACOS_X86_64}" + artifact_paths: + - "auditbeat/build/*.xml" + - "auditbeat/build/*.json" diff --git a/catalog-info.yaml b/catalog-info.yaml index 61a12a15cd6..d4a48a5a1aa 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -1149,6 +1149,40 @@ spec: everyone: access_level: BUILD_AND_READ +--- +# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: beats-macos-tests + description: 'Runs of Beats macOS tests' + links: + - title: Pipeline + url: https://buildkite.com/elastic/beats-macos-tests +spec: + type: buildkite-pipeline + owner: group:ingest-fp + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: beats-macos-tests + description: 'Runs of Beats macOS tests' + spec: + repository: elastic/beats + pipeline_file: ".buildkite/macos-tests-pipeline.yml" + cancel_intermediate_builds: false + provider_settings: + trigger_mode: none + teams: + ingest-fp: + access_level: MANAGE_BUILD_AND_READ + release-eng: + access_level: BUILD_AND_READ + everyone: + access_level: BUILD_AND_READ + --- # yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json apiVersion: backstage.io/v1alpha1 @@ -1186,6 +1220,12 @@ spec: message: Daily trigger of Beats AWS tests env: PIPELINES_TO_TRIGGER: 'beats-aws-tests' + Weekly run of macOS tests: + branch: main + cronline: 0 0 * * 0 + message: Weekly trigger of Beats macOS tests + env: + PIPELINES_TO_TRIGGER: 'beats-macos-tests' skip_intermediate_builds: true provider_settings: trigger_mode: none @@ -1200,3 +1240,4 @@ spec: access_level: BUILD_AND_READ everyone: access_level: BUILD_AND_READ + From 3a96d4bcc563b629bd2358e91a94ec7b9238029a Mon Sep 17 00:00:00 2001 From: Liam Thompson <32779855+leemthompo@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:15:42 +0200 Subject: [PATCH 3/6] [DOCS] Fix typo in changeling (#41314) --- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 6b5731b98d3..5c273f7bfb1 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -480,7 +480,7 @@ https://github.com/elastic/beats/compare/v8.13.2\...v8.13.3[View commits] *Affecting all Beats* -- Update Go version to 1.21.9. {pulk}38727[38727] +- Update Go version to 1.21.9. {pull}38727[38727] - The environment variable `BEATS_ADD_CLOUD_METADATA_PROVIDERS` overrides configured/default `add_cloud_metadata` providers. {pull}38669[38669] *Auditbeat* From a20fbdfaaf1d7156fd8033408651e2d42ab69807 Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Fri, 25 Oct 2024 07:06:51 +1030 Subject: [PATCH 4/6] x-pack/filebeat/input/entityanalytics/provider/internal/jamf: remove incorrect comments (#41411) --- .../input/entityanalytics/provider/jamf/internal/jamf/jamf.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf/jamf.go b/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf/jamf.go index d30562ca567..98f98499882 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf/jamf.go +++ b/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf/jamf.go @@ -205,9 +205,6 @@ func GetComputers(ctx context.Context, cli *http.Client, tenant string, tok Toke // GetUsers returns Jamf users using the list users API endpoint. tenant is the // Jamf user domain and key is the API token to use for the query. If user is not empty, // details for the specific user are returned, otherwise a list of all users is returned. -// The query parameter holds queries as described in https://developer.Jamf.com/docs/reference/user-query/ -// with the query syntax described at https://developer.Jamf.com/docs/reference/core-Jamf-api/#filter. -// Parts of the response may be omitted using the omit parameter. // // See https://developer.jamf.com/jamf-pro/reference/findusers for details. func GetUsers(ctx context.Context, cli *http.Client, tenant string, tok Token, query url.Values) ([]User, error) { From cac52436cc4245eb0a8ae184c1086e38ac1edbc4 Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Fri, 25 Oct 2024 07:07:11 +1030 Subject: [PATCH 5/6] x-pack/filebeat/docs/input: clarify interaction between split and cursor updates (#41384) --- x-pack/filebeat/docs/inputs/input-httpjson.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc b/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc index 21766a515a8..a7dd5d7634f 100644 --- a/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc @@ -783,6 +783,8 @@ Valid when used with `type: map`. When not empty, defines a new field where the If set to true, empty or missing value will be ignored and processing will pass on to the next nested split operation instead of failing with an error. Default: `false`. +Note that if `ignore_empty_value` is `true` and the final result is empty, no event will be published, and no cursor update will be made. If a cursor update must be made for all responses, this should be set to `false` and the ingest pipeline must be configured to tolerate empty event sets. + [float] ==== `response.split[].split` @@ -1556,6 +1558,8 @@ See <> . Cursor is a list of key value objects where arbitrary values are defined. The values are interpreted as <> and a default template can be set. Cursor state is kept between input restarts and updated once all the events for a request are published. +If no event is published, no cursor update is made. This can have implications on how cursor updates should be performed when the target API returns empty response sets. + Each cursor entry is formed by: - A `value` template, which will define the value to store when evaluated. From efbc4ff65c231a9c9c7256c3f41f94bae1989991 Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Fri, 25 Oct 2024 00:14:40 -0700 Subject: [PATCH 6/6] Add Integration tests to Auditbeat CI pipeline (#37892) Refactor the CI integration test steps for the Auditbeat pipeline to use build matrices for Linux tests. By doing this, it will be easier to add additional VM types to the integration tests in the future. With this, the integration tests will run on Ubuntu 20.04, 22.04, 24.04 for both x86_64 and arm64, and RHEL 9 x86_64. --- .buildkite/auditbeat/auditbeat-pipeline.yml | 38 +++++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index e083df17749..b65044e7344 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -3,7 +3,6 @@ name: "beats-auditbeat" 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" @@ -12,7 +11,12 @@ env: IMAGE_MACOS_ARM: "generic-13-ventura-arm" IMAGE_MACOS_X86_64: "generic-13-ventura-x64" IMAGE_RHEL9: "family/platform-ingest-beats-rhel-9" - IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" + IMAGE_UBUNTU_2004_X86_64: "family/platform-ingest-beats-ubuntu-2004" + IMAGE_UBUNTU_2004_ARM64: "platform-ingest-beats-ubuntu-2004-aarch64" + IMAGE_UBUNTU_2204_X86_64: "family/platform-ingest-beats-ubuntu-2204" + IMAGE_UBUNTU_2204_ARM64: "platform-ingest-beats-ubuntu-2204-aarch64" + IMAGE_UBUNTU_2404_X86_64: "family/platform-ingest-beats-ubuntu-2404" + IMAGE_UBUNTU_2404_ARM64: "platform-ingest-beats-ubuntu-2404-aarch64" 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" @@ -81,7 +85,7 @@ steps: - limit: 1 agents: provider: "gcp" - image: "${IMAGE_UBUNTU_X86_64}" + image: "${IMAGE_UBUNTU_2204_X86_64}" machineType: "${GCP_DEFAULT_MACHINE_TYPE}" artifact_paths: - "auditbeat/build/*.xml" @@ -181,7 +185,7 @@ steps: - limit: 1 agents: provider: "gcp" - image: "${IMAGE_UBUNTU_X86_64}" + image: "${IMAGE_UBUNTU_2204_X86_64}" machineType: "${GCP_HI_PERF_MACHINE_TYPE}" notify: - github_commit_status: @@ -192,7 +196,7 @@ steps: if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm|integrations).*/ steps: - - label: ":ubuntu: Auditbeat: Ubuntu x86_64 Integration Tests" + - label: ":ubuntu: Auditbeat: Ubuntu x86_64 Integration Tests -- {{matrix.image}}" key: "auditbeat-extended-integ-tests" if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/ command: | @@ -204,7 +208,7 @@ steps: - limit: 1 agents: provider: "gcp" - image: "${IMAGE_UBUNTU_X86_64}" + image: "{{matrix.image}}" machineType: "${GCP_DEFAULT_MACHINE_TYPE}" artifact_paths: - "auditbeat/build/*.xml" @@ -218,8 +222,14 @@ steps: notify: - github_commit_status: context: "auditbeat: Ubuntu x86_64 Integration Tests" + matrix: + setup: + image: + - "${IMAGE_UBUNTU_2004_X86_64}" + - "${IMAGE_UBUNTU_2204_X86_64}" + - "${IMAGE_UBUNTU_2404_X86_64}" - - label: ":ubuntu: Auditbeat: Ubuntu arm64 Integration Tests" + - label: ":ubuntu: Auditbeat: Ubuntu arm64 Integration Tests -- {{matrix.image}}" key: "auditbeat-extended-arm64-integ-tests" if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/ command: | @@ -231,7 +241,7 @@ steps: - limit: 1 agents: provider: "aws" - imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" + imagePrefix: "{{matrix.image}}" instanceType: "${AWS_ARM_INSTANCE_TYPE}" artifact_paths: - "auditbeat/build/*.xml" @@ -245,6 +255,12 @@ steps: notify: - github_commit_status: context: "auditbeat: Ubuntu arm64 Integration Tests" + matrix: + setup: + image: + - "${IMAGE_UBUNTU_2004_ARM64}" + - "${IMAGE_UBUNTU_2204_ARM64}" + - "${IMAGE_UBUNTU_2404_ARM64}" - label: ":ubuntu: Auditbeat: Ubuntu arm64 Unit Tests" key: "auditbeat-extended-arm64-unit-tests" @@ -258,7 +274,7 @@ steps: - limit: 1 agents: provider: "aws" - imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" + imagePrefix: "${IMAGE_UBUNTU_2204_ARM64}" instanceType: "${AWS_ARM_INSTANCE_TYPE}" artifact_paths: - "auditbeat/build/*.xml" @@ -436,7 +452,7 @@ steps: timeout_in_minutes: 20 agents: provider: gcp - image: "${IMAGE_UBUNTU_X86_64}" + image: "${IMAGE_UBUNTU_2204_X86_64}" machineType: "${GCP_HI_PERF_MACHINE_TYPE}" notify: - github_commit_status: @@ -457,7 +473,7 @@ steps: timeout_in_minutes: 20 agents: provider: "aws" - imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" + imagePrefix: "${IMAGE_UBUNTU_2204_ARM64}" instanceType: "${AWS_ARM_INSTANCE_TYPE}" notify: - github_commit_status: