Skip to content

merge queue: embarking 9.0 (60d9aa5) and #19185 together #19244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

merge queue: embarking 9.0 (60d9aa5) and #19185 together #19244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d730079
chore: update-beats with 9.0
elastic-observability-automation[bot] Oct 17, 2025
1e3e91e
chore: update-beats with 9.0
elastic-observability-automation[bot] Oct 20, 2025
8090914
Merge of #19185
mergify[bot] Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NOTICE-fips.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20251016143225-894a6dda1d8a
Version: v7.0.0-alpha2.0.20251020084534-2cb3d8982c84
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251016143225-894a6dda1d8a/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251020084534-2cb3d8982c84/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20251016143225-894a6dda1d8a
Version: v7.0.0-alpha2.0.20251020084534-2cb3d8982c84
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251016143225-894a6dda1d8a/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251020084534-2cb3d8982c84/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/elastic/apm-aggregation v1.2.0
github.com/elastic/apm-data v1.16.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251016143225-894a6dda1d8a
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251020084534-2cb3d8982c84
github.com/elastic/elastic-agent-client/v7 v7.17.0
github.com/elastic/elastic-agent-libs v0.21.5
github.com/elastic/elastic-agent-system-metrics v0.11.11
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ github.com/elastic/apm-perf v0.0.0-20250207152505-1dbeb202ff22 h1:br+XeQOcxNFSv+
github.com/elastic/apm-perf v0.0.0-20250207152505-1dbeb202ff22/go.mod h1:gE+FV7xXv0/nBenviCvpvnvTpUkjJXtuOWs2UT+ZRtw=
github.com/elastic/apm-tools v0.0.0-20250124173757-336011228dbe h1:LDtn/A8Tsfz8DQlbXtmDud9ha9oOGriwJGB7V0Ozik8=
github.com/elastic/apm-tools v0.0.0-20250124173757-336011228dbe/go.mod h1:SIlGcpTnnosxZ3OvoRC7ADxhHdlsu/nwUdVMF9OkgYc=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251016143225-894a6dda1d8a h1:y7fSk63939iWOviCEEBpguOVz4qbmsUS1W95GVI00pg=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251016143225-894a6dda1d8a/go.mod h1:A7JPc6A37KUUwiiwrfTzw2+jSLq0lKOsgMZDMudzvJY=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251020084534-2cb3d8982c84 h1:Gv/CvgOy3dQKSY/w3/cBhjAmtuNxCjxbNuSpI2dFZxk=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251020084534-2cb3d8982c84/go.mod h1:A7JPc6A37KUUwiiwrfTzw2+jSLq0lKOsgMZDMudzvJY=
github.com/elastic/elastic-agent-autodiscover v0.9.2 h1:eBmru2v66HRRHOFf89rDl9OZUr7VsPoT4+ZNYHW6e9I=
github.com/elastic/elastic-agent-autodiscover v0.9.2/go.mod h1:RNaHnOTYfNptSTQUyZYnjypxmrR5AaE6BIap/175F5c=
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
Expand Down
Loading