Skip to content

Commit c3e648a

Browse files
authored
Merge branch 'master' into s3-server-side-encryption
Signed-off-by: Eric D. Schabell <eric@schabell.org>
2 parents a8f4b2e + 5231934 commit c3e648a

228 files changed

Lines changed: 10192 additions & 5035 deletions

File tree

Some content is hidden

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

.gitbook.yaml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ redirects:
22
# Installation
33
installation/upgrade_notes: ./installation/upgrade-notes.md
44
installation/supported_platforms: ./installation/downloads.md
5-
installation/docker.md: ./installation/downloads/docker.md
6-
installation/windows.md: ./installation/downloads/windows.md
5+
installation/docker: ./installation/downloads/docker.md
6+
installation/windows: ./installation/downloads/windows.md
77

88
# Inputs
99
input/collectd: ./pipeline/inputs/
@@ -76,6 +76,7 @@ redirects:
7676
output/slack: ./pipeline/outputs/slack.md
7777
output/splunk: ./pipeline/outputs/splunk.md
7878
output/stackdriver: ./pipeline/outputs/stackdriver.md
79+
outputs/stackdriver_special_fields: ./pipeline/outputs/stackdriver_special_fields.md
7980
output/stdout: ./pipeline/outputs/standard-output.md
8081
output/tcp: ./pipeline/outputs/tcp-and-tls.md
8182
output/td: ./pipeline/outputs/treasure-data.md
@@ -85,3 +86,21 @@ redirects:
8586

8687
# Other
8788
concepts/buffering: ./pipeline/buffering.md
89+
stream-processing/changelog: ./stream-processing/overview.md
90+
stream-processing/introduction: ./stream-processing/overview.md
91+
stream-processing/get-started: ./stream-processing/overview.md
92+
stream-processing/getting-started/fluent-bit-sql: ./stream-processing/fluent-bit-sql.md
93+
stream-processing/getting-started/check-keys-null-values: ./stream-processing/check-keys-null-values.md
94+
stream-processing/getting-started/hands-on: ./stream-processing/tutorial.md
95+
pipeline/pipeline-monitoring: ./administration/monitoring.md
96+
about/license: ./README.md
97+
about/history: ./about/what-is-fluent-bit.md
98+
installation/getting-started-with-fluent-bit: ./installation/downloads.md
99+
installation/requirements: ./installation/downloads.md
100+
installation/supported-platforms: ./installation/downloads.md
101+
about/sandbox-and-lab-resources: ./about/resources.md
102+
installation/downloads/amazon-ec2: ./installation/downloads/linux/amazon-linux.md
103+
administration/configuring-fluent-bit/yaml/configuration-file: ./administration/configuring-fluent-bit/yaml.md
104+
administration/configuring-fluent-bit/unit-sizes: ./administration/configuring-fluent-bit.md
105+
administration/configuring-fluent-bit/multiline-parsing: ./pipeline/parsers/multiline-parsing.md
106+
administration/buffering-and-storage: ./pipeline/buffering.md
-38.5 KB
Binary file not shown.

.github/workflows/linkcheck.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ jobs:
1414
permissions:
1515
issues: write # required for peter-evans/create-issue-from-file
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818

1919
- name: Link Checker
2020
id: lychee
2121
uses: lycheeverse/lychee-action@v2
2222
with:
23+
args: --accept '100..=103,200..=299,401,403,429' --verbose --no-progress .
2324
fail: false
2425
jobSummary: true
2526

2627
# If testing links on pull_request, comment these lines out!
2728

28-
# - name: Create Issue From File
29-
# if: steps.lychee.outputs.exit_code != 0
30-
# uses: peter-evans/create-issue-from-file@v5
31-
# with:
32-
# title: Link Checker Report
33-
# content-filepath: ./lychee/out.md
34-
# labels: report, automated issue
29+
- name: Create Issue From File
30+
if: steps.lychee.outputs.exit_code != 0
31+
uses: peter-evans/create-issue-from-file@v6
32+
with:
33+
title: Link Checker Report
34+
content-filepath: ./lychee/out.md
35+
labels: report, automated issue

.github/workflows/pr-lint.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
name: PR - Actionlint
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- run: |
1313
echo "::add-matcher::.github/actionlint-matcher.json"
1414
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
@@ -19,14 +19,14 @@ jobs:
1919
runs-on: ubuntu-latest
2020
name: PR - Shellcheck
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- uses: ludeeus/action-shellcheck@master
2424

2525
markdownlint:
2626
name: runner / markdownlint
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
- name: markdownlint
3131
uses: prologic/action-markdownlint@v0.26.2
3232
with:
@@ -36,8 +36,8 @@ jobs:
3636
name: runner / vale
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v5
40-
- uses: errata-ai/vale-action@v2.1.1
39+
- uses: actions/checkout@v6
40+
- uses: errata-ai/vale-action@2.1.2
4141
with:
4242
files: all
4343
fail_on_error: true

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ node_modules/*
33
.gitignore
44
old/*
55
.DS_Store
6-
.idea/
6+
.idea/
7+
.cursor
8+
CLAUDE.md
9+
.claude*

.vale.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ mdx = md
77

88
[*.{md,markdown}]
99
BasedOnStyles = FluentBit
10+
TokenIgnores = (\{%[^%]*%\})
1011

1112
FluentBit.Terms = YES
1213
FluentBit.Titles = YES

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @fluent/fluent-bit-maintainers @fluent/chronosphere-tech-writers
1+
* @fluent/fluent-bit-maintainers @eschabell

CONTRIBUTING.md

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
First of all, thanks for taking the time to read this guide. The fact that you're here means you're interested in contributing to Fluent Bit, and we greatly appreciate your time.
77

8-
This repository contains the files for the [Fluent Bit documentation library](https://docs.fluentbit.io/). Keeping these docs separate from the [main Fluent Bit repository](https://github.com/fluent/fluent-bit) helps reduce the number of commits to the Fluent Bit source code and makes it easier to maintain both projects.
8+
This repository contains the files for the [Fluent Bit documentation library](https://docs.fluentbit.io/manual/). Keeping these docs separate from the [main Fluent Bit repository](https://github.com/fluent/fluent-bit) helps reduce the number of commits to the Fluent Bit source code and makes it easier to maintain both projects.
99

1010
Fluent Bit has a group of dedicated maintainers who oversee this repository, including several technical writers. These writers will review any pull requests you open, so don't be afraid to contribute, even if you're not a writer by trade. Your suggestions are valuable, and we'll help you wrangle any stray commas.
1111

@@ -15,7 +15,6 @@ Before you contribute to the Fluent Bit docs, review these critical tips:
1515

1616
- [Sign off](#sign-off-your-git-commits) your Git commits.
1717
- Use [soft line wraps](#line-wraps) in Markdown files.
18-
- To link between pages, use [absolute file paths](#links).
1918
- Review the results of [linters](#linters) for style and formatting guidance.
2019

2120
## Review process
@@ -67,15 +66,7 @@ The active [linters](#linters) in this repository flag certain style errors and,
6766

6867
## Formatting guidelines
6968

70-
The Fluent Bit docs library is built and hosted through [GitBook](https://docs.gitbook.com/). Unfortunately, GitBook doesn't support local previews for contributors, but a Fluent Bit maintainer with a dedicated GitBook account can verify that things are formatted correctly after you open a new pull request.
71-
72-
### Links
73-
74-
When cross-linking between in this repository, use a full absolute path whenever possible. For example:
75-
76-
```text
77-
[LTSV](../pipeline/parsers/ltsv.md) and [Logfmt](../pipeline/parsers/logfmt.md)
78-
```
69+
The Fluent Bit docs library is built and hosted through [GitBook](https://gitbook.com/docs/). Unfortunately, GitBook doesn't support local previews for contributors, but a Fluent Bit maintainer with a dedicated GitBook account can verify that things are formatted correctly after you open a new pull request.
7970

8071
### Line wraps
8172

@@ -119,24 +110,71 @@ When you create a new `.md` file for a new page, you must add an entry to this r
119110

120111
Similarly, if you update the `# h1` title header of an existing page, be sure to update that page's `SUMMARY.md` entry to match. `SUMMARY.md` entries takes precedence over in-page headers, which means that if you update a page's `# h1` title without updating `SUMMARY.md`, the unchanged `SUMMARY.md` title will persist in both the rendered page and the table of contents.
121112

113+
## Plugin documentation
114+
115+
When documenting a Fluent Bit plugin, follow these standards to keep plugin pages consistent.
116+
117+
### Configuration parameters table
118+
119+
- **Sort parameters alphabetically** by key name.
120+
- **List all parameters** defined in the plugin's `config_map`, plus the common `workers` parameter.
121+
- **Use `_none_` in the Default cell** when the parameter's default is `NULL` in the source `config_map`. Leave the cell empty only when the parameter has no entry in `config_map` at all (for example, `host` and `port`, which come from the network defaults).
122+
- Use this table header format:
123+
124+
```markdown
125+
| Key | Description | Default |
126+
| --- | ----------- | ------- |
127+
```
128+
129+
### Configuration examples
130+
131+
Every plugin page should include both a YAML and a classic configuration example, presented as tabs:
132+
133+
```markdown
134+
{% tabs %}
135+
{% tab title="fluent-bit.yaml" %}
136+
...
137+
{% endtab %}
138+
{% tab title="fluent-bit.conf" %}
139+
...
140+
{% endtab %}
141+
{% endtabs %}
142+
```
143+
144+
### Key casing in examples
145+
146+
Key casing differs between the two configuration formats:
147+
148+
- **YAML** (`fluent-bit.yaml`): All keys are lowercase. For example: `api_key`, `log_level`, `match`.
149+
- **Classic** (`fluent-bit.conf`): Keys use Title_Case — capitalize the first letter of every underscore-separated word. For example: `Api_Key`, `Log_Level`, `Match`.
150+
151+
| YAML key | Classic key |
152+
| --- | --- |
153+
| `api_key` | `Api_Key` |
154+
| `log_group_name` | `Log_Group_Name` |
155+
| `match` | `Match` |
156+
| `name` | `Name` |
157+
158+
This applies to all keys in every section (`[SERVICE]`, `[INPUT]`, `[OUTPUT]`, and so on).
159+
122160
## Linters
123161

124162
This repository runs linters as GitHub Actions for each pull request. If a linter finds errors or makes suggested changes, you can view these results in the **Files changed** tab.
125163

126164
<details>
127165
<summary>:mag: Examples: linter results</summary>
128166

129-
![An example of a warning-level Vale result.](/.gitbook/assets/vale-example-warning.png)
167+
![An example of a warning-level Vale result.](./.gitbook/assets/vale-example-warning.png)
130168

131-
![An example of an error-level Vale result.](/.gitbook/assets/vale-example-error.png)
169+
![An example of an error-level Vale result.](./.gitbook/assets/vale-example-error.png)
132170

133-
![An example of a Markdownlint result.](/.gitbook/assets/markdownlint-example.png)
171+
![An example of a Markdownlint result.](./.gitbook/assets/markdownlint-example.png)
134172

135173
</details>
136174

137175
### Vale
138176

139-
[Vale](https://vale.sh/docs/) lints prose for style and clarity. In addition to reviewing the results of each Vale test in GitHub, you can use the [Vale plugin for VSCode](https://marketplace.visualstudio.com/items?itemName=ChrisChinchilla.vale-vscode) to view errors and suggestions locally.
177+
[Vale](https://vale.sh/docs) lints prose for style and clarity. In addition to reviewing the results of each Vale test in GitHub, you can use the [Vale plugin for VSCode](https://marketplace.visualstudio.com/items?itemName=ChrisChinchilla.vale-vscode) to view errors and suggestions locally.
140178

141179
Vale tests for the Fluent Bit docs are stored in the [`/vale-styles`](https://github.com/fluent/fluent-bit-docs/tree/master/vale-styles) folder. Most Vale tests are at the `suggestion` or `warning` level and won't block pull requests from merging. However, tests at the `error` level will block merging until the associated issue is fixed.
142180

MAINTAINERS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Fluent Bit is developed and supported by many individuals and companies. The fol
77
| [Eduardo Silva](https://github.com/edsiper) | All | [Chronosphere](https://chronosphere.io) |
88
| [Anurag Gupta](https://github.com/agup006) | All | [Chronosphere](https://chronosphere.io) |
99
| [Jose Lecaros](https://github.com/lecaros) | All | [Chronosphere](https://chronosphere.io) |
10-
| [Lynette Miles](https://github.com/esmerel) | All | [Chronosphere](https://chronosphere.io) |
11-
| [Alexa Kreizinger](https://github.com/alexakreizinger) | All | [Chronosphere](https://chronosphere.io) |
1210
| [Paige Cruz](https://github.com/paigerduty) | All | [Chronosphere](https://chronosphere.io/) |
1311
| [Eric D. Schabell](https://github.com/eschabell) | All | [Chronosphere](https://chronosphere.io/) |
12+
| [Patrick Stephens](https://github.com/patrick-stephens)| All | [Telemetry Forge](https://telemetryforge.io) |

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: High Performance Telemetry Agent for Logs, Metrics and Traces
66

77
<figure><img src=".gitbook/assets/fluent_bit_logo.png" alt=""><figcaption></figcaption></figure>
88

9-
[Fluent Bit](http://fluentbit.io) is a fast and lightweight telemetry agent for logs, metrics, and traces for Linux, macOS, Windows, and BSD family operating systems. Fluent Bit has been made with a strong focus on performance to allow the collection and processing of telemetry data from different sources without complexity.![](https://static.scarf.sh/a.png?x-pxid=71f0e011-761f-4c6f-9a89-38817887faae)
9+
[Fluent Bit](https://fluentbit.io) is a fast and lightweight telemetry agent for logs, metrics, and traces for Linux, macOS, Windows, and BSD family operating systems. Fluent Bit has been made with a strong focus on performance to allow the collection and processing of telemetry data from different sources without complexity.![](https://static.scarf.sh/a.png?x-pxid=71f0e011-761f-4c6f-9a89-38817887faae)
1010

1111
## Features
1212

@@ -16,7 +16,7 @@ description: High Performance Telemetry Agent for Logs, Metrics and Traces
1616
- Metrics support: Prometheus and OpenTelemetry compatible
1717
- Reliability and data integrity
1818
- [Backpressure](administration/backpressure.md) handling
19-
- [Data buffering](administration/buffering-and-storage.md) in memory and file system
19+
- [Data buffering](./pipeline/buffering.md) in memory and file system
2020
- Networking
2121
- Security: Built-in TLS/SSL support
2222
- Asynchronous I/O
@@ -27,7 +27,7 @@ description: High Performance Telemetry Agent for Logs, Metrics and Traces
2727
- 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
30-
- [Stream Processing](stream-processing/introduction.md): Perform data selection and transformation using basic SQL queries
30+
- [Stream Processing](stream-processing/overview.md): Perform data selection and transformation using basic SQL queries
3131
- Create new streams of data using query results
3232
- Aggregation windows
3333
- Data analysis and prediction: Time series forecasting
@@ -37,8 +37,14 @@ description: High Performance Telemetry Agent for Logs, Metrics and Traces
3737

3838
For more details about changes in each release, refer to the [official release notes](https://fluentbit.io/announcements/).
3939

40+
If you are upgrading from the Fluent Bit `4.2` series, start with [What's new in Fluent Bit v5.0](installation/whats-new-in-fluent-bit-v5.0.md) and [Upgrade notes](installation/upgrade-notes.md).
41+
4042
## Fluent Bit, Fluentd, and CNCF
4143

42-
[Fluent Bit](http://fluentbit.io) is a [CNCF](https://cncf.io) graduated sub-project under the umbrella of [Fluentd](http://fluentd.org). Fluent Bit is licensed under the terms of the [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0).
44+
Fluent Bit is a [CNCF](https://www.cncf.io/) graduated sub-project under the umbrella of [Fluentd](https://www.fluentd.org).
4345

4446
Fluent Bit was originally created by [Eduardo Silva](https://www.linkedin.com/in/edsiper/) and is now sponsored by [Chronosphere](https://chronosphere.io/). As a CNCF-hosted project, it's a fully vendor-neutral and community-driven project.
47+
48+
## License
49+
50+
Fluent Bit, including its core, plugins, and tools, is distributed under the terms of the [Apache License v2.0](https://github.com/fluent/fluent-bit?tab=Apache-2.0-1-ov-file#readme).

0 commit comments

Comments
 (0)