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

Update architecture.md #4475

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Update architecture.md #4475

merged 2 commits into from
Jan 7, 2025

Conversation

xogoodnow
Copy link
Contributor

What this PR does:
Hi,
Clarified the querier's role in querying both ingesters and backend storage. Also, Improved grammar and rephrased.

Checklist

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

Hi,

Clarified the  querier's role in querying both ingesters and backend storage.  Also, Improved grammar and rephrased.
Copy link
Contributor

@javiermolinar javiermolinar left a comment

Choose a reason for hiding this comment

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

I'm good with this, but I would like @knylander-grafana to double check

Copy link
Contributor

@knylander-grafana knylander-grafana left a comment

Choose a reason for hiding this comment

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

Thank you for updating the docs!

Copy link
Contributor

github-actions bot commented Jan 7, 2025

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

1 similar comment
Copy link
Contributor

github-actions bot commented Jan 7, 2025

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

@knylander-grafana knylander-grafana merged commit 0ec6d08 into grafana:main Jan 7, 2025
20 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 7, 2025
* Update architecture.md

Hi,

Clarified the  querier's role in querying both ingesters and backend storage.  Also, Improved grammar and rephrased.

* Apply suggestions from code review

---------

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit 0ec6d08)
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-4475-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 0ec6d085722b270de1c93939a10dc477183881f5

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-4475-to-release-v2.7
# Create the PR body template
PR_BODY=$(gh pr view 4475 --json body --template 'Backport 0ec6d085722b270de1c93939a10dc477183881f5 from #4475{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.7] Update architecture.md' --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-4475-to-release-v2.7

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

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

electron0zero pushed a commit that referenced this pull request Jan 7, 2025
* Update architecture.md (#4475)

* Update architecture.md

Hi,

Clarified the  querier's role in querying both ingesters and backend storage.  Also, Improved grammar and rephrased.

* Apply suggestions from code review

---------

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit 0ec6d08)

* Update docs/sources/tempo/operations/architecture.md

---------

Co-authored-by: Ali <115415312+xogoodnow@users.noreply.github.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
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.

3 participants