Loki: Fix filters not being added with multiple expressions and parsers #75152
Conversation
This file contains 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
svennergr
commented
Sep 20, 2023
| @@ -574,9 +588,19 @@ function getAllPositionsInNodeByType(query: string, node: SyntaxNode, type: numb | |||
| let pos = 0; | |||
| let child = node.childAfter(pos); | |||
| while (child) { | |||
| positions.push(...getAllPositionsInNodeByType(query, child, type)); | |||
| positions.push(...getAllPositionsInNodeByType(child, type)); | |||
| pos = child.to; | |||
| child = node.childAfter(pos); | |||
| } | |||
| return positions; | |||
| } | |||
There was a problem hiding this comment.
All those changes above are basically just chores. Let me know if I should remove them.
|
Backend code coverage report for PR #75152 |
|
Frontend code coverage report for PR #75152
|
matyax
approved these changes
Sep 20, 2023
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-75152-to-v10.1.x origin/v10.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 480aa1ccca03f267907c685a0f2358a9793ff677
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continueIf you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-75152-to-v10.1.x
# Create the PR body template
PR_BODY=$(gh pr view 75152 --json body --template 'Backport 480aa1ccca03f267907c685a0f2358a9793ff677 from #75152{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.1.x] Loki: Fix filters not being added with multiple expressions and parsers" --body-file - --label "type/bug" --label "area/frontend" --label "datasource/Loki" --label "add to changelog" --label "backport" --base v10.1.x --milestone 10.1.x --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-75152-to-v10.1.x
# Create a pull request where the `base` branch is `v10.1.x` and the `compare`/`head` branch is `backport-75152-to-v10.1.x`.
# Remove the local backport branch
git switch main
git branch -D backport-75152-to-v10.1.x |
grafana-delivery-bot
bot
added
the
backport-failed
rwwiv
pushed a commit
that referenced
this pull request
Oct 2, 2023
…rs (#75152) * determine last positions per expr * fix lint
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 is this feature?
When using a dashboard with adhoc filters and a loki query containing two metric queries and label filters, the ad hoc filter is only added to the last label filter. Previously we determined the last positions of parsers or label filters in the whole query, however we need to do that per sub expression.
Which issue(s) does this PR fix?:
Fixes #75101
How do we reproduce it?
sum(rate({place="luna"} | logfmt [$__auto])) / sum(rate({place="moon"} |json [$__auto]))query.