diff --git a/internal/beatcmd/beat.go b/internal/beatcmd/beat.go index 8a8b38d0f7..afc75b9ebe 100644 --- a/internal/beatcmd/beat.go +++ b/internal/beatcmd/beat.go @@ -348,6 +348,14 @@ func (b *Beat) Run(ctx context.Context) error { return adjustMaxProcs(ctx, 30*time.Second, logger) }) +<<<<<<< HEAD +======= + slogger := slog.New(zapslog.NewHandler(logger.Core())) + if err := adjustMemlimit(30*time.Second, slogger); err != nil { + return err + } + +>>>>>>> 23d9531d (fix: bump memlimit check to 30s interval (#14939)) logSystemInfo(b.Info) cleanup, err := b.registerElasticsearchVersionCheck()