From 3728b17440ff819c4f3b6e3192be2e9a78635568 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:42:46 +0100
Subject: [PATCH] fix: bump memlimit check to 30s interval (#14939)

(cherry picked from commit 23d9531df96c72b31bbf062475cf852a337f7fbb)

# Conflicts:
#	internal/beatcmd/beat.go
---
 internal/beatcmd/beat.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/internal/beatcmd/beat.go b/internal/beatcmd/beat.go
index 8a8b38d0f79..afc75b9ebec 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()