fix(logql): Fix panic in json parsing when using empty array index - #14393
Merged
Conversation
This PR fixes a panic that occurs with the following json parser
expression:
```
| json keys[""]
```
when the log line is the following:
```json
{"keys": ["a", "b", "c"]}
```
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
chaudum
force-pushed
the
chaudum/fix-panic-in-json-parsing
branch
from
October 4, 2024 15:37
9a83c57 to
a116b50
Compare
Contributor
|
This PR must be merged before a backport PR will be created. |
2 similar comments
Contributor
|
This PR must be merged before a backport PR will be created. |
Contributor
|
This PR must be merged before a backport PR will be created. |
Contributor
|
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-14393-to-release-3.1.x origin/release-3.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 833bf0def6a07e2f58996f54b4b983858750e3e3When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-14393-to-release-3.1.x
# Create the PR body template
PR_BODY=$(gh pr view 14393 --json body --template 'Backport 833bf0def6a07e2f58996f54b4b983858750e3e3 from #14393{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(logql): Fix panic in json parsing when using empty array index (backport release-3.1.x)' --body-file - --label 'size/S' --label 'type/bug' --label 'backport' --base release-3.1.x --milestone release-3.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-14393-to-release-3.1.x
# Create a pull request where the `base` branch is `release-3.1.x` and the `compare`/`head` branch is `backport-14393-to-release-3.1.x`.
# Remove the local backport branch
git switch main
git branch -D backport-14393-to-release-3.1.x |
Contributor
|
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-14393-to-release-3.2.x origin/release-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 833bf0def6a07e2f58996f54b4b983858750e3e3When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-14393-to-release-3.2.x
# Create the PR body template
PR_BODY=$(gh pr view 14393 --json body --template 'Backport 833bf0def6a07e2f58996f54b4b983858750e3e3 from #14393{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(logql): Fix panic in json parsing when using empty array index (backport release-3.2.x)' --body-file - --label 'size/S' --label 'type/bug' --label 'backport' --base release-3.2.x --milestone release-3.2.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-14393-to-release-3.2.x
# Create a pull request where the `base` branch is `release-3.2.x` and the `compare`/`head` branch is `backport-14393-to-release-3.2.x`.
# Remove the local backport branch
git switch main
git branch -D backport-14393-to-release-3.2.x |
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 / why we need it:
This PR fixes a panic that occurs with the following json parser expression:
when the log line is the following:
{"keys": ["a", "b", "c"]}Special notes for your reviewer:
Requires grafana/jsonparser#6 and updating the upstream.
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR