Skip to content

Commit 5fc53d8

Browse files
authored
Merge branch 'master' into lucastemb/site_configuration_field
Signed-off-by: Lucas Tembras <[email protected]>
2 parents 7da6118 + dc3e91b commit 5fc53d8

File tree

236 files changed

+11908
-11387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+11908
-11387
lines changed

.github/workflows/pr-lint.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,23 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v4
2323
- uses: ludeeus/action-shellcheck@master
24+
25+
markdownlint:
26+
name: runner / markdownlint
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v4
30+
- name: markdownlint
31+
uses: prologic/[email protected]
32+
with:
33+
github_token: ${{ secrets.GITHUB_TOKEN }}
34+
reporter: github-pr-review # Change reporter. (Only `github-pr-check` is supported at the moment).
35+
vale:
36+
name: runner / vale
37+
runs-on: ubuntu-latest
38+
steps:
39+
- uses: actions/checkout@v4
40+
- uses: errata-ai/[email protected]
41+
with:
42+
files: all
43+
fail_on_error: true

.markdownlint.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"MD007": { "indent": 2 },
55
"MD013": false,
66
"MD025": { "front_matter_title": "false" },
7+
"MD047": false,
78
"MD049": { "style": "underscore" },
89
"no-hard-tabs": false,
910
"whitespace": false,

.vale.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ IgnoredScopes = tt, code
55
[formats]
66
mdx = md
77

8-
[*.{md,markdown,txt,htm,html}]
8+
[*.{md,markdown}]
99
BasedOnStyles = FluentBit
1010

1111
FluentBit.Terms = YES

CONTRIBUTING.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ within a few minutes.
4242
If you open a pull request that requires ongoing discussion or review, the Fluent Bit
4343
maintainers will add a `waiting-for-user` to your pull request. This tag means that
4444
we're blocked from moving forward until you reply. To keep contributions from going
45-
stale, we'll wait 45 days for your response, but we may close the pull request if we
45+
stale, we'll wait 45 days for your response, but we might close the pull request if we
4646
don't hear back from you by then.
4747

4848
## Submit a contribution
@@ -132,20 +132,29 @@ the prose of your pull requests and adds suggestions to improve style and clarit
132132
There is a [VSCode plugin for Vale](https://marketplace.visualstudio.com/items?itemName=ChrisChinchilla.vale-vscode)
133133
which outputs suggestions to the problems pane in the IDE.
134134

135+
The Fluent Bit repository runs Vale as a GitHub Action on updated text in new pull
136+
requests. Vale suggestions, errors, and warnings will display in GitHub on the
137+
**Files changed** page.
138+
135139
[See the Vale tests for Fluent Bit](https://github.com/fluent/fluent-bit-docs/tree/master/vale-styles).
136140

137141
Most Vale tests are at the `suggestion` level and won't block merging.
138142

139-
The following tests are at a `error` level and will prevent merging:
143+
The following tests are at `error` level and will cause a test failure:
140144

141145
- [AmSpelling](https://developers.google.com/style/word-list)
146+
- [Ampersand](https://developers.google.com/style/word-list#ampersand)
147+
- [Don'tUse](https://github.com/fluent/fluent-bit-docs/blob/master/vale-styles/FluentBit/DontUse.yml)
142148
- [Emdash](https://github.com/errata-ai/Google/blob/master/Google/EmDash.yml)
143149
- [Endash](https://github.com/errata-ai/Google/blob/master/Google/EmDash.yml)
144150
- [Exclamation](https://github.com/errata-ai/Google/blob/master/Google/Exclamation.yml)
145151
- [Gender](https://developers.google.com/style/pronouns#gender-neutral-pronouns)
146152
- [GenderBias](https://developers.google.com/style/inclusive-documentation)
153+
- [Hints](https://github.com/fluent/fluent-bit-docs/blob/master/vale-styles/FluentBit/Hints.yml) using `>`.
147154
- [HeadingPunctuation](https://developers.google.com/style/capitalization#capitalization-in-titles-and-headings)
155+
- [Latin](https://developers.google.com/style/abbreviations)
148156
- [LyHyphens](https://developers.google.com/style/hyphens)
157+
- [MayMightCan](https://github.com/fluent/fluent-bit-docs/blob/master/vale-styles/FluentBit/MayMightCan.yml)
149158
- [NonStandardQuotes](https://github.com/fluent/fluent-bit-docs/blob/master/vale-styles/FluentBit/NonStandardQuotes.yml):
150159
[Use standard quotes](https://developers.google.com/style/quotation-marks#straight-and-curly-quotation-marks).
151160
By default, Google Docs and Microsoft Word turn standard straight quotes into "smart"
@@ -154,19 +163,31 @@ The following tests are at a `error` level and will prevent merging:
154163
in [Google Docs](https://support.google.com/docs/thread/217182974/can-i-turn-smart-quotes-off-in-a-google-doc?hl=en)
155164
or [Microsoft Word](https://support.microsoft.com/en-us/office/smart-quotes-in-word-and-powerpoint-702fc92e-b723-4e3d-b2cc-71dedaf2f343)
156165
to prevent this problem.
166+
- [Optional plurals](https://developers.google.com/style/plurals-parentheses)
157167
- [Ordinal](https://developers.google.com/style/numbers)
168+
- [Periods](https://developers.google.com/style/abbreviations)
169+
- [Ranges](https://developers.google.com/style/hyphens)
158170
- [Repetition](https://github.com/errata-ai/vale/blob/v3/testdata/styles/Markup/Repetition.yml):
159171
Checks for the same word used twice in succession.
172+
- [Slang](https://developers.google.com/style/abbreviations)
173+
- [Spacing](https://developers.google.com/style/sentence-spacing)
160174

161175
The following tests are at a `warning` level and won't prevent merging:
162176

163177
- [Ampersand](https://developers.google.com/style/word-list#ampersand)
178+
- [First person](https://developers.google.com/style/pronouns#personal-pronouns)
179+
- [Possessives](https://developers.google.com/style/possessives)
180+
- [Simplicity](https://developers.google.com/style/word-list#easy)
164181

165182
### Markdownlint
166183

167184
[Markdownlint](https://github.com/markdownlint/markdownlint) checks markdown in a
168185
file and makes suggestions for improvements. Most markdownlint tests are enabled.
169186
[See the configuration file](https://github.com/fluent/fluent-bit-docs/blob/master/.markdownlint.json).
170187

188+
The Fluent Bit documentation repository is using a GitHub action to check for invalid
189+
markdown based on the configuration file. This action might provide review
190+
suggestions, but doesn't block merging.
191+
171192
Line wrap tests are off due to a GitBook decision that hard wraps the rendered page
172193
on line wraps in the markdown. This leads to rendered pages with awkward line wraps.

MAINTAINERS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Fluent Bit Documentation Maintainers
22

3-
Fluent Bit is developed and supported by many individuals and companies. The following table list the names of maintainers per components and the company supporting their work.
3+
Fluent Bit is developed and supported by many individuals and companies. The following table list the names of maintainers per components and the company supporting their work.
44

55
| Maintainer Name | Documentation portion | Company |
66
| :---------------------------------------------------- | ------------------------ | ------------------------------------------------- |
@@ -11,4 +11,3 @@ Fluent Bit is developed and supported by many individuals and companies. The fo
1111
| [Alexa Kreizinger](https://github.com/alexakreizinger) | All | [Chronosphere](https://chronosphere.io) |
1212
| [Paige Cruz](https://github.com/paigerduty) | All | [Chronosphere](https://chronosphere.io/) |
1313
| [Eric D. Schabell](https://github.com/eschabell) | All | [Chronosphere](https://chronosphere.io/) |
14-

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ description: High Performance Telemetry Agent for Logs, Metrics and Traces
2424
- Connect nearly any source to nearly any destination using preexisting plugins
2525
- Extensibility:
2626
- Write input, filter, or output plugins in the C language
27-
- WASM: [WASM Filter Plugins](development/wasm-filter-plugins.md) or [WASM Input Plugins](development/wasm-input-plugins.md)
27+
- Wasm: [Wasm Filter Plugins](development/wasm-filter-plugins.md) or [Wasm Input Plugins](development/wasm-input-plugins.md)
2828
- Write [Filters in Lua](pipeline/filters/lua.md) or [Output plugins in Golang](development/golang-output-plugins.md)
2929
- [Monitoring](administration/monitoring.md): Expose internal metrics over HTTP in JSON and [Prometheus](https://prometheus.io/) format
3030
- [Stream Processing](stream-processing/introduction.md): Perform data selection and transformation using simple SQL queries

0 commit comments

Comments
 (0)