Skip to content

Commit 05b1328

Browse files
mergify[bot]khushijain21
mergify[bot]
and
khushijain21
authored
[9.1](backport #46428) Remove settings on ES exporter config that no longer function (#46736)
* Remove settings on ES exporter config that no longer function (#46428) * Remove settings on ES exporter config that no longer function (cherry picked from commit d3be9bf) # Conflicts: # go.mod # go.sum # libbeat/otelbeat/beatconverter/beatconverter.go # libbeat/otelbeat/beatconverter/beatconverter_test.go # libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go # x-pack/libbeat/common/otelbeat/otel.go * fix conflicts * make notice * fix dependency * fix ci * fix libbeat check * make check * fix ci failure * fix * fix version dep * fix deps --------- Co-authored-by: Khushi Jain <[email protected]>
1 parent c60a124 commit 05b1328

File tree

10 files changed

+640
-112
lines changed

10 files changed

+640
-112
lines changed

‎NOTICE.txt‎

Lines changed: 285 additions & 16 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ require (
135135
golang.org/x/tools v0.36.0
136136
google.golang.org/api v0.238.0
137137
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
138-
google.golang.org/grpc v1.75.1
138+
google.golang.org/grpc v1.76.0
139139
google.golang.org/protobuf v1.36.9
140140
gopkg.in/inf.v0 v0.9.1
141141
gopkg.in/yaml.v2 v2.4.0
@@ -229,7 +229,7 @@ require (
229229
go.uber.org/mock v0.5.0
230230
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792
231231
golang.org/x/term v0.34.0
232-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7
232+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b
233233
gopkg.in/natefinch/lumberjack.v2 v2.2.1
234234
gopkg.in/yaml.v3 v3.0.1
235235
)
@@ -247,6 +247,7 @@ require (
247247
)
248248

249249
require (
250+
github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension v0.2.0
250251
go.opentelemetry.io/collector/processor v1.41.0
251252
go.opentelemetry.io/otel/sdk/metric v1.38.0
252253
go.uber.org/goleak v1.3.0
@@ -326,10 +327,10 @@ require (
326327
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
327328
github.com/fearful-symmetry/gomsr v0.0.1 // indirect
328329
github.com/felixge/httpsnoop v1.0.4 // indirect
329-
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e // indirect
330+
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d // indirect
330331
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
331332
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
332-
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
333+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
333334
github.com/go-logfmt/logfmt v0.6.0 // indirect
334335
github.com/go-logr/logr v1.4.3 // indirect
335336
github.com/go-logr/stdr v1.2.2 // indirect
@@ -345,7 +346,7 @@ require (
345346
github.com/golang/protobuf v1.5.4 // indirect
346347
github.com/google/gnostic-models v0.6.8 // indirect
347348
github.com/google/go-querystring v1.1.0 // indirect
348-
github.com/google/go-tpm v0.9.5 // indirect
349+
github.com/google/go-tpm v0.9.6 // indirect
349350
github.com/google/licenseclassifier v0.0.0-20221004142553-c1ed8fcf4bab // indirect
350351
github.com/google/s2a-go v0.1.9 // indirect
351352
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -372,7 +373,7 @@ require (
372373
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
373374
github.com/knadh/koanf/maps v0.1.2 // indirect
374375
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
375-
github.com/knadh/koanf/v2 v2.2.2 // indirect
376+
github.com/knadh/koanf/v2 v2.3.0 // indirect
376377
github.com/kortschak/utter v1.5.0 // indirect
377378
github.com/kylelemons/godebug v1.1.0 // indirect
378379
github.com/lestrrat-go/strftime v1.1.1 // indirect
@@ -468,10 +469,10 @@ require (
468469
go.opentelemetry.io/collector/receiver/xreceiver v0.135.0 // indirect
469470
go.opentelemetry.io/collector/service v0.135.0 // indirect
470471
go.opentelemetry.io/collector/service/hostcapabilities v0.135.0 // indirect
471-
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
472+
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
472473
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
473474
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
474-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
475+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
475476
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
476477
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
477478
go.opentelemetry.io/ebpf-profiler v0.0.202531 // indirect

‎go.sum‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,8 @@ github.com/elastic/mito v1.22.0 h1:DW4RkO+PLwSbKVF5ijYzi0ug+TKzLL+DVJRzbOPbzQ0=
410410
github.com/elastic/mito v1.22.0/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s=
411411
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw=
412412
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0=
413+
github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension v0.2.0 h1:cQ4Bu5iyJn5jk68OdwpGIifqVwAZUCoYpN3ZVbVRGBA=
414+
github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension v0.2.0/go.mod h1:aG7w7AA2CydjMxGG6zUZggXCPa+jVRhVYo/92wiDx4Q=
413415
github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA=
414416
github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0=
415417
github.com/elastic/sarama v1.19.1-0.20250603175145-7672917f26b6 h1:2COw7kzXkIyS4hKNUl5qw0KolrwncrY4VVNpngVNo8I=
@@ -451,8 +453,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
451453
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
452454
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
453455
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
454-
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e h1:2jjYsGgM13xId2Ku+UGDQTO5It50LhT6lljiVJvBj1Y=
455-
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e/go.mod h1:uAyTlAUxchYuiFjTHmuIEJ4nGSm7iOPaGcAyA81fJ80=
456+
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d h1:EdO/NMMuCZfxhdzTZLuKAciQSnI2DV+Ppg8+vAYrnqA=
457+
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d/go.mod h1:uAyTlAUxchYuiFjTHmuIEJ4nGSm7iOPaGcAyA81fJ80=
456458
github.com/foxboron/swtpm_test v0.0.0-20230726224112-46aaafdf7006 h1:50sW4r0PcvlpG4PV8tYh2RVCapszJgaOLRCS2subvV4=
457459
github.com/foxboron/swtpm_test v0.0.0-20230726224112-46aaafdf7006/go.mod h1:eIXCMsMYCaqq9m1KSSxXwQG11krpuNPGP3k0uaWrbas=
458460
github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15 h1:nLPjjvpUAODOR6vY/7o0hBIk8iTr19Fvmf8aFx/kC7A=
@@ -465,8 +467,8 @@ github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD
465467
github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
466468
github.com/go-faker/faker/v4 v4.2.0 h1:dGebOupKwssrODV51E0zbMrv5e2gO9VWSLNC1WDCpWg=
467469
github.com/go-faker/faker/v4 v4.2.0/go.mod h1:F/bBy8GH9NxOxMInug5Gx4WYeG6fHJZ8Ol/dhcpRub4=
468-
github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI=
469-
github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA=
470+
github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI=
471+
github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo=
470472
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
471473
github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
472474
github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
@@ -583,8 +585,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
583585
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
584586
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
585587
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
586-
github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU=
587-
github.com/google/go-tpm v0.9.5/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
588+
github.com/google/go-tpm v0.9.6 h1:Ku42PT4LmjDu1H5C5ISWLlpI1mj+Zq7sPGKoRw2XROA=
589+
github.com/google/go-tpm v0.9.6/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
588590
github.com/google/go-tpm-tools v0.4.4 h1:oiQfAIkc6xTy9Fl5NKTeTJkBTlXdHsxAofmQyxBKY98=
589591
github.com/google/go-tpm-tools v0.4.4/go.mod h1:T8jXkp2s+eltnCDIsXR84/MTcVU9Ja7bh3Mit0pa4AY=
590592
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -716,8 +718,8 @@ github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpb
716718
github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
717719
github.com/knadh/koanf/providers/confmap v1.0.0 h1:mHKLJTE7iXEys6deO5p6olAiZdG5zwp8Aebir+/EaRE=
718720
github.com/knadh/koanf/providers/confmap v1.0.0/go.mod h1:txHYHiI2hAtF0/0sCmcuol4IDcuQbKTybiB1nOcUo1A=
719-
github.com/knadh/koanf/v2 v2.2.2 h1:ghbduIkpFui3L587wavneC9e3WIliCgiCgdxYO/wd7A=
720-
github.com/knadh/koanf/v2 v2.2.2/go.mod h1:abWQc0cBXLSF/PSOMCB/SK+T13NXDsPvOksbpi5e/9Q=
721+
github.com/knadh/koanf/v2 v2.3.0 h1:Qg076dDRFHvqnKG97ZEsi9TAg2/nFTa9hCdcSa1lvlM=
722+
github.com/knadh/koanf/v2 v2.3.0/go.mod h1:gRb40VRAbd4iJMYYD5IxZ6hfuopFcXBpc9bbQpZwo28=
721723
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
722724
github.com/kortschak/utter v1.5.0 h1:1vHGHPZmJ6zU5XbfllIAG3eQBoHT97ePrZJ+pT3RoiQ=
723725
github.com/kortschak/utter v1.5.0/go.mod h1:vSmSjbyrlKjjsL71193LmzBOKgwePk9DH6uFaWHIInc=
@@ -1164,14 +1166,14 @@ go.opentelemetry.io/collector/service v0.135.0 h1:JuUxi3BqyZMUpN6W7c0ZCURJyAIq+s
11641166
go.opentelemetry.io/collector/service v0.135.0/go.mod h1:EYScF4ug9SXIiCPvb7Q6u2ABeqSo4lD7e+8YH4WoXYM=
11651167
go.opentelemetry.io/collector/service/hostcapabilities v0.135.0 h1:7K6/ZjuaFUeg8Ei5NF52ahBE6atqIh9lk7IwjJwU/Yo=
11661168
go.opentelemetry.io/collector/service/hostcapabilities v0.135.0/go.mod h1:vFAKytqvKcHHhBbj2MlfKUVBIkEsfd6uNhf5c8Coycg=
1167-
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 h1:FGre0nZh5BSw7G73VpT3xs38HchsfPsa2aZtMp0NPOs=
1168-
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0/go.mod h1:X2PYPViI2wTPIMIOBjG17KNybTzsrATnvPJ02kkz7LM=
1169+
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw=
1170+
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4=
11691171
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
11701172
go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k=
11711173
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ=
11721174
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
1173-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
1174-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
1175+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
1176+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
11751177
go.opentelemetry.io/contrib/otelconf v0.17.0 h1:Yh9uifPSe8yiksLshMbeAXGm/ZRmo7LD7Di+/yd1L5w=
11761178
go.opentelemetry.io/contrib/otelconf v0.17.0/go.mod h1:8dHKS6uMiZlvmrA7MGUtb4HwnX+ukdF5iS3p2UPKvLE=
11771179
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 h1:0aGKdIuVhy5l4GClAjl72ntkZJhijf2wg1S7b5oLoYA=
@@ -1430,17 +1432,17 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
14301432
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
14311433
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78=
14321434
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk=
1433-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU=
1434-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA=
1435+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b h1:ULiyYQ0FdsJhwwZUwbaXpZF5yUE3h+RA+gxvBu37ucc=
1436+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:oDOGiMSXHL4sDTJvFvIB9nRQCGdLP1o/iVaqQK8zB+M=
14351437
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=
14361438
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
14371439
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
14381440
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
14391441
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
14401442
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
14411443
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
1442-
google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
1443-
google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
1444+
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
1445+
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
14441446
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
14451447
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
14461448
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎libbeat/otelbeat/beatconverter/beatconverter.go‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ import (
2525

2626
"github.com/elastic/beats/v7/libbeat/cloudid"
2727
elasticsearchtranslate "github.com/elastic/beats/v7/libbeat/otelbeat/oteltranslate/outputs/elasticsearch"
28+
"github.com/elastic/beats/v7/libbeat/outputs/elasticsearch"
2829
"github.com/elastic/elastic-agent-libs/config"
2930
"github.com/elastic/elastic-agent-libs/logp"
3031
)
3132

3233
// list of supported beatreceivers
33-
var supportedReceivers = []string{"filebeatreceiver", "metricbeatreceiver"} // Add more beat receivers to this list when we add support
34+
var (
35+
supportedReceivers = []string{"filebeatreceiver", "metricbeatreceiver"} // Add more beat receivers to this list when we add support
36+
beatsAuthName = "beatsauth"
37+
)
3438

3539
type converter struct{}
3640

@@ -87,11 +91,26 @@ func (c converter) Convert(_ context.Context, conf *confmap.Conf) error {
8791
}
8892
}
8993

94+
// get beatsauth config
95+
authConfig, err := getBeatsAuthExtensionConfig(esConfig)
96+
if err != nil {
97+
return fmt.Errorf("cannot translate http settings on beatsauth extension: %w", err)
98+
}
99+
100+
// set authenticator name on ES exporter
101+
esOTelConfig["auth"] = map[string]any{
102+
"authenticator": beatsAuthName,
103+
}
104+
90105
out = map[string]any{
91106
"service::pipelines::logs::exporters": []string{"elasticsearch"},
107+
"service::extensions": []interface{}{beatsAuthName},
92108
"exporters": map[string]any{
93109
"elasticsearch": esOTelConfig,
94110
},
111+
"extensions": map[string]any{
112+
beatsAuthName: authConfig,
113+
},
95114
}
96115
err = conf.Merge(confmap.NewFromStringMap(out))
97116
if err != nil {
@@ -192,3 +211,26 @@ func promoteOutputQueueSettings(beatReceiverConfigKey string, outputConfig *conf
192211

193212
return nil
194213
}
214+
215+
// getBeatsAuthExtensionConfig sets http transport settings on beatsauth
216+
// currently this is only supported for elasticsearch output
217+
func getBeatsAuthExtensionConfig(cfg *config.C) (map[string]any, error) {
218+
defaultTransportSettings := elasticsearch.ESDefaultTransportSettings()
219+
err := cfg.Unpack(&defaultTransportSettings)
220+
if err != nil {
221+
return nil, err
222+
}
223+
224+
newConfig, err := config.NewConfigFrom(defaultTransportSettings)
225+
if err != nil {
226+
return nil, err
227+
}
228+
229+
var newMap map[string]any
230+
err = newConfig.Unpack(&newMap)
231+
if err != nil {
232+
return nil, err
233+
}
234+
235+
return newMap, nil
236+
}

0 commit comments

Comments
 (0)