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

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

Merged
merged 3 commits into from
Nov 19, 2024

Conversation

trevorwhitney
Copy link
Collaborator

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 3655cc0)

Special notes for your reviewer:

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

loki-gh-app bot and others added 2 commits November 19, 2024 11:34
Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com>
(cherry picked from commit 3655cc0)
@trevorwhitney trevorwhitney requested a review from a team as a code owner November 19, 2024 18:47

### Bug Fixes

* **promtail:** fix parser for azureeventhubs message without time field ([#14218](https://github.com/grafana/loki/pull/14218))
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

there should no longer be an "Unreleased" section, it was my mistake approving a PR with this change.

@trevorwhitney trevorwhitney added type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories backport release-3.3.x labels Nov 19, 2024
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 19, 2024

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

1 similar comment
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 19, 2024

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

@trevorwhitney trevorwhitney merged commit 3eff215 into main Nov 19, 2024
61 checks passed
@trevorwhitney trevorwhitney deleted the backport-14750-to-main branch November 19, 2024 18:58
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 19, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.3.x backport-failed size/L 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