Skip to content

Commit 0bf9d7d

Browse files
michel-latermanmichel-laterman
committed
Merge remote-tracking branch 'origin/8.19' into mergify/bp/8.19/pr-8422
2 parents 3534203 + b3edb4e commit 0bf9d7d

File tree

63 files changed

+473
-264
lines changed

Some content is hidden

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

63 files changed

+473
-264
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ steps:
6161
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
6262
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
6363
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
64+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
6465
command: |
6566
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips'
6667
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
@@ -90,6 +91,7 @@ steps:
9091
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
9192
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
9293
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
94+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
9395
command: |
9496
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips'
9597
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ steps:
130130
- label: "Win2022:sudo:{{matrix}}"
131131
depends_on:
132132
- packaging-windows
133+
env:
134+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
133135
command: |
134136
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
135137
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -155,6 +157,8 @@ steps:
155157
- label: "Win2022:non-sudo:{{matrix}}"
156158
depends_on:
157159
- packaging-windows
160+
env:
161+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
158162
command: |
159163
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
160164
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -174,6 +178,8 @@ steps:
174178
- label: "Win2025:sudo:{{matrix}}"
175179
depends_on:
176180
- packaging-windows
181+
env:
182+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
177183
command: |
178184
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
179185
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -200,6 +206,8 @@ steps:
200206
- label: "Win2025:non-sudo:{{matrix}}"
201207
depends_on:
202208
- packaging-windows
209+
env:
210+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
203211
command: |
204212
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
205213
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -226,6 +234,8 @@ steps:
226234
steps:
227235
- label: "x86_64:non-sudo: {{matrix}}"
228236
depends_on: packaging-ubuntu-x86-64
237+
env:
238+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
229239
command: |
230240
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
231241
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -246,6 +256,8 @@ steps:
246256
depends_on:
247257
- packaging-ubuntu-x86-64
248258
# due to deb group present in matrix tar.gz and deb packages artifacts are required
259+
env:
260+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
249261
command: |
250262
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
251263
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -277,6 +289,8 @@ steps:
277289
- label: "arm:sudo: {{matrix}}"
278290
depends_on:
279291
- packaging-ubuntu-arm64
292+
env:
293+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
280294
command: |
281295
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
282296
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -310,6 +324,8 @@ steps:
310324
skip: true
311325
depends_on:
312326
- packaging-ubuntu-arm64
327+
env:
328+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
313329
command: |
314330
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
315331
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -336,6 +352,8 @@ steps:
336352
steps:
337353
- label: "x86_64:non-sudo: {{matrix}}"
338354
depends_on: packaging-ubuntu-x86-64
355+
env:
356+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
339357
command: |
340358
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
341359
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -356,6 +374,8 @@ steps:
356374
depends_on:
357375
- packaging-ubuntu-x86-64
358376
# due to deb group present in matrix tar.gz and deb packages artifacts are required
377+
env:
378+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
359379
command: |
360380
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
361381
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -397,6 +417,8 @@ steps:
397417
- label: "x86_64:sudo:rpm"
398418
depends_on:
399419
- packaging-ubuntu-x86-64
420+
env:
421+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
400422
command: |
401423
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
402424
.buildkite/scripts/steps/integration_tests_tf.sh rpm true

‎.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:

‎NOTICE-fips.txt‎

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250624070124-8e1732a1b199
790+
Version: v7.0.0-alpha2.0.20250625233418-1eec383034c2
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250624070124-8e1732a1b199/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250625233418-1eec383034c2/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -17544,11 +17544,11 @@ THE SOFTWARE.
1754417544

1754517545
--------------------------------------------------------------------------------
1754617546
Dependency : golang.org/x/crypto
17547-
Version: v0.38.0
17547+
Version: v0.39.0
1754817548
Licence type (autodetected): BSD-3-Clause
1754917549
--------------------------------------------------------------------------------
1755017550

17551-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.38.0/LICENSE:
17551+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.39.0/LICENSE:
1755217552

1755317553
Copyright 2009 The Go Authors.
1755417554

@@ -17655,11 +17655,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1765517655

1765617656
--------------------------------------------------------------------------------
1765717657
Dependency : golang.org/x/sync
17658-
Version: v0.14.0
17658+
Version: v0.15.0
1765917659
Licence type (autodetected): BSD-3-Clause
1766017660
--------------------------------------------------------------------------------
1766117661

17662-
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.14.0/LICENSE:
17662+
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.15.0/LICENSE:
1766317663

1766417664
Copyright 2009 The Go Authors.
1766517665

@@ -17766,11 +17766,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1776617766

1776717767
--------------------------------------------------------------------------------
1776817768
Dependency : golang.org/x/text
17769-
Version: v0.25.0
17769+
Version: v0.26.0
1777017770
Licence type (autodetected): BSD-3-Clause
1777117771
--------------------------------------------------------------------------------
1777217772

17773-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.25.0/LICENSE:
17773+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.26.0/LICENSE:
1777417774

1777517775
Copyright 2009 The Go Authors.
1777617776

@@ -56198,11 +56198,11 @@ SOFTWARE.
5619856198

5619956199
--------------------------------------------------------------------------------
5620056200
Dependency : github.com/tommyers-elastic/dashboard-api-go/v3
56201-
Version: v3.0.0-20250514220331-e52c94766b6f
56201+
Version: v3.0.0-20250616163611-a325b49669a4
5620256202
Licence type (autodetected): MIT
5620356203
--------------------------------------------------------------------------------
5620456204

56205-
Contents of probable licence file $GOMODCACHE/github.com/tommyers-elastic/dashboard-api-go/v3@v3.0.0-20250514220331-e52c94766b6f/LICENSE:
56205+
Contents of probable licence file $GOMODCACHE/github.com/tommyers-elastic/dashboard-api-go/v3@v3.0.0-20250616163611-a325b49669a4/LICENSE:
5620656206

5620756207
MIT License
5620856208

@@ -66263,6 +66263,37 @@ Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.8.0
6626366263
limitations under the License.
6626466264

6626566265

66266+
--------------------------------------------------------------------------------
66267+
Dependency : github.com/tomnomnom/linkheader
66268+
Version: v0.0.0-20180905144013-02ca5825eb80
66269+
Licence type (autodetected): MIT
66270+
--------------------------------------------------------------------------------
66271+
66272+
Contents of probable licence file $GOMODCACHE/github.com/tomnomnom/linkheader@v0.0.0-20180905144013-02ca5825eb80/LICENSE:
66273+
66274+
MIT License
66275+
66276+
Copyright (c) 2016 Tom Hudson
66277+
66278+
Permission is hereby granted, free of charge, to any person obtaining a copy
66279+
of this software and associated documentation files (the "Software"), to deal
66280+
in the Software without restriction, including without limitation the rights
66281+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
66282+
copies of the Software, and to permit persons to whom the Software is
66283+
furnished to do so, subject to the following conditions:
66284+
66285+
The above copyright notice and this permission notice shall be included in all
66286+
copies or substantial portions of the Software.
66287+
66288+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
66289+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
66290+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
66291+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
66292+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
66293+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
66294+
SOFTWARE.
66295+
66296+
6626666297
--------------------------------------------------------------------------------
6626766298
Dependency : github.com/twmb/murmur3
6626866299
Version: v1.1.8

‎NOTICE.txt‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250624070124-8e1732a1b199
790+
Version: v7.0.0-alpha2.0.20250625233418-1eec383034c2
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250624070124-8e1732a1b199/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250625233418-1eec383034c2/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -18177,11 +18177,11 @@ THE SOFTWARE.
1817718177

1817818178
--------------------------------------------------------------------------------
1817918179
Dependency : golang.org/x/crypto
18180-
Version: v0.38.0
18180+
Version: v0.39.0
1818118181
Licence type (autodetected): BSD-3-Clause
1818218182
--------------------------------------------------------------------------------
1818318183

18184-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.38.0/LICENSE:
18184+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.39.0/LICENSE:
1818518185

1818618186
Copyright 2009 The Go Authors.
1818718187

@@ -18288,11 +18288,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1828818288

1828918289
--------------------------------------------------------------------------------
1829018290
Dependency : golang.org/x/sync
18291-
Version: v0.14.0
18291+
Version: v0.15.0
1829218292
Licence type (autodetected): BSD-3-Clause
1829318293
--------------------------------------------------------------------------------
1829418294

18295-
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.14.0/LICENSE:
18295+
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.15.0/LICENSE:
1829618296

1829718297
Copyright 2009 The Go Authors.
1829818298

@@ -18399,11 +18399,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1839918399

1840018400
--------------------------------------------------------------------------------
1840118401
Dependency : golang.org/x/text
18402-
Version: v0.25.0
18402+
Version: v0.26.0
1840318403
Licence type (autodetected): BSD-3-Clause
1840418404
--------------------------------------------------------------------------------
1840518405

18406-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.25.0/LICENSE:
18406+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.26.0/LICENSE:
1840718407

1840818408
Copyright 2009 The Go Authors.
1840918409

@@ -62060,11 +62060,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
6206062060

6206162061
--------------------------------------------------------------------------------
6206262062
Dependency : github.com/tommyers-elastic/dashboard-api-go/v3
62063-
Version: v3.0.0-20250514220331-e52c94766b6f
62063+
Version: v3.0.0-20250616163611-a325b49669a4
6206462064
Licence type (autodetected): MIT
6206562065
--------------------------------------------------------------------------------
6206662066

62067-
Contents of probable licence file $GOMODCACHE/github.com/tommyers-elastic/dashboard-api-go/v3@v3.0.0-20250514220331-e52c94766b6f/LICENSE:
62067+
Contents of probable licence file $GOMODCACHE/github.com/tommyers-elastic/dashboard-api-go/v3@v3.0.0-20250616163611-a325b49669a4/LICENSE:
6206862068

6206962069
MIT License
6207062070

@@ -62090,11 +62090,11 @@ SOFTWARE.
6209062090

6209162091
--------------------------------------------------------------------------------
6209262092
Dependency : github.com/microsoft/go-mssqldb
62093-
Version: v1.7.2
62093+
Version: v1.8.2
6209462094
Licence type (autodetected): BSD-3-Clause
6209562095
--------------------------------------------------------------------------------
6209662096

62097-
Contents of probable licence file $GOMODCACHE/github.com/microsoft/go-mssqldb@v1.7.2/LICENSE.txt:
62097+
Contents of probable licence file $GOMODCACHE/github.com/microsoft/go-mssqldb@v1.8.2/LICENSE.txt:
6209862098

6209962099
Copyright (c) 2012 The Go Authors. All rights reserved.
6210062100
Copyright (c) Microsoft Corporation.
@@ -74838,6 +74838,37 @@ Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.8.0
7483874838
limitations under the License.
7483974839

7484074840

74841+
--------------------------------------------------------------------------------
74842+
Dependency : github.com/tomnomnom/linkheader
74843+
Version: v0.0.0-20180905144013-02ca5825eb80
74844+
Licence type (autodetected): MIT
74845+
--------------------------------------------------------------------------------
74846+
74847+
Contents of probable licence file $GOMODCACHE/github.com/tomnomnom/linkheader@v0.0.0-20180905144013-02ca5825eb80/LICENSE:
74848+
74849+
MIT License
74850+
74851+
Copyright (c) 2016 Tom Hudson
74852+
74853+
Permission is hereby granted, free of charge, to any person obtaining a copy
74854+
of this software and associated documentation files (the "Software"), to deal
74855+
in the Software without restriction, including without limitation the rights
74856+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
74857+
copies of the Software, and to permit persons to whom the Software is
74858+
furnished to do so, subject to the following conditions:
74859+
74860+
The above copyright notice and this permission notice shall be included in all
74861+
copies or substantial portions of the Software.
74862+
74863+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
74864+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
74865+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
74866+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
74867+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
74868+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
74869+
SOFTWARE.
74870+
74871+
7484174872
--------------------------------------------------------------------------------
7484274873
Dependency : github.com/twmb/murmur3
7484374874
Version: v1.1.8

0 commit comments

Comments
 (0)