Skip to content

Commit dbb9a24

Browse files
pkoutsovasilispkoutsovasilis
authored
Merge branch '9.0' into mergify/bp/9.0/pr-8573
2 parents 84ee974 + c2d6096 commit dbb9a24

File tree

344 files changed

+64206
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+64206
-949
lines changed

‎.buildkite/bk.integration.pipeline.yml

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1749862860"
10-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1749862860"
11-
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1749862860"
12-
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1749862860"
13-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749862860"
14-
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1749862860"
9+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1751072471"
10+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1751072471"
11+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1751072471"
12+
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1751072471"
13+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
14+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1751072471"
15+
# Remove AGENT_PACKAGE_VERSION pinning once 9.0.4 DRA and stack are released
16+
AGENT_VERSION: "9.0.3-SNAPSHOT"
1517

1618
# This section is used to define the plugins that will be used in the pipeline.
1719
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -130,6 +132,8 @@ steps:
130132
- label: "Win2022:sudo:{{matrix}}"
131133
depends_on:
132134
- packaging-windows
135+
env:
136+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
133137
command: |
134138
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
135139
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -156,6 +160,8 @@ steps:
156160
- label: "Win2022:non-sudo:{{matrix}}"
157161
depends_on:
158162
- packaging-windows
163+
env:
164+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
159165
command: |
160166
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
161167
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -175,6 +181,8 @@ steps:
175181
- label: "Win2025:sudo:{{matrix}}"
176182
depends_on:
177183
- packaging-windows
184+
env:
185+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
178186
command: |
179187
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
180188
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -201,6 +209,8 @@ steps:
201209
- label: "Win2025:non-sudo:{{matrix}}"
202210
depends_on:
203211
- packaging-windows
212+
env:
213+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
204214
command: |
205215
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
206216
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -227,6 +237,8 @@ steps:
227237
steps:
228238
- label: "x86_64:non-sudo: {{matrix}}"
229239
depends_on: packaging-ubuntu-x86-64
240+
env:
241+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
230242
command: |
231243
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
232244
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -247,6 +259,8 @@ steps:
247259
depends_on:
248260
- packaging-ubuntu-x86-64
249261
# due to deb group present in matrix tar.gz and deb packages artifacts are required
262+
env:
263+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
250264
command: |
251265
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
252266
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -279,6 +293,8 @@ steps:
279293
- label: "arm:sudo: {{matrix}}"
280294
depends_on:
281295
- packaging-ubuntu-arm64
296+
env:
297+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
282298
command: |
283299
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
284300
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -313,6 +329,8 @@ steps:
313329
skip: true
314330
depends_on:
315331
- packaging-ubuntu-arm64
332+
env:
333+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
316334
command: |
317335
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
318336
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -339,6 +357,8 @@ steps:
339357
steps:
340358
- label: "x86_64:non-sudo: {{matrix}}"
341359
depends_on: packaging-ubuntu-x86-64
360+
env:
361+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
342362
command: |
343363
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
344364
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -359,6 +379,8 @@ steps:
359379
depends_on:
360380
- packaging-ubuntu-x86-64
361381
# due to deb group present in matrix tar.gz and deb packages artifacts are required
382+
env:
383+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
362384
command: |
363385
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
364386
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -400,6 +422,8 @@ steps:
400422
- label: "x86_64:sudo:rpm"
401423
depends_on:
402424
- packaging-ubuntu-x86-64
425+
env:
426+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
403427
command: |
404428
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
405429
.buildkite/scripts/steps/integration_tests_tf.sh rpm true

‎.buildkite/integration.pipeline.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
env:
44
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
5+
# Remove AGENT_PACKAGE_VERSION and BEAT_VERSION pinning once 9.0.4 DRA and stack are released
6+
AGENT_PACKAGE_VERSION: "9.0.3"
7+
BEAT_VERSION: "9.0.3"
58

69
steps:
710
- group: "Integration tests: packaging"

‎.buildkite/pipeline.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ env:
55

66
# The following images are defined here and their values will be updated by updatecli
77
# Please do not change them manually.
8-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1749862860"
9-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1749862860"
10-
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1749862860"
11-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749862860"
12-
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1749862860"
13-
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1749862860"
8+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1751072471"
9+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1751072471"
10+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1751072471"
11+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
12+
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1751072471"
13+
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1751072471"
1414

1515
steps:
1616
- label: "check-ci"

‎.buildkite/scripts/buildkite-integration-tests.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ go install gotest.tools/gotestsum
2525
gotestsum --version
2626

2727
$env:TEST_BINARY_NAME = "elastic-agent"
28-
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
29-
$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
30-
$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
28+
if (-not $env:AGENT_VERSION) {
29+
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
30+
$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
31+
$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
32+
}
3133

3234
Write-Output "~~~ Agent version: $env:AGENT_VERSION"
3335
$env:SNAPSHOT = $true

‎.buildkite/scripts/buildkite-integration-tests.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ echo "~~~ Running integration tests as $USER"
3232

3333
make install-gotestsum
3434

35-
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
36-
AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
37-
AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
35+
if [[ -z "${AGENT_VERSION:-}" ]]; then
36+
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
37+
AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
38+
AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
39+
fi
40+
3841
export AGENT_VERSION
3942
echo "~~~ Agent version: ${AGENT_VERSION}"
4043

‎.buildkite/scripts/common.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ fi
99
if [[ -z "${SETUP_GVM_VERSION-""}" ]]; then
1010
SETUP_GVM_VERSION="v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
1111
fi
12-
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
13-
export BEAT_VERSION
12+
13+
if [[ -z "${BEAT_VERSION-""}" ]]; then
14+
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
15+
export BEAT_VERSION
16+
fi
1417

1518
getOSOptions() {
1619
case $(uname | tr '[:upper:]' '[:lower:]') in

‎.buildkite/scripts/steps/integration_tests_tf.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ if [[ "${BUILDKITE_RETRY_COUNT}" -gt 0 ]]; then
3636
echo "~~~ The steps is retried, starting the ESS stack again"
3737
trap 'ess_down' EXIT
3838
ess_up $OVERRIDE_STACK_VERSION || (echo -e "^^^ +++\nFailed to start ESS stack")
39-
preinstall_fleet_packages
4039
else
4140
# For the first run, we start the stack in the start_ess.sh step and it sets the meta-data
4241
echo "~~~ Receiving ESS stack metadata"

‎.ci/updatecli/updatecli-bump-vm-images.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ actions:
2626
labels:
2727
- dependencies
2828
- backport-skip
29+
- skip-changelog
2930
title: '[{{ requiredEnv "BRANCH_NAME" }}][Automation] Bump VM Image version to {{ source "latestVersion" }}'
3031

3132
sources:

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ check-ci:
4141
@mage -v helm:lint
4242
@mage -v helm:updateAgentVersion
4343
@mage -v helm:renderExamples
44+
@mage -v integration:buildKubernetesTestData
4445
@$(MAKE) check-no-changes
4546

4647
## check: run all the checks including linting using golangci-lint.

‎NOTICE.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,36 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
109109
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
110110

111111

112+
--------------------------------------------------------------------------------
113+
Dependency : github.com/cenkalti/backoff/v5
114+
Version: v5.0.2
115+
Licence type (autodetected): MIT
116+
--------------------------------------------------------------------------------
117+
118+
Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/[email protected]/LICENSE:
119+
120+
The MIT License (MIT)
121+
122+
Copyright (c) 2014 Cenk Altı
123+
124+
Permission is hereby granted, free of charge, to any person obtaining a copy of
125+
this software and associated documentation files (the "Software"), to deal in
126+
the Software without restriction, including without limitation the rights to
127+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
128+
the Software, and to permit persons to whom the Software is furnished to do so,
129+
subject to the following conditions:
130+
131+
The above copyright notice and this permission notice shall be included in all
132+
copies or substantial portions of the Software.
133+
134+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
135+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
136+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
137+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
138+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
139+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
140+
141+
112142
--------------------------------------------------------------------------------
113143
Dependency : github.com/cespare/xxhash/v2
114144
Version: v2.3.0
@@ -32740,36 +32770,6 @@ SOFTWARE.
3274032770

3274132771

3274232772

32743-
--------------------------------------------------------------------------------
32744-
Dependency : github.com/cenkalti/backoff/v5
32745-
Version: v5.0.2
32746-
Licence type (autodetected): MIT
32747-
--------------------------------------------------------------------------------
32748-
32749-
Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/[email protected]/LICENSE:
32750-
32751-
The MIT License (MIT)
32752-
32753-
Copyright (c) 2014 Cenk Altı
32754-
32755-
Permission is hereby granted, free of charge, to any person obtaining a copy of
32756-
this software and associated documentation files (the "Software"), to deal in
32757-
the Software without restriction, including without limitation the rights to
32758-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
32759-
the Software, and to permit persons to whom the Software is furnished to do so,
32760-
subject to the following conditions:
32761-
32762-
The above copyright notice and this permission notice shall be included in all
32763-
copies or substantial portions of the Software.
32764-
32765-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
32766-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
32767-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
32768-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
32769-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
32770-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32771-
32772-
3277332773
--------------------------------------------------------------------------------
3277432774
Dependency : github.com/cilium/ebpf
3277532775
Version: v0.16.0

0 commit comments

Comments
 (0)