bugfix: set default max_result_limit for search to 256*1024#6525
Merged
zhxiaogg merged 4 commits intografana:mainfrom Feb 20, 2026
Merged
bugfix: set default max_result_limit for search to 256*1024#6525zhxiaogg merged 4 commits intografana:mainfrom
zhxiaogg merged 4 commits intografana:mainfrom
Conversation
mdisibio
approved these changes
Feb 20, 2026
| @@ -1,5 +1,6 @@ | |||
| ## main / unreleased | |||
|
|
|||
| * [CHANGE] Set default `max_result_limit` for search to 256*1024 [#](https://github.com/grafana/tempo/pull/6525) (@zhxiaogg) | |||
Contributor
There was a problem hiding this comment.
Adding the PR number to the link text
Suggested change
| * [CHANGE] Set default `max_result_limit` for search to 256*1024 [#](https://github.com/grafana/tempo/pull/6525) (@zhxiaogg) | |
| * [CHANGE] Set default `max_result_limit` for search to 256*1024 [#6525](https://github.com/grafana/tempo/pull/6525) (@zhxiaogg) |
|
The backport to To backport manually, run these commands in your terminal: git fetch
git switch --create backport-6525-to-release-v2.10 origin/release-v2.10
git cherry-pick -x 650eb1985a0776789c8564122990f588a742356fResolve the conflicts, then add the changes and run git add . && git cherry-pick --continueIf you have the GitHub CLI installed: git push --set-upstream origin backport-6525-to-release-v2.10
PR_BODY=$(gh pr view 6525 --json body --template 'Backport 650eb1985a0776789c8564122990f588a742356f from #6525{{ "\n\n---\n\n" }}{{ index . "body" }}')
echo "${PR_BODY}" | gh pr create --title '[release-v2.10] bugfix: set default max_result_limit for search to 256*1024' --body-file - --label 'backport' --label '' --base release-v2.10 --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): git push --set-upstream origin backport-6525-to-release-v2.10And open a pull request where the |
3 tasks
zhxiaogg
added a commit
that referenced
this pull request
Mar 10, 2026
3 tasks
zhxiaogg
added a commit
that referenced
this pull request
Mar 25, 2026
zhxiaogg
added a commit
that referenced
this pull request
Mar 26, 2026
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does:
Set the default value of
query_frontend.search.max_result_limitto 262144 (256*1024) to cap the maximum number of results returned by search requests. Previously the default was 0 (unlimited), which could allow unbounded result sets.Which issue(s) this PR fixes:
Fixes VUL-2026-0021
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]Fixes: CVE-2026-21728