Skip to content

Conversation

@Jayclifford345
Copy link
Contributor

What this PR does / why we need it:
Added upgrade notice for: #18558

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

@Jayclifford345 Jayclifford345 requested a review from a team as a code owner July 30, 2025 09:32
@github-actions
Copy link
Contributor

github-actions bot commented Jul 30, 2025

💻 Deploy preview deleted.

@Jayclifford345 Jayclifford345 changed the title fix(docs): added intstructions for how to upgrade zone-aware ingesters fix(docs): added instructions for how to upgrade zone-aware ingesters Jul 30, 2025
@github-actions
Copy link
Contributor

Helm Diff Output - Summary

Default Values Scenario-diff-output
Distributed Scenario-diff-output
Ingress Values Scenario-diff-output
Legacy Monitoring Values Scenario-diff-output
Simple Scalable AWS Kube IRSA Values Scenario-diff-output
Simple Thanos Values Scenario-diff-output
Single Binary Scenario-diff-output

Copy link
Contributor

@fcjack fcjack left a comment

Choose a reason for hiding this comment

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

LGTM

@Jayclifford345 Jayclifford345 merged commit aff2cb0 into main Jul 30, 2025
76 checks passed
@Jayclifford345 Jayclifford345 deleted the helm-breaking-change-doc branch July 30, 2025 10:12
@Jayclifford345
Copy link
Contributor Author

@JStickler, this will need a backport to the latest :)

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Jul 30, 2025

Hello @JStickler!
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!

@JStickler JStickler added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Jul 30, 2025
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Jul 30, 2025

The backport to release-3.5.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-18658-to-release-3.5.x origin/release-3.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x aff2cb0694cae99847b73da914ee4abd2432cdd0

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-18658-to-release-3.5.x
# Create the PR body template
PR_BODY=$(gh pr view 18658 --json body --template 'Backport aff2cb0694cae99847b73da914ee4abd2432cdd0 from #18658{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(docs): added instructions for how to upgrade zone-aware ingesters (backport release-3.5.x)' --body-file - --label 'size/M' --label 'type/docs' --label 'backport' --base release-3.5.x --milestone release-3.5.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-18658-to-release-3.5.x

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

# Remove the local backport branch
git switch main
git branch -D backport-18658-to-release-3.5.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport release-3.5.x backport-failed size/M 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.

3 participants