From 5dc77439690b7d46ebce901bfb3317eb1e7ad713 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 27 Oct 2023 13:13:13 -0400 Subject: [PATCH 1/3] Update to elastic-agent-libs v0.6.2. (#36969) * Update to elastic-agent-libs v0.6.2. Increases the version of golang.org/x/net to one that has the HTTP2 rapid reset fix. * Add changelog entry. * Updates for latest version of golang.org/x/net/publicsuffix * Update all remaining subdomains (cherry picked from commit ae11b47ef38d5f1b307db27634f5d45aab6f0828) # Conflicts: # go.sum --- CHANGELOG.next.asciidoc | 3 + NOTICE.txt | 24 ++-- go.mod | 12 +- go.sum | 26 +++-- .../squid/log/test/access1.log-expected.json | 110 +++++++++--------- 5 files changed, 92 insertions(+), 83 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 429edcac70ef..68248d284e63 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -167,6 +167,9 @@ is collected by it. - [Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor {pull}36506[36506] Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will disable the netinfo.enabled option of add_host_metadata processor - Beats will now connect to older Elasticsearch instances by default {pull}36884[36884] +- Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments +- elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}36843[36843] +- Upgrade golang/x/net to v0.17.0. Updates the publicsuffix table used by the registered_domain processor. {pull}36969[36969] *Auditbeat* diff --git a/NOTICE.txt b/NOTICE.txt index 07c81a03f52a..eaa649ea34b1 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -12712,11 +12712,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.6.0 +Version: v0.6.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.6.2/LICENSE: Apache License Version 2.0, January 2004 @@ -24707,11 +24707,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/crypto -Version: v0.12.0 +Version: v0.14.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.14.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -24818,11 +24818,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.12.0 +Version: v0.17.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.17.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -24929,11 +24929,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sys -Version: v0.12.0 +Version: v0.13.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.13.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -24966,11 +24966,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/text -Version: v0.12.0 +Version: v0.13.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.13.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -50232,11 +50232,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/term -Version: v0.11.0 +Version: v0.13.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.11.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.13.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index bac7838acbdb..37b2b3e43554 100644 --- a/go.mod +++ b/go.mod @@ -152,14 +152,14 @@ require ( go.uber.org/atomic v1.11.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.25.0 - golang.org/x/crypto v0.12.0 + golang.org/x/crypto v0.14.0 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/mod v0.10.0 - golang.org/x/net v0.12.0 + golang.org/x/net v0.17.0 golang.org/x/oauth2 v0.10.0 golang.org/x/sync v0.3.0 - golang.org/x/sys v0.12.0 - golang.org/x/text v0.12.0 + golang.org/x/sys v0.13.0 + golang.org/x/text v0.13.0 golang.org/x/time v0.3.0 golang.org/x/tools v0.9.1 google.golang.org/api v0.126.0 @@ -202,7 +202,7 @@ require ( github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20220623125934-28468a6701b5 github.com/elastic/bayeux v1.0.5 github.com/elastic/elastic-agent-autodiscover v0.6.4 - github.com/elastic/elastic-agent-libs v0.6.0 + github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 github.com/elastic/elastic-agent-system-metrics v0.7.0 github.com/elastic/go-elasticsearch/v8 v8.10.0 @@ -360,7 +360,7 @@ require ( go.elastic.co/fastjson v1.1.0 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect - golang.org/x/term v0.11.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect diff --git a/go.sum b/go.sum index 70420696d122..b3e2404a0478 100644 --- a/go.sum +++ b/go.sum @@ -654,8 +654,8 @@ github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+e github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= github.com/elastic/elastic-agent-client/v7 v7.4.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0= -github.com/elastic/elastic-agent-libs v0.6.0 h1:HnL/OpAzIHlK8y1J69XQuAx4tlCzd6e2kldMHvXARvY= -github.com/elastic/elastic-agent-libs v0.6.0/go.mod h1:K6U+n84siZ66ZyG36h1/x+fw1oIZbFXEypAC6KSiFOg= +github.com/elastic/elastic-agent-libs v0.6.2 h1:tE5pFK4y7xm1FtXm+r+63G7STjJAaWh3+oKIQDzdPDo= +github.com/elastic/elastic-agent-libs v0.6.2/go.mod h1:o+EySawBZGeYu49shJxerg2wRCimS1dhrD4As0MS700= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.7.0 h1:qDLY30UDforSd/TfHfqUDiiHSL6Nu6qLXHsKSxz4OuQ= @@ -2016,8 +2016,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2159,8 +2159,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2329,8 +2329,14 @@ golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +<<<<<<< HEAD golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +======= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969)) golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2339,8 +2345,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2355,8 +2361,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/x-pack/filebeat/module/squid/log/test/access1.log-expected.json b/x-pack/filebeat/module/squid/log/test/access1.log-expected.json index d7620e206487..f993048245af 100644 --- a/x-pack/filebeat/module/squid/log/test/access1.log-expected.json +++ b/x-pack/filebeat/module/squid/log/test/access1.log-expected.json @@ -4825,9 +4825,9 @@ "rsa.time.event_time_str": "1157689377", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 233, "source.ip": "10.105.33.214", @@ -4839,10 +4839,10 @@ "url.extension": "js", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20051025184124/radio.launch.yahoo.com/radioapi/includes/js/compVersionedJS/rapiBridge_1_4.js", "url.path": "/7/1568/1600/20051025184124/radio.launch.yahoo.com/radioapi/includes/js/compVersionedJS/rapiBridge_1_4.js", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -4887,9 +4887,9 @@ "rsa.time.event_time_str": "1157689377", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 236, "source.ip": "10.105.33.214", @@ -4901,10 +4901,10 @@ "url.extension": "css", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222754/radio.launch.yahoo.com/radio/clientdata/515/other.css", "url.path": "/7/1568/1600/20040405222754/radio.launch.yahoo.com/radio/clientdata/515/other.css", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -4949,9 +4949,9 @@ "rsa.time.event_time_str": "1157689378", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 238, "source.ip": "10.105.33.214", @@ -4963,10 +4963,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_left.gif", "url.path": "/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_left.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -5068,9 +5068,9 @@ "rsa.time.event_time_str": "1157689378", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 136, "source.ip": "10.105.33.214", @@ -5082,10 +5082,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20050829181418/radio.launch.yahoo.com/radio/common_radio/resources/images/noaccess_msgr_uk.gif", "url.path": "/7/1568/1600/20050829181418/radio.launch.yahoo.com/radio/common_radio/resources/images/noaccess_msgr_uk.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -5130,9 +5130,9 @@ "rsa.time.event_time_str": "1157689378", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 237, "source.ip": "10.105.33.214", @@ -5144,10 +5144,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_right.gif", "url.path": "/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_right.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -5190,9 +5190,9 @@ "rsa.time.event_time_str": "1157689378", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 218, "source.ip": "10.105.33.214", @@ -5204,10 +5204,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222807/radio.launch.yahoo.com/radio/common_radio/resources/images/t.gif", "url.path": "/7/1568/1600/20040405222807/radio.launch.yahoo.com/radio/common_radio/resources/images/t.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -5252,9 +5252,9 @@ "rsa.time.event_time_str": "1157689379", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 238, "source.ip": "10.105.33.214", @@ -5266,10 +5266,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_controls_off.gif", "url.path": "/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_controls_off.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -5314,9 +5314,9 @@ "rsa.time.event_time_str": "1157689379", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 238, "source.ip": "10.105.33.214", @@ -5328,10 +5328,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222756/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_center.gif", "url.path": "/7/1568/1600/20040405222756/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_center.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -5376,9 +5376,9 @@ "rsa.time.event_time_str": "1157689380", "rsa.web.alias_host": "a1568.g.akamai.net", "server.domain": "a1568.g.akamai.net", - "server.registered_domain": "akamai.net", - "server.subdomain": "a1568.g", - "server.top_level_domain": "net", + "server.registered_domain": "g.akamai.net", + "server.subdomain": "a1568", + "server.top_level_domain": "akamai.net", "service.type": "squid", "source.bytes": 238, "source.ip": "10.105.33.214", @@ -5390,10 +5390,10 @@ "url.extension": "gif", "url.original": "http://a1568.g.akamai.net/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_controls_fill.gif", "url.path": "/7/1568/1600/20040405222757/radio.launch.yahoo.com/radio/clientdata/515/skins/1/images/bg_controls_fill.gif", - "url.registered_domain": "akamai.net", + "url.registered_domain": "g.akamai.net", "url.scheme": "http", - "url.subdomain": "a1568.g", - "url.top_level_domain": "net", + "url.subdomain": "a1568", + "url.top_level_domain": "akamai.net", "user.name": "adeolaegbedokun" }, { @@ -6059,4 +6059,4 @@ "url.top_level_domain": "com", "user.name": "badeyek" } -] \ No newline at end of file +] From 6d8ae020b2a43c5982acddc24faca095a67d022b Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 27 Oct 2023 13:21:24 -0400 Subject: [PATCH 2/3] Resolve conflicts. --- go.sum | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.sum b/go.sum index b3e2404a0478..8dddd5ca43ef 100644 --- a/go.sum +++ b/go.sum @@ -2329,14 +2329,8 @@ golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -<<<<<<< HEAD -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -======= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ->>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969)) golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 336b38f8d44972e766f71aeaf2388cffa8afd1ed Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 27 Oct 2023 13:34:34 -0400 Subject: [PATCH 3/3] Remove extra entries in CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 68248d284e63..ae193785b8b1 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -167,8 +167,6 @@ is collected by it. - [Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor {pull}36506[36506] Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will disable the netinfo.enabled option of add_host_metadata processor - Beats will now connect to older Elasticsearch instances by default {pull}36884[36884] -- Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments -- elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}36843[36843] - Upgrade golang/x/net to v0.17.0. Updates the publicsuffix table used by the registered_domain processor. {pull}36969[36969] *Auditbeat*