Skip to content

Commit

Permalink
feat: bump elastic-agent-libs and enable insecure defaults
Browse files Browse the repository at this point in the history
to avoid breaking changes we call SetInsecureDefaults to allow tls 1.0 and 1.1
  • Loading branch information
kruskall committed Dec 13, 2024
1 parent c0ac0b3 commit 128a697
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions cmd/apm-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/elastic/apm-data v1.14.3
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241210105910-57966ef5606f
github.com/elastic/elastic-agent-client/v7 v7.17.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.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,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.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
github.com/elastic/elastic-agent-client/v7 v7.17.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=
Expand Down
3 changes: 3 additions & 0 deletions x-pack/apm-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 128a697

Please sign in to comment.