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

[DOC] Add zone-aware ingesters doc #4486

Merged

Conversation

knylander-grafana
Copy link
Contributor

What this PR does:

Adds zone-aware ingester info from the Tempo 2.0 release notes to the config docs. Needs to be expanded.

Reviewers:

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Copy link
Contributor

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

1 similar comment
Copy link
Contributor

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

@knylander-grafana knylander-grafana added the backport release-v2.7 Backport for V2.7 label Jan 7, 2025
@knylander-grafana knylander-grafana merged commit a94680c into grafana:main Jan 7, 2025
18 checks passed
Copy link
Contributor

github-actions bot commented Jan 7, 2025

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

github-actions bot pushed a commit that referenced this pull request Jan 7, 2025
* Add zone-aware ingesters doc

* Update docs/sources/tempo/operations/zone-aware-ingesters.md

(cherry picked from commit a94680c)
Copy link
Contributor

github-actions bot commented Jan 7, 2025

The backport to release-v2.7 failed:

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

To backport manually, run these commands in your terminal:

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

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-4486-to-release-v2.7
# Create the PR body template
PR_BODY=$(gh pr view 4486 --json body --template 'Backport a94680c7dc769d63d70f6f494bfe982d3f2a9b21 from #4486{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.7] [DOC] Add zone-aware ingesters doc' --body-file - --label 'type/docs' --label 'backport' --base release-v2.7 --milestone release-v2.7 --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-4486-to-release-v2.7

# Create a pull request where the `base` branch is `release-v2.7` and the `compare`/`head` branch is `backport-4486-to-release-v2.7`.

# Remove the local backport branch
git switch main
git branch -D backport-4486-to-release-v2.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-v2.6 backport release-v2.7 Backport for V2.7 backport-failed type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants