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.

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

docs: add info about compression #15699

Merged
merged 2 commits into from
Jan 14, 2025
Merged

docs: add info about compression #15699

merged 2 commits into from
Jan 14, 2025

Conversation

JStickler
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #https://github.com/grafana/support-escalations/issues/5893

@JStickler JStickler added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Jan 10, 2025
@JStickler JStickler requested a review from a team as a code owner January 10, 2025 22:34
Co-authored-by: Christian Haudum <[email protected]>
Signed-off-by: J Stickler <[email protected]>
@chaudum chaudum merged commit 709a3a2 into main Jan 14, 2025
60 checks passed
@chaudum chaudum deleted the SE_5893 branch January 14, 2025 06:54
loki-gh-app bot pushed a commit that referenced this pull request Jan 14, 2025
Signed-off-by: J Stickler <[email protected]>
Co-authored-by: Christian Haudum <[email protected]>
(cherry picked from commit 709a3a2)
loki-gh-app bot pushed a commit that referenced this pull request Jan 14, 2025
Signed-off-by: J Stickler <[email protected]>
Co-authored-by: Christian Haudum <[email protected]>
(cherry picked from commit 709a3a2)
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Jan 14, 2025

The backport to release-3.1.x failed:

invalid json response body at https://api.github.com/repos/grafana/loki/pulls/15753/requested_reviewers reason: Unexpected end of JSON input

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-15699-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 709a3a22c58111535456b647a0e6911250cc1423

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-15699-to-release-3.1.x
# Create the PR body template
PR_BODY=$(gh pr view 15699 --json body --template 'Backport 709a3a22c58111535456b647a0e6911250cc1423 from #15699{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: add info about compression (backport release-3.1.x)' --body-file - --label 'size/S' --label 'type/docs' --label 'backport' --base release-3.1.x --milestone release-3.1.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-15699-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-15699-to-release-3.1.x`.

# Remove the local backport branch
git switch main
git branch -D backport-15699-to-release-3.1.x

loki-gh-app bot pushed a commit that referenced this pull request Jan 14, 2025
Signed-off-by: J Stickler <[email protected]>
Co-authored-by: Christian Haudum <[email protected]>
(cherry picked from commit 709a3a2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.1.x backport release-3.2.x backport release-3.3.x backport-failed size/S type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants