Skip to content

Commit 81dcd10

Browse files
[9.2][Automation] Update elastic/beats to 974ba1f1fa5d (#11442)
* chore: Update to elastic/beats@974ba1f1fa5d Made with ❤️️ by updatecli * chore: Update to elastic/beats@974ba1f1fa5d Made with ❤️️ by updatecli * Remove deleted fields --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie <[email protected]>
1 parent be4f5d7 commit 81dcd10

File tree

8 files changed

+20
-31
lines changed

8 files changed

+20
-31
lines changed

NOTICE-fips.txt

Lines changed: 4 additions & 4 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.20251125193205-63bdfd3c132d
790+
Version: v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125193205-63bdfd3c132d/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125233931-974ba1f1fa5d/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
@@ -6930,11 +6930,11 @@ limitations under the License.
69306930

69316931
--------------------------------------------------------------------------------
69326932
Dependency : golang.org/x/crypto
6933-
Version: v0.44.0
6933+
Version: v0.45.0
69346934
Licence type (autodetected): BSD-3-Clause
69356935
--------------------------------------------------------------------------------
69366936

6937-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.44.0/LICENSE:
6937+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.45.0/LICENSE:
69386938

69396939
Copyright 2009 The Go Authors.
69406940

NOTICE.txt

Lines changed: 4 additions & 4 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.20251125193205-63bdfd3c132d
790+
Version: v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125193205-63bdfd3c132d/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125233931-974ba1f1fa5d/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
@@ -6930,11 +6930,11 @@ limitations under the License.
69306930

69316931
--------------------------------------------------------------------------------
69326932
Dependency : golang.org/x/crypto
6933-
Version: v0.44.0
6933+
Version: v0.45.0
69346934
Licence type (autodetected): BSD-3-Clause
69356935
--------------------------------------------------------------------------------
69366936

6937-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.44.0/LICENSE:
6937+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.45.0/LICENSE:
69386938

69396939
Copyright 2009 The Go Authors.
69406940

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/docker/docker v28.5.1+incompatible
1515
github.com/docker/go-units v0.5.0
1616
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
17-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125193205-63bdfd3c132d
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d
1818
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919
github.com/elastic/elastic-agent-autodiscover v0.10.0
2020
github.com/elastic/elastic-agent-client/v7 v7.17.2
@@ -63,7 +63,7 @@ require (
6363
go.opentelemetry.io/collector/pipeline v1.45.0
6464
go.uber.org/zap v1.27.0
6565
go.yaml.in/yaml/v3 v3.0.4
66-
golang.org/x/crypto v0.44.0
66+
golang.org/x/crypto v0.45.0
6767
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6
6868
golang.org/x/mod v0.30.0
6969
golang.org/x/net v0.47.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
501501
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
502502
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
503503
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
504-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125193205-63bdfd3c132d h1:h9isCdAY5GsrwAJFzzEuQ0me1rd5KcakxMQoKLnY2Wg=
505-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125193205-63bdfd3c132d/go.mod h1:XKFcIAQ9/Q2cKA183/qaExSA7uhc1ll4KL1LCJPm1eI=
504+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d h1:WJi/y0MfvvdgZVjnCQ0smVwW2ydlYt0Zc+2XAhM334o=
505+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d/go.mod h1:Ru1fKfaifDS2oYOWjs4uqzmBsiCF+6ACmBiuC3/G6pE=
506506
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
507507
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
508508
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
@@ -1966,8 +1966,8 @@ golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
19661966
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
19671967
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
19681968
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
1969-
golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
1970-
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
1969+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
1970+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
19711971
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
19721972
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 h1:zfMcR1Cs4KNuomFFgGefv5N0czO2XZpUbxGUy8i8ug0=
19731973
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=

internal/edot/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.10
55
replace github.com/elastic/elastic-agent => ../../
66

77
require (
8-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125193205-63bdfd3c132d
8+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d
99
github.com/elastic/elastic-agent v0.0.0-00010101000000-000000000000
1010
github.com/elastic/elastic-agent-libs v0.26.2
1111
github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.20.0
@@ -648,7 +648,7 @@ require (
648648
go.yaml.in/yaml/v2 v2.4.3 // indirect
649649
go.yaml.in/yaml/v3 v3.0.4 // indirect
650650
golang.org/x/arch v0.21.0 // indirect
651-
golang.org/x/crypto v0.44.0 // indirect
651+
golang.org/x/crypto v0.45.0 // indirect
652652
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 // indirect
653653
golang.org/x/mod v0.30.0 // indirect
654654
golang.org/x/net v0.47.0 // indirect

internal/edot/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
430430
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
431431
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
432432
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
433-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125193205-63bdfd3c132d h1:h9isCdAY5GsrwAJFzzEuQ0me1rd5KcakxMQoKLnY2Wg=
434-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125193205-63bdfd3c132d/go.mod h1:XKFcIAQ9/Q2cKA183/qaExSA7uhc1ll4KL1LCJPm1eI=
433+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d h1:WJi/y0MfvvdgZVjnCQ0smVwW2ydlYt0Zc+2XAhM334o=
434+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125233931-974ba1f1fa5d/go.mod h1:Ru1fKfaifDS2oYOWjs4uqzmBsiCF+6ACmBiuC3/G6pE=
435435
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
436436
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
437437
github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=
@@ -1771,8 +1771,8 @@ golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
17711771
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
17721772
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
17731773
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
1774-
golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
1775-
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
1774+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
1775+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
17761776
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
17771777
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 h1:zfMcR1Cs4KNuomFFgGefv5N0czO2XZpUbxGUy8i8ug0=
17781778
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=

testing/integration/ess/beat_receivers_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,6 @@ func TestClassicAndReceiverAgentMonitoring(t *testing.T) {
382382
"data_stream.namespace",
383383
"elastic_agent.id",
384384
"event.ingested",
385-
386-
// only in receiver doc
387-
"agent.otelcol",
388385
}
389386
switch tc.onlyCompareKeys {
390387
case true:
@@ -593,10 +590,6 @@ outputs:
593590

594591
// for short periods of time, the beats binary version can be out of sync with the beat receiver version
595592
"agent.version",
596-
597-
// only in receiver doc
598-
"agent.otelcol.component.id",
599-
"agent.otelcol.component.kind",
600593
}
601594

602595
stripNondeterminism := func(m mapstr.M, mset string) {

testing/integration/ess/otel_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,10 +1731,6 @@ service:
17311731
"elastic_agent.id",
17321732
"elastic_agent.snapshot",
17331733
"elastic_agent.version",
1734-
1735-
// only in fbreceiver doc
1736-
"agent.otelcol.component.id",
1737-
"agent.otelcol.component.kind",
17381734
}
17391735

17401736
AssertMapsEqual(t, doc1, doc2, ignoredFields, "expected documents to be equal")

0 commit comments

Comments
 (0)