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

Add first chapter of flow-by-example to docs #5888

Merged
merged 19 commits into from
Jan 15, 2024

Conversation

spartan0x117
Copy link
Contributor

PR Description

Adds the first section of flow-by-example to the docs. Note I'm not super familiar with the metadata at the top of the docs, but when looking at the docs locally everything seemed reasonable.

Notes to the Reviewer

@clayton-cornell where would be the most appropriate place to include the docker-compose so users can easily use it?

PR Checklist

  • Documentation added

@clayton-cornell
Copy link
Contributor

@spartan0x117 We can include the YAML in the same directory as the tutorial, or you can add it to an assets directory similar to what has been done here: https://github.com/grafana/agent/tree/main/docs/sources/flow/tutorials/assets

@clayton-cornell
Copy link
Contributor

We should move all the screenshots/diagrams to the right location: https://grafana.com/docs/writers-toolkit/write/image-guidelines/#where-to-store-media-assets

@rfratto
Copy link
Member

rfratto commented Nov 30, 2023

Do the existing tutorials still hold educational value? Should this fully supplant the existing tutorials?

@clayton-cornell
Copy link
Contributor

Do the existing tutorials still hold educational value? Should this fully supplant the existing tutorials?

My take on it... they should be removed or re-worked into a more comprehensive tutorials.

@spartan0x117
Copy link
Contributor Author

If we go that route, should that be done in this PR or a separate one?

@clayton-cornell
Copy link
Contributor

If we go that route, should that be done in this PR or a separate one?

I'd say a separate PR... otherwise we overload this one with scope creep. :-)

@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Dec 1, 2023
@spartan0x117
Copy link
Contributor Author

I made a few changes after more carefully going through the writer's toolkit, mostly as individual commits that we can back out, if needed:

  • I used a collapse shortcode for the solution rather than a downloadable file. Someone could copy-paste it if they wanted, but this also allows them to just view it easily. (I should probably also do this with the docker-compose.yaml).
  • I also changed the list to be a repetitive list, and for styling I pushed the paragraph to a new line.
  • Switched Headline Case -> Sentence case wherever I saw it.
  • Replaced relref links with full urls, per the writer's toolkit on links and added the <AGENT_VERSION> to them.

@clayton-cornell
Copy link
Contributor

  • I used a collapse shortcode for the solution rather than a downloadable file.

There's also a (default available) Collapse/Expand code thing for code snippets in codefence markdown. Longer code blocks are automatically collpased so that codeblocks don't eat up huge amounts of screen space :-)

image

@spartan0x117
Copy link
Contributor Author

Good to know! 😄 In this case I was aiming to hide it entirely unless a reader wants to see a potential solution (and do so ideally without having to leave the page).

Copy link
Contributor

github-actions bot commented Jan 7, 2024

This PR has not had any activity in the past 30 days, so the needs-attention label has been added to it.
If you do not have enough time to follow up on this PR or you think it's no longer relevant, consider closing it.
The needs-attention label signals to maintainers that something has fallen through the cracks. No action is needed by you; your PR will be kept open and you do not have to respond to this comment. The label will be removed the next time this job runs if there is new activity.
Thank you for your contributions!

@github-actions github-actions bot added the needs-attention An issue or PR has been sitting around and needs attention. label Jan 7, 2024
@github-actions github-actions bot removed the needs-attention An issue or PR has been sitting around and needs attention. label Jan 12, 2024
@clayton-cornell
Copy link
Contributor

@spartan0x117 Are we done here? I think the docs are good enough to publish as-is.. get the info out there and we can update as needed.

@spartan0x117
Copy link
Contributor Author

Yeah I think this one should be good to go! I can merge on Monday and then work on adding the other tutorial sections 😃

@clayton-cornell clayton-cornell merged commit 77aac50 into main Jan 15, 2024
10 checks passed
@clayton-cornell clayton-cornell deleted the spartan0x117/add-flow-by-example-chapter-0 branch January 15, 2024 17:13
@clayton-cornell
Copy link
Contributor

@spartan0x117 Merged it

grafanabot pushed a commit that referenced this pull request Jan 17, 2024
* Add first chapter of flow-by-example to docs

* Update strucutre to leaf bundles, move some assets to shared directory, add docker-compose and update FAQ

* Remove unnecessary assets and change to /media/ links

* Apply suggestions from code review

Co-authored-by: Clayton Cornell <[email protected]>

* Add note admonitions and fix some links

* Rename faq.md -> get-started.md and update description

* Replace 'Grafana Agent in Flow mode' with PRODUCT_NAME param

* Remove solution file and use a collapse shortcode with a code block instead

* Change to repetitive list and shift paragraph content to new line for each

* Switch Headline Case -> Sentence case

* Replace relrefs with full urls

* Add <AGENT_VERSION> to links

* Remove docker-compose.yaml and download and add it as a code block to get-started

* Add weights to fix ordering

---------

Co-authored-by: Clayton Cornell <[email protected]>
(cherry picked from commit 77aac50)
@grafanabot
Copy link
Contributor

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

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

clayton-cornell added a commit that referenced this pull request Jan 17, 2024
…6176)

* Add first chapter of flow-by-example to docs (#5888)

* Add first chapter of flow-by-example to docs

* Update strucutre to leaf bundles, move some assets to shared directory, add docker-compose and update FAQ

* Remove unnecessary assets and change to /media/ links

* Apply suggestions from code review

Co-authored-by: Clayton Cornell <[email protected]>

* Add note admonitions and fix some links

* Rename faq.md -> get-started.md and update description

* Replace 'Grafana Agent in Flow mode' with PRODUCT_NAME param

* Remove solution file and use a collapse shortcode with a code block instead

* Change to repetitive list and shift paragraph content to new line for each

* Switch Headline Case -> Sentence case

* Replace relrefs with full urls

* Add <AGENT_VERSION> to links

* Remove docker-compose.yaml and download and add it as a code block to get-started

* Add weights to fix ordering

---------

Co-authored-by: Clayton Cornell <[email protected]>
(cherry picked from commit 77aac50)

* trigger CI

---------

Co-authored-by: Mischa Thompson <[email protected]>
BarunKGP pushed a commit to BarunKGP/grafana-agent that referenced this pull request Feb 20, 2024
* Add first chapter of flow-by-example to docs

* Update strucutre to leaf bundles, move some assets to shared directory, add docker-compose and update FAQ

* Remove unnecessary assets and change to /media/ links

* Apply suggestions from code review

Co-authored-by: Clayton Cornell <[email protected]>

* Add note admonitions and fix some links

* Rename faq.md -> get-started.md and update description

* Replace 'Grafana Agent in Flow mode' with PRODUCT_NAME param

* Remove solution file and use a collapse shortcode with a code block instead

* Change to repetitive list and shift paragraph content to new line for each

* Switch Headline Case -> Sentence case

* Replace relrefs with full urls

* Add <AGENT_VERSION> to links

* Remove docker-compose.yaml and download and add it as a code block to get-started

* Add weights to fix ordering

---------

Co-authored-by: Clayton Cornell <[email protected]>
@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.39 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.

4 participants