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

Update shared content topics #5845

Merged
merged 10 commits into from
Nov 27, 2023
Merged

Update shared content topics #5845

merged 10 commits into from
Nov 27, 2023

Conversation

clayton-cornell
Copy link
Contributor

PR Description

This PR is the first of several focused on a cleanup of the Agent Flow component reference documentation.

This PR updates the shared content topics (Flow reference docs). Changes include:

  • Adding/removing punctuation
  • Reformatting and alphabetising tables
  • Removing some (not all) of the passive voice
  • Correcting subject/verb agreement
  • Correcting singular/plural
  • Adding missing words or removing extra words (depending on the sentence)
  • Reworking to use semantic line breaks instead of the arbitrary +/- 80 columns

NOT included:

  • Fixing ALL cases of passive voice (small/no gain for high effort)
  • Adding lead-in sentences. It's hit/miss on these topics if they have a description before the table of attributes. I left it as-is in this area.

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.

LGTM! I have general concerns about sorting the table, but not enough to block the PR here.

Comment on lines +15 to +17
`credentials_file` | `string` | File containing the secret value. | | no
`credentials` | `secret` | Secret value. | | no
`type` | `string` | Authorization type, for example, "Bearer". | | no
Copy link
Member

Choose a reason for hiding this comment

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

I'm not convinced that the tables should be alphabetized. Having custom ordering for the tables means we can group related arguments together, even if they don't have similar ordering, and allows us to order things in a way that increases in increasing argument specificity, with more general and common arguments towards the top of the list.

(And for a less compelling argument, people usually see forms as "username and password" but alphabetical sorting means that we're presenting it as "password and username", which is slightly jarring but not a huge deal).

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree with @rfratto. Also, sorting rows alphabetically will be an extra burden when writing docs :/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rfratto @ptodev I did some research on this over the past 3 days, and consulted the Grafana doc team as well. The advice is to sort lists/tables alphabetically unless the order is important to understanding the information in the list/table (for example required vs optional arguments). This guideline will be added to the Grafana Writer's Toolkit.

Semantic sorting does work (username/password is a great example), but sorting this way adds its own overhead to the doc maintenance. One person's ordering (for example sorting most-used to least used things) isn't always the next person's ordering. Semantic sorting also requires that the SME (developer/community contributor) knows where in the existing lists/tables to insert new arguments. Some people place new content at the bottom of the table/list, some in the middle. It's pretty subjective and very difficult to validate.

Other precedents for sorting alphabetically can be found in OSS documentation such as Linux man pages (which sort command arguments alphabetically) - example: https://man7.org/linux/man-pages/man1/ssh.1.html

Copy link
Member

Choose a reason for hiding this comment

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

Ack, I'm fine with this outcome. Plus, this is something we could undo in the future if alpabetical sorting turns out to cause unforeseen issues.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, there's always a path back if it isn't working for some reason.

@clayton-cornell clayton-cornell merged commit dcfdce5 into main Nov 27, 2023
10 checks passed
@clayton-cornell clayton-cornell deleted the docs/update_shared_content branch November 27, 2023 19:46
grafanabot pushed a commit that referenced this pull request Nov 27, 2023
* Update layout and syntax in shared topics

* Updates to language passive voice use etc

* General updates to words syntax and voice

* Fix sorting in table

* Fix table spacing

* Correct capitalization of boolean

* Apply suggestions from code review

Co-authored-by: Robert Fratto <[email protected]>

* Update docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md

---------

Co-authored-by: Robert Fratto <[email protected]>
(cherry picked from commit dcfdce5)
grafanabot pushed a commit that referenced this pull request Nov 27, 2023
* Update layout and syntax in shared topics

* Updates to language passive voice use etc

* General updates to words syntax and voice

* Fix sorting in table

* Fix table spacing

* Correct capitalization of boolean

* Apply suggestions from code review

Co-authored-by: Robert Fratto <[email protected]>

* Update docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md

---------

Co-authored-by: Robert Fratto <[email protected]>
(cherry picked from commit dcfdce5)
clayton-cornell added a commit that referenced this pull request Nov 27, 2023
* Update layout and syntax in shared topics

* Updates to language passive voice use etc

* General updates to words syntax and voice

* Fix sorting in table

* Fix table spacing

* Correct capitalization of boolean

* Apply suggestions from code review

Co-authored-by: Robert Fratto <[email protected]>

* Update docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md

---------

Co-authored-by: Robert Fratto <[email protected]>
(cherry picked from commit dcfdce5)

Co-authored-by: Clayton Cornell <[email protected]>
clayton-cornell added a commit that referenced this pull request Nov 27, 2023
* Update layout and syntax in shared topics

* Updates to language passive voice use etc

* General updates to words syntax and voice

* Fix sorting in table

* Fix table spacing

* Correct capitalization of boolean

* Apply suggestions from code review

Co-authored-by: Robert Fratto <[email protected]>

* Update docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md

---------

Co-authored-by: Robert Fratto <[email protected]>
(cherry picked from commit dcfdce5)

Co-authored-by: Clayton Cornell <[email protected]>
@grafana grafana deleted a comment from grafanabot Nov 27, 2023
@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.37 backport release-v0.38 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