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 Vale rules after linting https://grafana.com/docs/grafana/next/setup-grafana/configure-grafana/ #978

Merged
merged 3 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/validate-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
docs/sources
/docs/writers-toolkit
| grep -v sources/shared
| grep -v anchorize.inline
| reviewdog
-f=rdjsonl
--fail-on-error
Expand Down
28 changes: 25 additions & 3 deletions docs/sources/review/lint-prose/rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
date: "2024-06-25"
description: A description of every Grafana Labs prose linting rule.
menuTitle: Rules
review_date: "2025-01-15"
review_date: "2025-01-16"
title: Vale rules
---

Expand Down Expand Up @@ -748,12 +748,17 @@ Instead, use the name as a modifier or rewrite to use a word like of to indicate

_`<CURRENT TEXT>`_ was matched by one or more of the following regular expressions:

- `ADOT's`
- `AI Observability's`
- `Agent's`
- `Alloy's`
- `ARN's`
- `Asserts'`
- `AWS's`
- `AWS Distro for OpenTelemetry Collector's`
- `AWS X-Ray's`
- `Beyla's`
- `BoringCrypto's`
- `CentOS's`
- `CloudWatch's`
- `Codespaces'`
Expand All @@ -763,25 +768,32 @@ _`<CURRENT TEXT>`_ was matched by one or more of the following regular expressio
- `Dynatrace's`
- `EKS's`
- `Elastic Kubernetes Service's`
- `Entra's`
- `Firehose's`
- `FreeBSD's`
- `GEM's`
- `GKE's`
- `Git's`
- `GitHub's`
- `GitLab's`
- `GNU's`
- `Grafana's`
- `Gravatar's`
- `Graylog's`
- `hashmod's`
- `IBM's`
- `Jaeger's`
- `Jira's`
- `journald's`
- `Jsonnet's`
- `Kibana's`
- `Killercoda's`
- `Kinesis'`
- `Kubernetes'`
- `Kubernetes Engine's`
- `Kustomize's`
- `LangChain's`
- `launchd's`
- `Loki's`
- `Markdown's`
- `Memcached's`
Expand All @@ -801,6 +813,7 @@ _`<CURRENT TEXT>`_ was matched by one or more of the following regular expressio
- `Podman's`
- `Postgres'`
- `PostgreSQL's`
- `pprof's`
- `Prometheus'`
- `Promtail's`
- `Pyroscope's`
Expand All @@ -809,8 +822,12 @@ _`<CURRENT TEXT>`_ was matched by one or more of the following regular expressio
- `Relational Database Service's`
- `React's`
- `Redis'`
- `RHEL's`
- `Rollup's`
- `RudderStack's`
- `Splunk's`
- `SSM's`
- `SUSE's`
- `Tempo's`
- `Thanos'`
- `Velero's`
Expand Down Expand Up @@ -956,15 +973,17 @@ Use _`<REPLACEMENT TEXT>`_ instead of _`<CURRENT TEXT>`_.
| `(?:SHA-1\|HAS-SHA1)` | `SHA-1` |
| `(?:WiFi\|wifi)` | `Wi-Fi` |
| `(?:[Oo]penshift\|openShift)` | `OpenShift` |
| `(?:[gG]itHub]\|Github)` | `GitHub` |
| `(?:[eE]-mail)` | `email` |
| `(?:[oO]pentelemetry\|openTelemetry)` | `OpenTelemetry` |
| `(?:alert[Mm]anager\|[Aa]lert [Mm]anager\|AlertManager)` | `Alertmanager` |
| `(?:cell ?phone\|smart ?phone)` | `phone\|mobile phone` |
| `(?:content\|media)-?type` | `media type` |
| `(?:e-mail\|Email\|E-mail)` | `email` |
| `(?:file ?path\|path ?name)` | `path` |
| `(?:file ?path\|path ?name)s` | `paths` |
| `(?:github\|gitHub\|Github)` | `GitHub` |
| `(?:gitlab\|gitLab\|Gitlab)` | `GitLab` |
| `(?:hamburger menu\|kebab menu)` | `menu icon` |
| `(?:java[Ss]cript\|Javascript)` | `JavaScript` |
| `(?:kill\|terminate\|abort)` | `stop\|exit\|cancel\|end` |
| `(?<!kube-)prometheus` | `Prometheus` |
| `(?<!lambda-)promtail` | `Promtail` |
Expand All @@ -973,6 +992,7 @@ Use _`<REPLACEMENT TEXT>`_ instead of _`<CURRENT TEXT>`_.
| `HTTPs` | `HTTPS` |
| `Once` | `After` |
| `RCA Workbench` | `RCA workbench` |
| `Rudderstack` | `RudderStack` |
| `VMWare` | `VMware` |
| `Vmware` | `VMware` |
| `[Ww]orld [Ww]ide [Ww]eb` | `web` |
Expand Down Expand Up @@ -1019,6 +1039,7 @@ Use _`<REPLACEMENT TEXT>`_ instead of _`<CURRENT TEXT>`_.
| `network IP address` | `internal IP address` |
| `open-source` | `open source` |
| `otel` | `OTel` |
| `otlp` | `OTLP` |
| `phlare` | `Phlare` |
| `postgres` | `Postgres` |
| `postgresql` | `PostgreSQL` |
Expand All @@ -1029,6 +1050,7 @@ Use _`<REPLACEMENT TEXT>`_ instead of _`<CURRENT TEXT>`_.
| `repo` | `repository` |
| `repos` | `repositories` |
| `right[- ]hand[- ]side` | `right-side` |
| `rudderstack` | `RudderStack` |
| `sign into` | `sign in to` |
| `sqlite` | `SQLite` |
| `style sheet` | `stylesheet` |
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/review/test-documentation-changes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To run the local documentation web server, ensure that you are in the right dire
{{< /admonition >}}

The output message of a successful build includes a URL that you can follow to view the changes to the documentation in the browser.
Refer to an [example of a successful build](#example-succesful-build).
Refer to an [example of a successful build](#example-successful-build).

## Run with specific projects

Expand Down
9 changes: 9 additions & 0 deletions vale/Grafana/styles/Grafana/Acronyms.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
"exceptions":
- "ADOT"
- "API"
- "APT"
- "ARN"
- "AWS"
- "BPF"
- "CLI"
- "CORS"
- "CPU"
- "CRD"
- "CSS"
- "CSV"
- "DNS"
- "DOM"
- "eBPF"
- "FAQ"
- "GNU"
- "GPG"
- "GPU"
- "GUI"
- "HTML"
Expand All @@ -24,6 +29,7 @@
- "JSON"
- "JSX"
- "LESS"
- "NAT"
- "OSS"
- "OTLP"
- "PDF"
Expand All @@ -32,6 +38,7 @@
- "RAM"
- "RBAC"
- "REPL"
- "RHEL"
- "RPM"
- "RSA"
- "SCM"
Expand All @@ -41,9 +48,11 @@
- "SHA-1"
- "SQL"
- "SSD"
- "SSM"
- "SSH"
- "SSL"
- "SSO"
- "SUSE"
- "SVG"
- "TCP"
- "TLS"
Expand Down
4 changes: 2 additions & 2 deletions vale/Grafana/styles/Grafana/AmazonProductNames.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"extends": "conditional"
"first": "\\b(CloudWatch|Data Firehose|Elastic Kubernetes Service|Firehose|Kinesis|Relational Database Service)\\b"
"first": "\\b(ARN|AWS Distro for OpenTelemetry Collector|AWS X-Ray|CloudWatch|Data Firehose|Elastic Kubernetes Service|Firehose|Kinesis|Relational Database Service|SSM)\\b"
"level": "warning"
"link": "https://grafana.com/docs/writers-toolkit/write/style-guide/capitalization-punctuation/#amazon-products"
"message": "Use the full Amazon product name in the first instance."
"scope": "text"
"second": "Amazon (CloudWatch|Data Firehose|Elastic Kubernetes Service|Firehose|Kinesis|Relational Database Service)"
"second": "Amazon (ARN|AWS Distro for OpenTelemetry Collector|AWS X-Ray|CloudWatch|Data Firehose|Elastic Kubernetes Service|Firehose|Kinesis|Relational Database Service|SSM)"
6 changes: 6 additions & 0 deletions vale/Grafana/styles/Grafana/Headings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
- "Dynatrace"
- "EKS"
- "Elastic Kubernetes Service"
- "Entra"
- "Firehose"
- "FreeBSD"
- "GEM"
- "GKE"
- "Git"
- "GitHub"
- "GitLab"
- "GNU"
- "Grafana"
- "Gravatar"
Expand Down Expand Up @@ -83,6 +85,7 @@
- "Redis"
- "RHEL"
- "Rollup"
- "RudderStack"
- "Splunk"
- "SSM"
- "SUSE"
Expand All @@ -105,6 +108,7 @@
- "CLA"
- "CLI"
- "CLS"
- "CMS"
- "CORS"
- "CPU"
- "CRD"
Expand All @@ -127,6 +131,7 @@
- "HTTP"
- "HTTPS"
- "IBM"
- "ICU"
- "IDE"
- "JAR"
- "JPG"
Expand Down Expand Up @@ -210,6 +215,7 @@
- "HyperText Markup Language"
- "HyperText Transfer Protocol"
- "HyperText Transfer Protocol Secure"
- "International Components for Unicode"
- "Kubernetes-based Event-Driven Autoscaling"
- "Largest Contentful Paint"
- "Leaner Style Sheets"
Expand Down
17 changes: 17 additions & 0 deletions vale/Grafana/styles/Grafana/ProductPossessives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@
Don't form a possessive from a feature name, product name, or trademark, regardless of who owns it.
Instead, use the name as a modifier or rewrite to use a word like of to indicate the relationship.
"tokens":
- "ADOT's"
- "AI Observability's"
- "Agent's"
- "Alloy's"
- "ARN's"
- "Asserts'"
- "AWS's"
- "AWS Distro for OpenTelemetry Collector's"
- "AWS X-Ray's"
- "Beyla's"
- "BoringCrypto's"
- "CentOS's"
- "CloudWatch's"
- "Codespaces'"
Expand All @@ -20,25 +25,32 @@
- "Dynatrace's"
- "EKS's"
- "Elastic Kubernetes Service's"
- "Entra's"
- "Firehose's"
- "FreeBSD's"
- "GEM's"
- "GKE's"
- "Git's"
- "GitHub's"
- "GitLab's"
- "GNU's"
- "Grafana's"
- "Gravatar's"
- "Graylog's"
- "hashmod's"
- "IBM's"
- "Jaeger's"
- "Jira's"
- "journald's"
- "Jsonnet's"
- "Kibana's"
- "Killercoda's"
- "Kinesis'"
- "Kubernetes'"
- "Kubernetes Engine's"
- "Kustomize's"
- "LangChain's"
- "launchd's"
- "Loki's"
- "Markdown's"
- "Memcached's"
Expand All @@ -58,6 +70,7 @@
- "Podman's"
- "Postgres'"
- "PostgreSQL's"
- "pprof's"
- "Prometheus'"
- "Promtail's"
- "Pyroscope's"
Expand All @@ -66,8 +79,12 @@
- "Relational Database Service's"
- "React's"
- "Redis'"
- "RHEL's"
- "Rollup's"
- "RudderStack's"
- "Splunk's"
- "SSM's"
- "SUSE's"
- "Tempo's"
- "Thanos'"
- "Velero's"
Expand Down
9 changes: 7 additions & 2 deletions vale/Grafana/styles/Grafana/WordList.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@
"(?:SHA-1|HAS-SHA1)": "SHA-1"
"(?:WiFi|wifi)": "Wi-Fi"
"(?:[Oo]penshift|openShift)": "OpenShift"
"(?:[gG]itHub]|Github)": "GitHub"
"(?:[eE]-mail)": "email"
"(?:[oO]pentelemetry|openTelemetry)": "OpenTelemetry"
"(?:alert[Mm]anager|[Aa]lert [Mm]anager|AlertManager)": "Alertmanager"
"(?:cell ?phone|smart ?phone)": "phone|mobile phone"
"(?:content|media)-?type": "media type"
"(?:e-mail|Email|E-mail)": "email"
"(?:file ?path|path ?name)": "path"
"(?:file ?path|path ?name)s": "paths"
"(?:github|gitHub|Github)": "GitHub"
"(?:gitlab|gitLab|Gitlab)": "GitLab"
"(?:hamburger menu|kebab menu)": "menu icon"
"(?:java[Ss]cript|Javascript)": "JavaScript"
"(?:kill|terminate|abort)": "stop|exit|cancel|end"
"(?<!kube-)prometheus": "Prometheus"
"(?<!lambda-)promtail": "Promtail"
Expand All @@ -27,6 +29,7 @@
"HTTPs": "HTTPS"
"Once": "After"
"RCA Workbench": "RCA workbench"
"Rudderstack": "RudderStack"
"VMWare": "VMware"
"Vmware": "VMware"
"[Ww]orld [Ww]ide [Ww]eb": "web"
Expand Down Expand Up @@ -73,6 +76,7 @@
"network IP address": "internal IP address"
"open-source": "open source"
"otel": "OTel"
"otlp": "OTLP"
"phlare": "Phlare"
"postgres": "Postgres"
"postgresql": "PostgreSQL"
Expand All @@ -83,6 +87,7 @@
"repo": "repository"
"repos": "repositories"
"right[- ]hand[- ]side": "right-side"
"rudderstack": "RudderStack"
"sign into": "sign in to"
"sqlite": "SQLite"
"style sheet": "stylesheet"
Expand Down
2 changes: 1 addition & 1 deletion vale/Grafana/styles/config/dictionaries/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ en_US-places.dic: en_US-places.wordlist
cat <(wc -l <$< | tr -d ' ') $< > $@

en_US-grafana.dic: ## Create a Hunspell dictionary for Grafana from the Jsonnet dictionary.
en_US-grafana.dic: en_US-grafana.jsonnet ../../../../dictionary.libsonnet $(wildcard ../../../../dictionary/*.libsonnet)
en_US-grafana.dic: en_US-grafana.jsonnet ../../../../dictionary.libsonnet $(wildcard ../../../../dictionary/*.jsonnet)
jsonnet -S en_US-grafana.jsonnet > $@
Loading
Loading