Skip to content

Commit

Permalink
Update to elastic-agent-libs v0.6.2. (#36969)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@cmacknz @mergify
cmacknz authored and mergify[bot] committed Oct 27, 2023
1 parent 2d93747 commit 5200678
Show file tree
Hide file tree
Showing 5 changed files with 266 additions and 55 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,20 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d


- Upgrade to Go 1.20.10. {pull}36846[36846]
- Added append Processor which will append concrete values or values from a field to target. {issue}29934[29934] {pull}33364[33364]
- When running under Elastic-Agent the status is now reported per Unit instead of the whole Beat {issue}35874[35874] {pull}36183[36183]
- Add warning message to SysV init scripts for RPM-based systems that lack `/etc/rc.d/init.d/functions`. {issue}35708[35708] {pull}36188[36188]
- Mark `translate_sid` processor is GA. {issue}36279[36279] {pull}36280[36280]
- dns processor: Add support for forward lookups (`A`, `AAAA`, and `TXT`). {issue}11416[11416] {pull}36394[36394]
- Mark `syslog` processor as GA, improve docs about how processor handles syslog messages. {issue}36416[36416] {pull}36417[36417]
- Add support for AWS external IDs. {issue}36321[36321] {pull}36322[36322]
- [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
- allow `queue` configuration settings to be set under the output. {issue}35615[35615] {pull}36788[36788]
- 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*

Expand Down
48 changes: 48 additions & 0 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6384,11 +6384,19 @@ SOFTWARE

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-libs
<<<<<<< HEAD
Version: v0.2.11
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.2.11/LICENSE:
=======
Version: v0.6.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.6.2/LICENSE:
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -17398,11 +17406,19 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
<<<<<<< HEAD
Version: v0.0.0-20210921155107-089bfa567519
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20210921155107-089bfa567519/LICENSE:
=======
Version: v0.14.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.14.0/LICENSE:
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -17472,11 +17488,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
<<<<<<< HEAD
Version: v0.9.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.9.0/LICENSE:
=======
Version: v0.17.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.17.0/LICENSE:
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -17583,11 +17607,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
<<<<<<< HEAD
Version: v0.9.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.9.0/LICENSE:
=======
Version: v0.13.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.13.0/LICENSE:
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -17620,11 +17652,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/text
<<<<<<< HEAD
Version: v0.9.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.9.0/LICENSE:
=======
Version: v0.13.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.13.0/LICENSE:
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -36177,11 +36217,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/term
<<<<<<< HEAD
Version: v0.7.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.7.0/LICENSE:
=======
Version: v0.13.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.13.0/LICENSE:
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down
69 changes: 69 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ require (
go.elastic.co/ecszap v1.0.1
go.elastic.co/go-licence-detector v0.5.0
go.etcd.io/bbolt v1.3.6
<<<<<<< HEAD
go.uber.org/atomic v1.9.0
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
Expand All @@ -173,6 +174,19 @@ require (
golang.org/x/sync v0.1.0
golang.org/x/sys v0.9.0
golang.org/x/text v0.9.0
=======
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.14.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/mod v0.10.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.13.0
golang.org/x/text v0.13.0
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))
golang.org/x/time v0.3.0
golang.org/x/tools v0.6.0
google.golang.org/api v0.103.0
Expand All @@ -197,8 +211,55 @@ require (
)

require (
<<<<<<< HEAD
github.com/elastic/elastic-agent-libs v0.2.11
github.com/elastic/elastic-agent-system-metrics v0.4.4
=======
cloud.google.com/go v0.110.4
cloud.google.com/go/compute v1.21.0
cloud.google.com/go/redis v1.13.1
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.2
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.0.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/costmanagement/armcostmanagement v1.0.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.8.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0
github.com/Azure/go-autorest/autorest/adal v0.9.14
github.com/apache/arrow/go/v12 v12.0.1
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.20.4
github.com/aws/aws-sdk-go-v2/service/kinesis v1.15.8
github.com/aws/smithy-go v1.13.5
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.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
github.com/elastic/mito v1.6.0
github.com/elastic/toutoumomoma v0.0.0-20221026030040-594ef30cb640
github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15
github.com/google/cel-go v0.15.3
github.com/googleapis/gax-go/v2 v2.11.0
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/icholy/digest v0.1.22
github.com/lestrrat-go/jwx/v2 v2.0.11
github.com/otiai10/copy v1.12.0
github.com/pierrec/lz4/v4 v4.1.16
github.com/pkg/xattr v0.4.9
github.com/sergi/go-diff v1.3.1
github.com/shirou/gopsutil/v3 v3.22.10
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.4
go.elastic.co/apm/module/apmhttp/v2 v2.4.4
go.elastic.co/apm/v2 v2.4.4
go.mongodb.org/mongo-driver v1.5.1
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
gopkg.in/natefinch/lumberjack.v2 v2.0.0
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))
)

require (
Expand Down Expand Up @@ -283,7 +344,15 @@ require (
github.com/xdg/stringprep v1.0.3 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.opencensus.io v0.24.0 // indirect
<<<<<<< HEAD
golang.org/x/term v0.7.0 // indirect
=======
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect
golang.org/x/term v0.13.0 // indirect
>>>>>>> ae11b47ef3 (Update to elastic-agent-libs v0.6.2. (#36969))
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
Expand Down

0 comments on commit 5200678

Please sign in to comment.