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] Fix minor issues in Span profiles doc #3099

Merged

Conversation

knylander-grafana
Copy link
Contributor

Fixes a missing period in the Span profiles doc. Also, minor wording fixes in the links.

@knylander-grafana knylander-grafana added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.4 This label will backport a merged PR to the release/v1.4 branch labels Mar 14, 2024
@knylander-grafana knylander-grafana self-assigned this Mar 14, 2024
@knylander-grafana knylander-grafana requested review from a team as code owners March 14, 2024 00:14
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.

Copy link
Contributor

@Rperry2174 Rperry2174 left a comment

Choose a reason for hiding this comment

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

lgtm

@knylander-grafana knylander-grafana merged commit 16e76e9 into grafana:main Mar 18, 2024
16 checks passed
github-actions bot pushed a commit that referenced this pull request Mar 18, 2024
* Fix minor issues in Span profiles doc

* Update _index.md

(cherry picked from commit 16e76e9)
Copy link
Contributor

The backport to release/v1.4 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3099-to-release/v1.4 origin/release/v1.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 16e76e958bca58edd1fbe676f6effbfe4ef26715

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-3099-to-release/v1.4
# Create the PR body template
PR_BODY=$(gh pr view 3099 --json body --template 'Backport 16e76e958bca58edd1fbe676f6effbfe4ef26715 from #3099{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.4] [DOC] Fix minor issues in Span profiles doc" --body-file - --label "type/docs" --label "backport" --base release/v1.4 --milestone release/v1.4 --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-3099-to-release/v1.4

# Create a pull request where the `base` branch is `release/v1.4` and the `compare`/`head` branch is `backport-3099-to-release/v1.4`.

# Remove the local backport branch
git switch main
git branch -D backport-3099-to-release/v1.4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.4 This label will backport a merged PR to the release/v1.4 branch backport-failed type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants