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.

Sign up for GitHub

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

Jump to bottom

fix(logql): updated JSONExpressionParser not to unescape extracted values if it is JSON object. #14499

Merged
merged 1 commit into from
Oct 16, 2024
Merged

fix(logql): updated JSONExpressionParser not to unescape extracted values if it is JSON object. #14499

merged 1 commit into from
Oct 16, 2024
+28 −4

Conversation

vlad-diachenko
Copy link
Contributor

@vlad-diachenko vlad-diachenko commented Oct 16, 2024 •
edited
Loading

What this PR does / why we need it:
updated JSONExpressionParser not to unescape extracted values if it is a JSON object.

re: #9410

Which issue(s) this PR fixes:
Fixes #14166

Special notes for your reviewer:
Execution plan before:
before

And execution plan after:
after

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@vlad-diachenko
fix(logql): updated JSONExpressionParser to not unescape extracted va…
e711122 
…lues if it is JSON object.

re: #14166

Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
@vlad-diachenko vlad-diachenko requested a review from a team as a code owner October 16, 2024 09:27
chaudum
chaudum approved these changes Oct 16, 2024
View reviewed changes
Copy link
Contributor

@chaudum chaudum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@vlad-diachenko vlad-diachenko merged commit 08b1a90 into main Oct 16, 2024
62 checks passed
@vlad-diachenko vlad-diachenko deleted the vlad.diachenko/jsonexpressionparser-fix branch October 16, 2024 09:39
@vlad-diachenko vlad-diachenko added type/bug Somehing is not working as expected backport release-3.2.x labels Oct 16, 2024
loki-gh-app bot pushed a commit that referenced this pull request Oct 16, 2024
@vlad-diachenko @grafana-delivery-bot
fix(logql): updated JSONExpressionParser not to unescape extracted va…
2f1e1f7 
…lues if it is JSON object. (#14499)

Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
(cherry picked from commit 08b1a90)
@loki-gh-app loki-gh-app bot mentioned this pull request Oct 16, 2024
Merged
6 tasks
loki-gh-app bot pushed a commit that referenced this pull request Oct 16, 2024
@vlad-diachenko @grafana-delivery-bot
fix(logql): updated JSONExpressionParser not to unescape extracted va…
4fff9fb 
…lues if it is JSON object. (#14499)

Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
(cherry picked from commit 08b1a90)
@loki-gh-app loki-gh-app bot mentioned this pull request Oct 16, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chaudum chaudum chaudum approved these changes

Assignees
No one assigned
Labels
backport release-3.1.x backport release-3.2.x size/M type/bug Somehing is not working as expected
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

When Loki extracts label, it replaces \" with " and breaks the json
2 participants
@vlad-diachenko @chaudum