Skip to content

Commit a8002fb

Browse files
MichaelKatsoulisMichaelKatsoulis
authored
Merge branch '9.5' into mergify/bp/9.5/pr-49734
2 parents b038936 + d3fa6c7 commit a8002fb

26 files changed

Lines changed: 244 additions & 152 deletions

‎.buildkite/auditbeat/auditbeat-pipeline.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ env:
1010

1111
# The following images are defined here and their values will be updated by updatecli
1212
# Please do not change them manually.
13-
IMAGE_RHEL9: "platform-ingest-beats-rhel-9-1781496166"
14-
IMAGE_UBUNTU_2004_X86_64: "platform-ingest-beats-ubuntu-2004-1781496166"
15-
IMAGE_UBUNTU_2004_ARM64: "platform-ingest-beats-ubuntu-2004-aarch64-1781496166"
16-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
17-
IMAGE_UBUNTU_2204_ARM64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
18-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-beats-ubuntu-2404-1781496166"
19-
IMAGE_UBUNTU_2404_ARM64: "platform-ingest-beats-ubuntu-2404-aarch64-1781496166"
13+
IMAGE_RHEL9: "platform-ingest-beats-rhel-9-1782878510"
14+
IMAGE_UBUNTU_2004_X86_64: "platform-ingest-beats-ubuntu-2004-1782878510"
15+
IMAGE_UBUNTU_2004_ARM64: "platform-ingest-beats-ubuntu-2004-aarch64-1782878510"
16+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
17+
IMAGE_UBUNTU_2204_ARM64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
18+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-beats-ubuntu-2404-1782878510"
19+
IMAGE_UBUNTU_2404_ARM64: "platform-ingest-beats-ubuntu-2404-aarch64-1782878510"
2020
IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
2121
IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
22-
IMAGE_WIN_10_VERSION: "1.0.1781496166"
23-
IMAGE_WIN_11_VERSION: "1.0.1781496166"
24-
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
25-
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
26-
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
27-
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1781496166"
22+
IMAGE_WIN_10_VERSION: "1.0.1782878510"
23+
IMAGE_WIN_11_VERSION: "1.0.1782878510"
24+
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
25+
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
26+
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
27+
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1782878510"
2828

2929
IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
3030

‎.buildkite/aws-tests-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
env:
44
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
5-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
5+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
66

77
# TEST_TAGS should be reviewed and updated: https://github.com/elastic/ingest-dev/issues/3476
88
TEST_TAGS: "aws"

‎.buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
22

33
env:
4-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
4+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
55
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
66
MODULE: "kubernetes"
77

‎.buildkite/filebeat/filebeat-pipeline.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ name: "beats-filebeat"
33

44
env:
55
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
6-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
6+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
77

88
GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
99
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
1010
GCP_WIN_MACHINE_TYPE: "n2-standard-8"
1111

12-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
12+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
1313
IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
1414
IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
15-
IMAGE_WIN_10_VERSION: "1.0.1781496166"
16-
IMAGE_WIN_11_VERSION: "1.0.1781496166"
17-
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
18-
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
19-
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
20-
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1781496166"
15+
IMAGE_WIN_10_VERSION: "1.0.1782878510"
16+
IMAGE_WIN_11_VERSION: "1.0.1782878510"
17+
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
18+
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
19+
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
20+
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1782878510"
2121

2222
IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
2323

‎.buildkite/heartbeat/heartbeat-pipeline.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
env:
44
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
5-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
5+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
66

77
GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
88
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
99
GCP_WIN_MACHINE_TYPE: "n2-standard-8"
1010

11-
IMAGE_RHEL9: "platform-ingest-beats-rhel-9-1781496166"
12-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
11+
IMAGE_RHEL9: "platform-ingest-beats-rhel-9-1782878510"
12+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
1313
IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
1414
IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
15-
IMAGE_WIN_10_VERSION: "1.0.1781496166"
16-
IMAGE_WIN_11_VERSION: "1.0.1781496166"
17-
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
18-
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
19-
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
15+
IMAGE_WIN_10_VERSION: "1.0.1782878510"
16+
IMAGE_WIN_11_VERSION: "1.0.1782878510"
17+
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
18+
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
19+
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
2020

2121
IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
2222

‎.buildkite/ironbank-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
# Other deps
55
ASDF_MAGE_VERSION: 1.15.0
66

7-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
7+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
88

99
steps:
1010
- label: ":package: :test_tube: Package and Validate Iron Bank for x-pack/heartbeat"

‎.buildkite/libbeat/pipeline.libbeat.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ name: "beats-libbeat"
33

44
env:
55
AWS_ARM_INSTANCE_TYPE: "t4g.xlarge"
6-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2004-aarch64-1781496166"
6+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2004-aarch64-1782878510"
77

88
GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
99
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
1010
GCP_WIN_MACHINE_TYPE: "n2-standard-8"
11-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
11+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
1212
IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
1313
IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
14-
IMAGE_WIN_10_VERSION: "1.0.1781496166"
15-
IMAGE_WIN_11_VERSION: "1.0.1781496166"
16-
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
17-
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
18-
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
14+
IMAGE_WIN_10_VERSION: "1.0.1782878510"
15+
IMAGE_WIN_11_VERSION: "1.0.1782878510"
16+
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
17+
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
18+
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
1919
IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
2020

2121
#Deps

‎.buildkite/metricbeat/pipeline.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ name: "beats-metricbeat"
33

44
env:
55
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
6-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
6+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
77

88
GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
99
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
1010
GCP_WIN_MACHINE_TYPE: "n2-standard-8"
1111

12-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
12+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
1313
IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
1414
IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
15-
IMAGE_WIN_10_VERSION: "1.0.1781496166"
16-
IMAGE_WIN_11_VERSION: "1.0.1781496166"
17-
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
18-
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
19-
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
20-
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1781496166"
15+
IMAGE_WIN_10_VERSION: "1.0.1782878510"
16+
IMAGE_WIN_11_VERSION: "1.0.1782878510"
17+
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
18+
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
19+
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
20+
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1782878510"
2121

2222
IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
2323

‎.buildkite/packaging.pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
env:
55
ASDF_MAGE_VERSION: 1.15.0
66
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
7-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
7+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
88
GCP_DEFAULT_MACHINE_TYPE: "c2d-standard-8"
9-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
9+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
1010

1111
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
1212
PLATFORMS_ARM: "+all linux/arm64 darwin/arm64 windows/arm64"

‎.buildkite/packetbeat/pipeline.packetbeat.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ name: "beats-packetbeat"
33

44
env:
55
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
6-
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1781496166"
6+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64-1782878510"
77

88
GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
99
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
1010
GCP_WIN_MACHINE_TYPE: "n2-standard-8"
1111

12-
IMAGE_RHEL9_X86_64: "platform-ingest-beats-rhel-9-1781496166"
13-
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
12+
IMAGE_RHEL9_X86_64: "platform-ingest-beats-rhel-9-1782878510"
13+
IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
1414
IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
1515
IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
16-
IMAGE_WIN_10_VERSION: "1.0.1781496166"
17-
IMAGE_WIN_11_VERSION: "1.0.1781496166"
18-
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
19-
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
20-
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
21-
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1781496166"
16+
IMAGE_WIN_10_VERSION: "1.0.1782878510"
17+
IMAGE_WIN_11_VERSION: "1.0.1782878510"
18+
IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
19+
IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
20+
IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
21+
IMAGE_WIN_2025: "platform-ingest-beats-windows-2025-1782878510"
2222

2323
IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
2424

0 commit comments

Comments
 (0)