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.

Sign up for GitHub

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

Jump to bottom

[DOC] Convert Agent doc to Alloy #3621

Merged
merged 10 commits into from
Oct 11, 2024
Merged

[DOC] Convert Agent doc to Alloy #3621

merged 10 commits into from
Oct 11, 2024

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Oct 11, 2024 •
edited
Loading

Converts content from using Agent to Alloy.

Changes:

  • Most of the Agent configuration sections are removed.
  • Links are updated to point to the Alloy docs
  • Global search to check for any references to Agent

What needs to be checked:

  • Verify that the config file snippets work. The configuration file changes were made with help from @clayton-cornell (Alloy writer).
  • Check any graphics to see if they mention Agent or Alloy, and update if needed.
  • Sampling scrap targets
  • Helm chart doc updates

Fixes #3271

@knylander-grafana knylander-grafana added the type/docs Improvements for doc docs. Used by Docs team for project management label Oct 11, 2024
korniltsev
korniltsev approved these changes Oct 11, 2024
View reviewed changes
Copy link
Collaborator

@korniltsev korniltsev left a comment

Choose a reason for hiding this comment

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

lgtm

docs/sources/configure-client/_index.md Outdated Show resolved Hide resolved
docs/sources/configure-client/grafana-agent/_index.md Show resolved Hide resolved
docs/sources/configure-client/grafana-agent/ebpf/setup-linux.md Outdated Show resolved Hide resolved
docs/sources/configure-client/grafana-agent/java/_index.md Outdated Show resolved Hide resolved
docs/sources/configure-client/language-sdks/nodejs.md Outdated Show resolved Hide resolved
marcsanmi
marcsanmi approved these changes Oct 11, 2024
View reviewed changes
Copy link
Contributor

@marcsanmi marcsanmi left a comment

Choose a reason for hiding this comment

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

LGTM 👍

docs/sources/configure-client/grafana-agent/_index.md Show resolved Hide resolved
aleks-p
aleks-p approved these changes Oct 11, 2024
View reviewed changes
Copy link
Contributor

@aleks-p aleks-p left a comment

Choose a reason for hiding this comment

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

Looks good to me, added a few minor suggestions.

docs/sources/_index.md Outdated Show resolved Hide resolved
docs/sources/configure-client/_index.md Outdated Show resolved Hide resolved
docs/sources/configure-client/grafana-agent/_index.md Outdated Show resolved Hide resolved
docs/sources/configure-client/grafana-agent/ebpf/_index.md Outdated Show resolved Hide resolved
docs/sources/configure-client/grafana-agent/ebpf/setup-kubernetes.md Outdated Show resolved Hide resolved
@knylander-grafana @aleks-p
Apply suggestions from code review
b4f5cb2 
Co-authored-by: Aleksandar Petrov <[email protected]>
@knylander-grafana knylander-grafana merged commit 7d12282 into grafana:main Oct 11, 2024
18 checks passed
@knylander-grafana knylander-grafana deleted the 3271-agent-to-alloy branch October 11, 2024 22:08
@knylander-grafana
Copy link
Contributor Author

Checking if it's safe to backport this PR to 1.9. It changes a lot of pages.

@knylander-grafana knylander-grafana added the backport release/v1.9 This label will backport a merged PR to the release/v1.9 branch label Oct 11, 2024
github-actions bot pushed a commit that referenced this pull request Oct 11, 2024
@knylander-grafana @grafana-delivery-bot
[DOC] Convert Agent doc to Alloy (#3621)
f9cbf24 
* Convert Agent doc to Alloy

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Aleksandar Petrov <[email protected]>

* Update docs/sources/configure-client/grafana-agent/ebpf/setup-docker.md

* Change grafana-alloy to grafana-agent; update links

* Clarify Alloy config steps

* Update docs/sources/upgrade-guide/_index.md

* Update docs/sources/upgrade-guide/_index.md

---------

Co-authored-by: Aleksandar Petrov <[email protected]>
(cherry picked from commit 7d12282)
@github-actions github-actions bot mentioned this pull request Oct 11, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clayton-cornell clayton-cornell clayton-cornell left review comments

@korniltsev korniltsev korniltsev approved these changes

@aleks-p aleks-p aleks-p approved these changes

@marcsanmi marcsanmi marcsanmi approved these changes

Assignees

@marcsanmi marcsanmi

@knylander-grafana knylander-grafana

Labels
backport release/v1.9 This label will backport a merged PR to the release/v1.9 branch type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[DOC] Update Pyroscope for Agent > Alloy
5 participants
@knylander-grafana @korniltsev @aleks-p @marcsanmi @clayton-cornell