grafana / loki

Like Prometheus, but for logs.
https://grafana.com/loki
GNU Affero General Public License v3.0
23.97k stars 3.46k forks source link

chore(k227): release 3.3.0 (#14750 - manual backport) #15023

Closed trevorwhitney closed 2 days ago

trevorwhitney commented 2 days ago

What this PR does / why we need it:

Manual backport of 3.3.0

Co-authored-by: loki-gh-app[bot] 160051081+loki-gh-app[bot]@users.noreply.github.com (cherry picked from commit 3655cc042a781609f69ee42626ba5d445d0df7da)

Special notes for your reviewer:

Checklist

loki-gh-app[bot] commented 2 days ago

This PR must be merged before a backport PR will be created.

loki-gh-app[bot] commented 2 days ago

This PR must be merged before a backport PR will be created.

loki-gh-app[bot] commented 2 days ago

The backport to release-3.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-15023-to-release-3.3.x origin/release-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 3eff2150a781bea3a03cb843b51862c0dbe5d8d3

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-15023-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 15023 --json body --template 'Backport 3eff2150a781bea3a03cb843b51862c0dbe5d8d3 from #15023{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore(k227): release 3.3.0 (#14750 - manual backport) (backport release-3.3.x)' --body-file - --label 'size/L' --label 'type/docs' --label 'backport' --base release-3.3.x --milestone release-3.3.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-15023-to-release-3.3.x

# Create a pull request where the `base` branch is `release-3.3.x` and the `compare`/`head` branch is `backport-15023-to-release-3.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-15023-to-release-3.3.x