Skip to content

Commit 128a697

Browse files
committed
feat: bump elastic-agent-libs and enable insecure defaults
to avoid breaking changes we call SetInsecureDefaults to allow tls 1.0 and 1.1
1 parent c0ac0b3 commit 128a697

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

cmd/apm-server/main.go

+5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@ import (
2222

2323
"github.com/elastic/apm-server/internal/beatcmd"
2424
"github.com/elastic/apm-server/internal/beater"
25+
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
2526
)
2627

28+
func init() {
29+
tlscommon.SetInsecureDefaults()
30+
}
31+
2732
func main() {
2833
rootCmd := beatcmd.NewRootCommand(beatcmd.BeatParams{
2934
NewRunner: func(args beatcmd.RunnerParams) (beatcmd.Runner, error) {

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/elastic/apm-data v1.14.3
1111
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241210105910-57966ef5606f
1212
github.com/elastic/elastic-agent-client/v7 v7.17.0
13-
github.com/elastic/elastic-agent-libs v0.17.4
13+
github.com/elastic/elastic-agent-libs v0.17.5
1414
github.com/elastic/elastic-agent-system-metrics v0.11.5
1515
github.com/elastic/gmux v0.3.2
1616
github.com/elastic/go-docappender/v2 v2.3.2

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0
144144
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
145145
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
146146
github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
147-
github.com/elastic/elastic-agent-libs v0.17.4 h1:kWK5Kn2EQjM97yHqbeXv+cFAIti4IiI9Qj8huM+lZzE=
148-
github.com/elastic/elastic-agent-libs v0.17.4/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M=
147+
github.com/elastic/elastic-agent-libs v0.17.5 h1:oyv5BohMia+49tZnsOmTyRWp5LoZbH8iOmGa7c4TqTs=
148+
github.com/elastic/elastic-agent-libs v0.17.5/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M=
149149
github.com/elastic/elastic-agent-system-metrics v0.11.5 h1:JSjXFEn8uYZ9hoC/GxZNMgJ622UoP96sjYP/49/Uvuo=
150150
github.com/elastic/elastic-agent-system-metrics v0.11.5/go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI=
151151
github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=

x-pack/apm-server/main.go

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/elastic/elastic-agent-libs/logp"
2424
"github.com/elastic/elastic-agent-libs/monitoring"
2525
"github.com/elastic/elastic-agent-libs/paths"
26+
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
2627

2728
"github.com/elastic/apm-data/model/modelpb"
2829
"github.com/elastic/apm-data/model/modelprocessor"
@@ -54,6 +55,8 @@ var (
5455
)
5556

5657
func init() {
58+
tlscommon.SetInsecureDefaults()
59+
5760
management.ConfigTransform.SetTransform(
5861
func(unit *proto.UnitExpectedConfig, agentInfo *client.AgentInfo) ([]*reload.ConfigWithMeta, error) {
5962
// NOTE(axw) we intentionally do not log the entire config here,

0 commit comments

Comments
 (0)