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] Update screenshots in Pyroscope UI' #3234

Merged

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Apr 19, 2024

Update the screenshots in the Pyroscope UI doc to reflect Pyroscope's UI.

Fixes: #3129

Page preview
image

@knylander-grafana knylander-grafana added the type/docs Improvements for doc docs. Used by Docs team for project management label Apr 19, 2024
@knylander-grafana knylander-grafana self-assigned this Apr 19, 2024
@knylander-grafana knylander-grafana requested review from a team as code owners April 19, 2024 22:38
@knylander-grafana knylander-grafana added the backport release/v1.5 This label will backport a merged PR to the release/v1.5 branch label Apr 19, 2024
Copy link
Contributor

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

@knylander-grafana knylander-grafana merged commit 9791276 into grafana:main Apr 22, 2024
16 checks passed
github-actions bot pushed a commit that referenced this pull request Apr 22, 2024
* Update screenshots in Pyroscope UI'

* Apply suggestions from code review

(cherry picked from commit 9791276)
Copy link
Contributor

The backport to release/v1.5 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-3234-to-release/v1.5 origin/release/v1.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 97912763a3b6eeb610833b2e53adf7b7efac745a

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-3234-to-release/v1.5
# Create the PR body template
PR_BODY=$(gh pr view 3234 --json body --template 'Backport 97912763a3b6eeb610833b2e53adf7b7efac745a from #3234{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.5] [DOC] Update screenshots in Pyroscope UI'" --body-file - --label "type/docs" --label "backport" --base release/v1.5 --milestone release/v1.5 --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-3234-to-release/v1.5

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.5 This label will backport a merged PR to the release/v1.5 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.

[DOC]The pyroscope ui in the document does not appear to be consistent with the actual one
2 participants