[7.17](backport #36969) Update to elastic-agent-libs v0.6.2. (#36979)

* 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 ae11b47) # Conflicts: # NOTICE.txt # go.mod # go.sum * Resolve conflicts. * Remove extra entries in CHANGELOG.next.asciidoc --------- Co-authored-by: Craig MacKenzie <[email protected]>
elastic · Oct 30, 2023 · 2a02e74 · 2a02e74
1 parent 2d93747
commit 2a02e74
Show file tree

Hide file tree

Showing 8 changed files with 332 additions and 455 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -62,6 +62,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 
 - Upgrade to Go 1.20.10. {pull}36846[36846]
+- 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
diff --git a/dev-tools/notice/overrides.json b/dev-tools/notice/overrides.json
@@ -13,3 +13,4 @@
 {"name": "kernel.org/pub/linux/libs/security/libcap/cap", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
 {"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
 {"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
+{"name": "github.com/JohnCGriffin/overflow", "licenceType": "MIT"}
diff --git a/go.mod b/go.mod
@@ -88,7 +88,7 @@ require (
 	github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e
 	github.com/godror/godror v0.10.4
 	github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b
-	github.com/gofrs/uuid v4.2.0+incompatible
+	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
@@ -123,7 +123,7 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/miekg/dns v1.1.41
 	github.com/mitchellh/gox v1.0.1
-	github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51
+	github.com/mitchellh/hashstructure v1.1.0
 	github.com/mitchellh/mapstructure v1.4.3
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/oklog/ulid v1.3.1
@@ -146,9 +146,9 @@ require (
 	github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522 // indirect
 	github.com/shirou/gopsutil v3.20.12+incompatible
 	github.com/shopspring/decimal v1.2.0
-	github.com/spf13/cobra v1.3.0
+	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.1
+	github.com/stretchr/testify v1.8.2
 	github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b
 	github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786
 	github.com/ugorji/go/codec v1.1.8
@@ -165,14 +165,14 @@ require (
 	go.uber.org/atomic v1.9.0
 	go.uber.org/multierr v1.8.0
 	go.uber.org/zap v1.21.0
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
+	golang.org/x/crypto v0.14.0
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/net v0.9.0
+	golang.org/x/net v0.17.0
 	golang.org/x/oauth2 v0.7.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.9.0
-	golang.org/x/text v0.9.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.6.0
 	google.golang.org/api v0.103.0
@@ -197,7 +197,7 @@ require (
 )
 
 require (
-	github.com/elastic/elastic-agent-libs v0.2.11
+	github.com/elastic/elastic-agent-libs v0.6.2
 	github.com/elastic/elastic-agent-system-metrics v0.4.4
 )
 
@@ -221,7 +221,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/containerd/containerd v1.5.13 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgraph-io/ristretto v0.1.0 // indirect
 	github.com/dimchansky/utfbom v1.1.0 // indirect
@@ -250,7 +250,7 @@ require (
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/gofork v1.0.0 // indirect
@@ -283,7 +283,7 @@ require (
 	github.com/xdg/stringprep v1.0.3 // indirect
 	go.elastic.co/fastjson v1.1.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/term v0.7.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
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/go.sum b/go.sum
diff --git a/libbeat/tests/system/test_cmd_completion.py b/libbeat/tests/system/test_cmd_completion.py
@@ -17,7 +17,7 @@ def test_bash_completion(self):
     def test_zsh_completion(self):
         exit_code = self.run_beat(extra_args=["completion", "zsh"])
         assert exit_code == 0
-        assert self.log_contains("#compdef _mockbeat mockbeat")
+        assert self.log_contains("zsh completion for mockbeat")
 
     def test_unknown_completion(self):
         exit_code = self.run_beat(extra_args=["completion", "awesomeshell"])

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
@@ -5531,9 +5531,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": [
@@ -5547,10 +5547,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"
     },
     {
@@ -5607,9 +5607,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": [
@@ -5623,10 +5623,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"
     },
     {
@@ -5683,9 +5683,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": [
@@ -5699,10 +5699,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"
     },
     {
@@ -5827,9 +5827,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": [
@@ -5843,10 +5843,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"
     },
     {
@@ -5903,9 +5903,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": [
@@ -5919,10 +5919,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"
     },
     {
@@ -5965,9 +5965,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": [
@@ -5981,10 +5981,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"
     },
     {
@@ -6041,9 +6041,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": [
@@ -6057,10 +6057,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"
     },
     {
@@ -6117,9 +6117,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": [
@@ -6133,10 +6133,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"
     },
     {
@@ -6193,9 +6193,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": [
@@ -6209,10 +6209,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"
     },
     {
@@ -6940,4 +6940,4 @@
         "url.top_level_domain": "com",
         "user.name": "badeyek"
     }
-]
+]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,6 +62,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d


		- Upgrade to Go 1.20.10. {pull}36846[36846]
		- Upgrade golang/x/net to v0.17.0. Updates the publicsuffix table used by the registered_domain processor. {pull}36969[36969]

		Auditbeat

Expand Down