Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump elastic-agent-libs and enable insecure defaults (backport #14956) #15039

Merged
merged 2 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@

"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()

Check failure on line 29 in cmd/apm-server/main.go

View workflow job for this annotation

GitHub Actions / lint

undefined: tlscommon.SetInsecureDefaults (compile)

Check failure on line 29 in cmd/apm-server/main.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

undefined: 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 @@
"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 @@
)

func init() {
tlscommon.SetInsecureDefaults()

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / system-test

undefined: tlscommon.SetInsecureDefaults

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / lint

undefined: tlscommon.SetInsecureDefaults (compile)

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / lint

undefined: tlscommon.SetInsecureDefaults (compile)

Check failure on line 58 in x-pack/apm-server/main.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

undefined: 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
Loading