fix: Backporting 19989 into 3.6 - #21356
Merged
Merged
Conversation
paul1r
approved these changes
Apr 1, 2026
spiridonov
enabled auto-merge (squash)
April 1, 2026 17:02
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-21356-to-release-3.6.x origin/release-3.6.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 0f56890f0536200d1ebb22bcc3488d0e79d9285bWhen 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-21356-to-release-3.6.x
# Create the PR body template
PR_BODY=$(gh pr view 21356 --json body --template 'Backport 0f56890f0536200d1ebb22bcc3488d0e79d9285b from #21356{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix: Backporting 19989 into 3.6 (backport release-3.6.x)' --body-file - --label 'size/XS' --label 'type/bug' --label 'product-approved' --label 'backport' --base release-3.6.x --milestone release-3.6.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-21356-to-release-3.6.x
# Create a pull request where the `base` branch is `release-3.6.x` and the `compare`/`head` branch is `backport-21356-to-release-3.6.x`.
# Remove the local backport branch
git switch main
git branch -D backport-21356-to-release-3.6.x |
This was referenced Apr 1, 2026
This was referenced Jun 23, 2026
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:
Manual backport of #19989 to 3.6 branch as per https://github.com/grafana/support-escalations/issues/20615#issuecomment-4012195758
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PRNote
Low Risk
Low risk Makefile-only change affecting how
promtailis built whenPROMTAIL_JOURNAL_ENABLED=true; the main risk is unintended build-flag formatting issues in some environments.Overview
Adjusts the
Makefilepromtail build to append thepromtail_journal_enabledbuild tag to the existing Go build flags instead of replacing tags entirely.When
PROMTAIL_JOURNAL_ENABLED=true,promtailandpromtail-debugnow build with an extra,promtail_journal_enabledtag added to$(PROMTAIL_GO_FLAGS)/$(PROMTAIL_DEBUG_GO_FLAGS), preserving existing tags likenetgo.Written by Cursor Bugbot for commit fdfffaa. This will update automatically on new commits. Configure here.