Skip to content

Commit

Permalink
feat: bump elastic-agent-libs and enable insecure defaults (#14956)
Browse files Browse the repository at this point in the history
* feat: bump elastic-agent-libs and enable insecure defaults

to avoid breaking changes we call SetInsecureDefaults to allow tls 1.0 and 1.1

* lint: update notice file
  • Loading branch information
kruskall authored Dec 23, 2024
1 parent 2bb81c2 commit a894c61
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 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
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 a894c61

Please sign in to comment.