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

Clarify data collection in Grafana Agent #5656

Merged
merged 4 commits into from
Oct 30, 2023

Conversation

clayton-cornell
Copy link
Contributor

PR Description

This PR moves Data Collection info to a more central location and links from install topics back to data collection.

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated
  • Documentation added
  • Tests updated
  • Config converters updated

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

Thanks Clayton! Already an improvement :)

docs/sources/data-collection.md Outdated Show resolved Hide resolved
docs/sources/data-collection.md Show resolved Hide resolved
@clayton-cornell clayton-cornell enabled auto-merge (squash) October 30, 2023 19:53
@clayton-cornell clayton-cornell merged commit e08bcbb into main Oct 30, 2023
10 checks passed
@clayton-cornell clayton-cornell deleted the docs/clarify-data-collection branch October 30, 2023 22:23
grafanabot pushed a commit that referenced this pull request Oct 30, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link

(cherry picked from commit e08bcbb)
@grafanabot
Copy link
Contributor

The backport to release-v0.35 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-5656-to-release-v0.35 origin/release-v0.35
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e08bcbbe7e23ee9297e60d24589494c8ae66ab15
# Push it to GitHub
git push --set-upstream origin backport-5656-to-release-v0.35
git switch main
# Remove the local backport branch
git branch -D backport-5656-to-release-v0.35

Then, create a pull request where the base branch is release-v0.35 and the compare/head branch is backport-5656-to-release-v0.35.

grafanabot pushed a commit that referenced this pull request Oct 30, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link

(cherry picked from commit e08bcbb)
grafanabot pushed a commit that referenced this pull request Oct 30, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link

(cherry picked from commit e08bcbb)
clayton-cornell added a commit that referenced this pull request Oct 30, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link

(cherry picked from commit e08bcbb)

Co-authored-by: Clayton Cornell <[email protected]>
clayton-cornell added a commit that referenced this pull request Oct 31, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link

(cherry picked from commit e08bcbb)

Co-authored-by: Clayton Cornell <[email protected]>
rfratto pushed a commit that referenced this pull request Oct 31, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link

(cherry picked from commit e08bcbb)
hainenber pushed a commit to hainenber/agent that referenced this pull request Nov 1, 2023
* Clarify data collection

* Clarify data collection done onlly in Static mode

* Update links and add missing data collection

* Fix broken link
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport release-v0.35 backport release-v0.36 backport release-v0.37 frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants