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 flamegraphs.md #3233

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Conversation

knylander-grafana
Copy link
Contributor

Add link to the Pyroscope UI doc in the flame graph doc.

@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 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 19:35
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.

Co-authored-by: Aleksandar Petrov <8142643+aleks-p@users.noreply.github.com>
@knylander-grafana knylander-grafana merged commit 589b4c5 into main Apr 19, 2024
16 checks passed
@knylander-grafana knylander-grafana deleted the knylander-grafana-patch-1 branch April 19, 2024 23:10
github-actions bot pushed a commit that referenced this pull request Apr 19, 2024
* Update flamegraphs.md

* Apply suggestions from code review

Co-authored-by: Aleksandar Petrov <8142643+aleks-p@users.noreply.github.com>

---------

Co-authored-by: Aleksandar Petrov <8142643+aleks-p@users.noreply.github.com>
(cherry picked from commit 589b4c5)
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-3233-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 589b4c5f71ad8ee5830e807a1652027e59a81b52

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-3233-to-release/v1.5
# Create the PR body template
PR_BODY=$(gh pr view 3233 --json body --template 'Backport 589b4c5f71ad8ee5830e807a1652027e59a81b52 from #3233{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.5] [DOC Update flamegraphs.md" --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-3233-to-release/v1.5

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

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

knylander-grafana added a commit that referenced this pull request Apr 19, 2024
* Update flamegraphs.md

* Apply suggestions from code review

Co-authored-by: Aleksandar Petrov <8142643+aleks-p@users.noreply.github.com>

---------

Co-authored-by: Aleksandar Petrov <8142643+aleks-p@users.noreply.github.com>
(cherry picked from commit 589b4c5)
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