diff --git a/NOTICE.txt b/NOTICE.txt index 216e58e42b5..3705a6c0b87 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.17.4 +Version: v0.17.5 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.17.4/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.17.5/LICENSE: Apache License Version 2.0, January 2004 diff --git a/cmd/apm-server/main.go b/cmd/apm-server/main.go index 72244c3d3d3..dc17bc38a24 100644 --- a/cmd/apm-server/main.go +++ b/cmd/apm-server/main.go @@ -22,8 +22,13 @@ import ( "github.com/elastic/apm-server/internal/beatcmd" "github.com/elastic/apm-server/internal/beater" + "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) +func init() { + tlscommon.SetInsecureDefaults() +} + func main() { rootCmd := beatcmd.NewRootCommand(beatcmd.BeatParams{ NewRunner: func(args beatcmd.RunnerParams) (beatcmd.Runner, error) { diff --git a/go.mod b/go.mod index 37550dd373d..16350e56f03 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/elastic/apm-data v1.14.1 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241218175401-8b9a76e3db69 github.com/elastic/elastic-agent-client/v7 v7.16.0 - github.com/elastic/elastic-agent-libs v0.17.4 + github.com/elastic/elastic-agent-libs v0.17.5 github.com/elastic/elastic-agent-system-metrics v0.11.5 github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender/v2 v2.3.1 diff --git a/go.sum b/go.sum index 22fa787e504..1b249ad05f2 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,8 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= -github.com/elastic/elastic-agent-libs v0.17.4 h1:kWK5Kn2EQjM97yHqbeXv+cFAIti4IiI9Qj8huM+lZzE= -github.com/elastic/elastic-agent-libs v0.17.4/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= +github.com/elastic/elastic-agent-libs v0.17.5 h1:oyv5BohMia+49tZnsOmTyRWp5LoZbH8iOmGa7c4TqTs= +github.com/elastic/elastic-agent-libs v0.17.5/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= github.com/elastic/elastic-agent-system-metrics v0.11.5 h1:JSjXFEn8uYZ9hoC/GxZNMgJ622UoP96sjYP/49/Uvuo= github.com/elastic/elastic-agent-system-metrics v0.11.5/go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= diff --git a/x-pack/apm-server/main.go b/x-pack/apm-server/main.go index caab7b061e2..09456580690 100644 --- a/x-pack/apm-server/main.go +++ b/x-pack/apm-server/main.go @@ -23,6 +23,7 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/elastic-agent-libs/paths" + "github.com/elastic/elastic-agent-libs/transport/tlscommon" "github.com/elastic/apm-data/model/modelpb" "github.com/elastic/apm-data/model/modelprocessor" @@ -54,6 +55,8 @@ var ( ) func init() { + tlscommon.SetInsecureDefaults() + management.ConfigTransform.SetTransform( func(unit *proto.UnitExpectedConfig, agentInfo *client.AgentInfo) ([]*reload.ConfigWithMeta, error) { // NOTE(axw) we intentionally do not log the entire config here,