-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
fix: Ensure Drain patterns are valid for LogQL pattern match filter #12815
Conversation
Hello @JStickler!
Please, if the current pull request addresses a bug fix, label it with the |
This PR must be merged before a backport PR will be created. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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-12815-to-release-3.0.x origin/release-3.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x fd2301fd62b18eb345bc43868b40343efc1a1f10 When 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-12815-to-release-3.0.x
# Create the PR body template
PR_BODY=$(gh pr view 12815 --json body --template 'Backport fd2301fd62b18eb345bc43868b40343efc1a1f10 from #12815{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "chore: [release-3.0.x] fix: Ensure Drain patterns are valid for LogQL pattern match filter" --body-file - --label "size/L" --label "type/bug" --label "backport" --base release-3.0.x --milestone release-3.0.x --web Or, 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-12815-to-release-3.0.x
# Create a pull request where the `base` branch is `release-3.0.x` and the `compare`/`head` branch is `backport-12815-to-release-3.0.x`.
# Remove the local backport branch
git switch main
git branch -D backport-12815-to-release-3.0.x |
What this PR does / why we need it:
This fixes a bug where the Drain generates patterns which don't match within the LogQL engine.
The bug prevented the "add pattern to filter" functionality in the Logs app from working in some cases where the log line ends with whitespace or newlines.
This is a common case for logs generated from the loki-canary app as they all terminate with a new line character.
Checklist
CONTRIBUTING.md
guide (required)docs/sources/setup/upgrade/_index.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR