Skip to content

Commit fd8d849

Browse files
[main][Automation] Update elastic/beats to ca1c17bca6ad (#11436)
* chore: Update to elastic/beats@ca1c17bca6ad Made with ❤️️ by updatecli * chore: Update to elastic/beats@ca1c17bca6ad Made with ❤️️ by updatecli * Remove deleted fields from test. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie <[email protected]>
1 parent cf014e0 commit fd8d849

File tree

8 files changed

+10
-21
lines changed

8 files changed

+10
-21
lines changed

NOTICE-fips.txt

Lines changed: 2 additions & 2 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.20251125182120-a2aff00ed96d
790+
Version: v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125182120-a2aff00ed96d/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125203956-ca1c17bca6ad/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

NOTICE.txt

Lines changed: 2 additions & 2 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.20251125182120-a2aff00ed96d
790+
Version: v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125182120-a2aff00ed96d/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251125203956-ca1c17bca6ad/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

go.mod

Lines changed: 1 addition & 1 deletion
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.20251125182120-a2aff00ed96d
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad
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

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
503503
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
504504
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
505505
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
506-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125182120-a2aff00ed96d h1:+C0RhfcSQRQ9LELWsuQevw6r2FCObFUUIVQupsdFf4Y=
507-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125182120-a2aff00ed96d/go.mod h1:lz2BY8CbfpoQ9CyOnq1Kt4Sh+9tIFv0WbITzlvkwz24=
506+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad h1:6vLh9XWNW5ysPBgNZaioKuA1keGYh5Di8vR/E2w6JSM=
507+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad/go.mod h1:lz2BY8CbfpoQ9CyOnq1Kt4Sh+9tIFv0WbITzlvkwz24=
508508
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
509509
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
510510
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=

internal/edot/go.mod

Lines changed: 1 addition & 1 deletion
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.20251125182120-a2aff00ed96d
8+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad
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

internal/edot/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
432432
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
433433
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
434434
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
435-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125182120-a2aff00ed96d h1:+C0RhfcSQRQ9LELWsuQevw6r2FCObFUUIVQupsdFf4Y=
436-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125182120-a2aff00ed96d/go.mod h1:lz2BY8CbfpoQ9CyOnq1Kt4Sh+9tIFv0WbITzlvkwz24=
435+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad h1:6vLh9XWNW5ysPBgNZaioKuA1keGYh5Di8vR/E2w6JSM=
436+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251125203956-ca1c17bca6ad/go.mod h1:lz2BY8CbfpoQ9CyOnq1Kt4Sh+9tIFv0WbITzlvkwz24=
437437
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
438438
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
439439
github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=

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
@@ -1721,10 +1721,6 @@ service:
17211721
"elastic_agent.id",
17221722
"elastic_agent.snapshot",
17231723
"elastic_agent.version",
1724-
1725-
// only in fbreceiver doc
1726-
"agent.otelcol.component.id",
1727-
"agent.otelcol.component.kind",
17281724
}
17291725

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

0 commit comments

Comments
 (0)