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

[chore]docs; update admonition syntax #9409

Closed
wants to merge 4 commits into from

Conversation

MattDodsonEnglish
Copy link

Following the conventions in https://grafana.com/docs/writers-toolkit/style-guide/style-conventions/#admonitions

Part of ongoing chore to standardize admonitions across docs

Following the conventions in https://grafana.com/docs/writers-toolkit/style-guide/style-conventions/#admonitions

Part of ongoing chore to standardize admonitions across docs
@CLAassistant
Copy link

CLAassistant commented May 5, 2023

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label May 5, 2023
@MattDodsonEnglish MattDodsonEnglish added area/docs and removed type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories labels May 5, 2023
@MattDodsonEnglish
Copy link
Author

@jkld11 I've tried to check how all these look in a local deploy, and I think all rendered correctly.

Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

[docs team] LGTM, I spotted a few other weird admonitions, but don't want to bog down getting this PR merged with these fixes as I have an Epic for refactoring the docs this quarter.

@@ -1237,8 +1237,9 @@ will be sent over the WebSocket multiple times.

### `GET /api/prom/query`

> **WARNING**: `/api/prom/query` is DEPRECATED; use `/loki/api/v1/query_range`
> instead.
{{% admonition type="warning" %}}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think your script missed one (because it's inconsistent in the docs)
Up at line 1191 there's a deprecation note that should be changed to a warning.

stack name and service name for each swarm service and project name
and service name for each compose service are automatically discovered and
sent as Loki labels, this way you can filter by them in Grafana.
{{% /admonition %}}
Copy link
Contributor

Choose a reason for hiding this comment

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

Line 153, another note that was missed because the formatting wasn't standard.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label May 8, 2023
@MattDodsonEnglish
Copy link
Author

I've updated the ones you found, thanks! I'm sure that these sweeps are missing a few cases, but at least we're moving in the right direction. I'm OK to merge whenever.

Copy link
Contributor

@MichelHollands MichelHollands left a comment

Choose a reason for hiding this comment

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

This looks good but you'll have to run the commands mentioned in the failing CI steps first.

@MattDodsonEnglish
Copy link
Author

OK, I tried to edit the template files in docs/sources/configuration/index.template and production/helm/loki/reference.md.gotmpl, but it seems like the % < are treated as special characters by make 1, so I couldn't add the new admonition syntax there.

From a quick Google search, I gather the fix is to add the percent character as a variable in the Makefile, and I think that's getting out of the scope for this little PR. It's not a big deal in the end; I reverted the changes with 10e0947 and 67d7c02.

Footnotes

  1. https://www.gnu.org/software/make/manual/make.html#Name-Index_fn_symbol-2

@JStickler
Copy link
Contributor

Closing as stale. Replaced by #11408

@JStickler JStickler closed this Dec 7, 2023
JStickler added a commit that referenced this pull request Dec 8, 2023
**What this PR does / why we need it**:
Updates Notes to use the Hugo admonition shortcode.

**Which issue(s) this PR fixes**:
Replaces PR #9409 which has gone stale.
JStickler added a commit that referenced this pull request Jan 10, 2024
**What this PR does / why we need it**:
Completing the work that was started in #9409 but not completed because
there were multiple variations on how to format notes in the docs source
files. We rolled out different colors for admonitions recently, which
highlighted that there were still a few notes not using the admonition
shortcode. I searched the docs for the following words:
* tip
* caution
* important
* warning
* note

So hopefully I've caught all of the admonitions that weren't using the
shortcode.
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
**What this PR does / why we need it**:
Updates Notes to use the Hugo admonition shortcode.

**Which issue(s) this PR fixes**:
Replaces PR grafana#9409 which has gone stale.
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
**What this PR does / why we need it**:
Completing the work that was started in grafana#9409 but not completed because
there were multiple variations on how to format notes in the docs source
files. We rolled out different colors for admonitions recently, which
highlighted that there were still a few notes not using the admonition
shortcode. I searched the docs for the following words:
* tip
* caution
* important
* warning
* note

So hopefully I've caught all of the admonitions that weren't using the
shortcode.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants