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] Pyroscope landing page for doc #3176

Conversation

knylander-grafana
Copy link
Contributor

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

Adds a landing page for Pyroscope.

image

Fixes:#3175

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

github-actions bot commented Apr 6, 2024

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

1 similar comment
Copy link
Contributor

github-actions bot commented Apr 6, 2024

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

Copy link
Contributor

@simonswine simonswine 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, this looks so much better. 👍

docs/sources/_index.md Outdated Show resolved Hide resolved
docs/sources/_index.md Show resolved Hide resolved
Co-authored-by: Christian Simon <simon@swine.de>
@knylander-grafana knylander-grafana merged commit 71e2fbd into grafana:main Apr 8, 2024
16 checks passed
github-actions bot pushed a commit that referenced this pull request Apr 8, 2024
* Pyroscope landing page for doc

* Apply suggestions from code review

Co-authored-by: Christian Simon <simon@swine.de>

* Update docs/sources/_index.md

* Update docs/sources/_index.md

---------

Co-authored-by: Christian Simon <simon@swine.de>
(cherry picked from commit 71e2fbd)
Copy link
Contributor

github-actions bot commented Apr 8, 2024

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-3176-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 71e2fbd5b2f8f1d54f4dc8e458f632b06060fe51

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-3176-to-release/v1.5
# Create the PR body template
PR_BODY=$(gh pr view 3176 --json body --template 'Backport 71e2fbd5b2f8f1d54f4dc8e458f632b06060fe51 from #3176{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.5] [DOC] Pyroscope landing page for doc" --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-3176-to-release/v1.5

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

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

@knylander-grafana knylander-grafana deleted the 3175-pyroscope-landing-page-docs branch April 8, 2024 22:09
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.

None yet

2 participants