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(deps): Update Thanos library #15483

Merged
merged 1 commit into from
Dec 18, 2024
Merged

chore(deps): Update Thanos library #15483

merged 1 commit into from
Dec 18, 2024

Conversation

paul1r
Copy link
Collaborator

@paul1r paul1r commented Dec 18, 2024

What this PR does / why we need it:
Newer Thanos library is utilized by GEL components, this brings Loki up to date.

Which issue(s) this PR fixes:
Fixes #

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

@paul1r paul1r requested a review from a team as a code owner December 18, 2024 18:05
Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM

@paul1r paul1r merged commit 2a23cc8 into main Dec 18, 2024
63 checks passed
@paul1r paul1r deleted the paul1r/update_thanos branch December 18, 2024 18:52
@trevorwhitney trevorwhitney added backport release-3.3.x type/bug Somehing is not working as expected labels Dec 19, 2024
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Dec 19, 2024

Hello @trevorwhitney!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Dec 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-15483-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 2a23cc836e5ee49d64721102c255864283eebede

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-15483-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 15483 --json body --template 'Backport 2a23cc836e5ee49d64721102c255864283eebede from #15483{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore(deps): Update Thanos library (backport release-3.3.x)' --body-file - --label 'size/L' --label 'type/bug' --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-15483-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-15483-to-release-3.3.x`.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants