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] Add traces to profile content #2980

Conversation

knylander-grafana
Copy link
Contributor

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

Adds traces to profiles content from Grafana OSS and restructures the invest and analyze profile pages.

  • Ingest and analyze folder is renamed to View and analyze
  • Flamegraphs are also moved underneath the View and analyze section.
  • Profiling and traces are moved to the View and analyze section
  • Added a new page for Traces to profile content (shared file from Grafana)

This is the updated table of contents with the traces to profiles content:

image

Fixes #2662

@knylander-grafana knylander-grafana added the type/docs Improvements for doc docs. Used by Docs team for project management label Feb 1, 2024
@knylander-grafana knylander-grafana self-assigned this Feb 1, 2024
Pyroscope offers both a Command Line Interface (CLI) and an Application Programming Interface (API) to interact with and retrieve profiling data. These tools provide flexibility in how you access and manage your profiling information.

You can export profiling data from Pyroscope in various formats:
- **JSON**: JSON object easy to integrate with other tools and scripts
Copy link
Contributor

@cyriltovena cyriltovena Feb 1, 2024

Choose a reason for hiding this comment

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

The most popular is pprof and we support that, to be precised it gzip compressed pprof foo.pprof.gz

Copy link
Contributor Author

@knylander-grafana knylander-grafana Feb 6, 2024

Choose a reason for hiding this comment

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

Added pprof and removed dot.

Copy link
Contributor

@cyriltovena cyriltovena 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
Copy link
Contributor Author

Note that there is a link to a page that is created in #2982. The doc validator won't pass because of this broken link (until the other PR is merged).

@knylander-grafana knylander-grafana merged commit 2988c43 into grafana:main Feb 8, 2024
19 checks passed
@knylander-grafana knylander-grafana deleted the 2662-add-traces-to-profile-content branch February 8, 2024 04:16
@knylander-grafana knylander-grafana added the backport release/v1.4 This label will backport a merged PR to the release/v1.4 branch label Feb 29, 2024
Copy link
Contributor

The backport to release/v1.4 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2980-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 2988c4329f2bac5348e8eccb22f55d53da9d7d75

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-2980-to-release/v1.4
# Create the PR body template
PR_BODY=$(gh pr view 2980 --json body --template 'Backport 2988c4329f2bac5348e8eccb22f55d53da9d7d75 from #2980{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.4] [DOC] Add traces to profile content" --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-2980-to-release/v1.4

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

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

knylander-grafana added a commit that referenced this pull request Feb 29, 2024
* Add traces to profile content

* Rename folder to view and analyze

* Fix links

* Update docs/sources/view-and-analyze-profile-data/_index.md

* Apply suggestions from code review

* Fix links

* Apply suggestions from code review

* Update docs/sources/view-and-analyze-profile-data/_index.md

* Add link to PR 2982 content

* Apply suggestions from code review

(cherry picked from commit 2988c43)
knylander-grafana added a commit that referenced this pull request Feb 29, 2024
* [DOC] Add traces to profile content (#2980)

* Add traces to profile content

* Rename folder to view and analyze

* Fix links

* Update docs/sources/view-and-analyze-profile-data/_index.md

* Apply suggestions from code review

* Fix links

* Apply suggestions from code review

* Update docs/sources/view-and-analyze-profile-data/_index.md

* Add link to PR 2982 content

* Apply suggestions from code review

(cherry picked from commit 2988c43)

* Update docs/sources/configure-server/about-server-api.md
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.

[DOC] Add traces to profile content to Pyroscope OSS
5 participants