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] Set up profiling and tracing intro for sharing #3073

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Mar 1, 2024

Changes the profiling and traces into content to be shared from grafana/grafana/docs/sources/shared/datasources and added a "Enriching profiling data" section.

Related: grafana/grafana#83739

@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 1, 2024
@knylander-grafana knylander-grafana self-assigned this Mar 1, 2024
@knylander-grafana knylander-grafana requested review from a team as code owners March 1, 2024 02:19
Copy link
Contributor

github-actions bot commented Mar 1, 2024

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

1 similar comment
Copy link
Contributor

github-actions bot commented Mar 1, 2024

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 enabled auto-merge (squash) March 1, 2024 19:42
@knylander-grafana knylander-grafana merged commit 17f53f8 into grafana:main Mar 1, 2024
16 checks passed
github-actions bot pushed a commit that referenced this pull request Mar 1, 2024
* Set up profiling and tracing intro for sharing

* ADd exnriching profile data

* Update docs/sources/configure-client/_index.md

(cherry picked from commit 17f53f8)
Copy link
Contributor

github-actions bot commented Mar 1, 2024

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-3073-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 17f53f82133e955aa3c1b9f94aa569689df52549

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-3073-to-release/v1.4
# Create the PR body template
PR_BODY=$(gh pr view 3073 --json body --template 'Backport 17f53f82133e955aa3c1b9f94aa569689df52549 from #3073{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.4] [DOC] Set up profiling and tracing intro for sharing" --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-3073-to-release/v1.4

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

# Remove the local backport branch
git switch main
git branch -D backport-3073-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.

None yet

2 participants