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

[8.x] fix: bump memlimit check to 30s interval (backport #14939) #14940

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2024

Motivation/summary

use correct interval for memlimit check

Followup #14882

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues


This is an automatic backport of pull request #14939 done by [Mergify](https://mergify.com).

(cherry picked from commit 23d9531)

# Conflicts:
#	internal/beatcmd/beat.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 13, 2024
@mergify mergify bot requested a review from a team as a code owner December 13, 2024 13:44
Copy link
Contributor Author

mergify bot commented Dec 13, 2024

Cherry-pick of 23d9531 has failed:

On branch mergify/bp/8.x/pr-14939
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 23d9531d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/beatcmd/beat.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kruskall kruskall closed this Dec 13, 2024
@kruskall
Copy link
Member

The change is only for 9.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant