Skip to content

Commit 53420a5

Browse files
authored
Merge branch 'fluent:master' into master
2 parents 4123fa6 + e8f4a93 commit 53420a5

29 files changed

+476
-82
lines changed

.gitbook.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,6 @@ redirects:
8282

8383
# Processors
8484
processor/metrics_selector: ./pipeline/processors/metrics_selector.md
85+
86+
# Other
87+
concepts/buffering: ./pipeline/buffering.md

SUMMARY.md

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
## Concepts
1414

1515
* [Key concepts](concepts/key-concepts.md)
16-
* [Buffering](concepts/buffering.md)
1716
* [Data pipeline](concepts/data-pipeline.md)
1817

1918
## Installation
@@ -26,16 +25,16 @@
2625
* [Build with static configuration](installation/downloads/source/build-with-static-configuration.md)
2726
* [Linux packages](installation/downloads/linux.md)
2827
* [Amazon Linux](installation/downloads/linux/amazon-linux.md)
29-
* [Rocky Linux and Alma Linux ](installation/downloads/linux/alma-rocky.md)
30-
* [Red Hat and CentOS](installation/downloads/linux/redhat-centos.md)
28+
* [Buildroot embedded Linux](installation/downloads/linux/buildroot-embedded-linux.md)
3129
* [Debian](installation/downloads/linux/debian.md)
32-
* [Ubuntu](installation/downloads/linux/ubuntu.md)
3330
* [Raspbian and Raspberry Pi](installation/downloads/linux/raspbian-raspberry-pi.md)
31+
* [Red Hat and CentOS](installation/downloads/linux/redhat-centos.md)
32+
* [Rocky Linux and Alma Linux ](installation/downloads/linux/alma-rocky.md)
33+
* [Ubuntu](installation/downloads/linux/ubuntu.md)
3434
* [Yocto embedded Linux](installation/downloads/linux/yocto-embedded-linux.md)
35-
* [Buildroot embedded Linux](installation/downloads/linux/buildroot-embedded-linux.md)
36-
* [Docker](installation/downloads/docker.md)
37-
* [Containers on AWS](installation/downloads/aws-container.md)
3835
* [Amazon EC2](installation/downloads/amazon-ec2.md)
36+
* [Containers on AWS](installation/downloads/aws-container.md)
37+
* [Docker](installation/downloads/docker.md)
3938
* [Kubernetes](installation/downloads/kubernetes.md)
4039
* [macOS](installation/downloads/macos.md)
4140
* [Windows](installation/downloads/windows.md)
@@ -45,36 +44,37 @@
4544

4645
* [Configure Fluent Bit](administration/configuring-fluent-bit.md)
4746
* [YAML configuration](administration/configuring-fluent-bit/yaml.md)
47+
* [Configuration file](administration/configuring-fluent-bit/yaml/configuration-file.md)
48+
* [Environment variables](administration/configuring-fluent-bit/yaml/environment-variables-section.md)
49+
* [Includes](administration/configuring-fluent-bit/yaml/includes-section.md)
4850
* [Service](administration/configuring-fluent-bit/yaml/service-section.md)
4951
* [Parsers](administration/configuring-fluent-bit/yaml/parsers-section.md)
5052
* [Multiline parsers](administration/configuring-fluent-bit/yaml/multiline-parsers-section.md)
5153
* [Pipeline](administration/configuring-fluent-bit/yaml/pipeline-section.md)
5254
* [Plugins](administration/configuring-fluent-bit/yaml/plugins-section.md)
5355
* [Upstream servers](administration/configuring-fluent-bit/yaml/upstream-servers-section.md)
54-
* [Environment variables](administration/configuring-fluent-bit/yaml/environment-variables-section.md)
55-
* [Includes](administration/configuring-fluent-bit/yaml/includes-section.md)
5656
* [Classic mode](administration/configuring-fluent-bit/classic-mode.md)
57-
* [Format and schema](administration/configuring-fluent-bit/classic-mode/format-schema.md)
58-
* [Configuration file](administration/configuring-fluent-bit/classic-mode/configuration-file.md)
59-
* [Variables](administration/configuring-fluent-bit/classic-mode/variables.md)
57+
* [Configuration file](administration/configuring-fluent-bit/classic-mode/configuration-file.md)
6058
* [Commands](administration/configuring-fluent-bit/classic-mode/commands.md)
59+
* [Format and schema](administration/configuring-fluent-bit/classic-mode/format-schema.md)
60+
* [Record accessor syntax](administration/configuring-fluent-bit/classic-mode/record-accessor.md)
6161
* [Upstream servers](administration/configuring-fluent-bit/classic-mode/upstream-servers.md)
62-
* [Record accessor syntax](administration/configuring-fluent-bit/classic-mode/record-accessor.md)
63-
* [Unit Sizes](administration/configuring-fluent-bit/unit-sizes.md)
62+
* [Variables](administration/configuring-fluent-bit/classic-mode/variables.md)
6463
* [Multiline parsing](administration/configuring-fluent-bit/multiline-parsing.md)
65-
* [TLS](administration/transport-security.md)
66-
* [Buffering and storage](administration/buffering-and-storage.md)
64+
* [Unit Sizes](administration/configuring-fluent-bit/unit-sizes.md)
65+
* [AWS credentials](administration/aws-credentials.md)
6766
* [Backpressure](administration/backpressure.md)
68-
* [Scheduling and retries](administration/scheduling-and-retries.md)
69-
* [Networking](administration/networking.md)
67+
* [Buffering and storage](administration/buffering-and-storage.md)
68+
* [Hot reload](administration/hot-reload.md)
69+
* [HTTP proxy](administration/http-proxy.md)
7070
* [Memory management](administration/memory-management.md)
7171
* [Monitoring](administration/monitoring.md)
7272
* [Multithreading](administration/multithreading.md)
73-
* [HTTP proxy](administration/http-proxy.md)
74-
* [Hot reload](administration/hot-reload.md)
75-
* [Troubleshooting](administration/troubleshooting.md)
73+
* [Networking](administration/networking.md)
7674
* [Performance tips](administration/performance.md)
77-
* [AWS credentials](administration/aws-credentials.md)
75+
* [Scheduling and retries](administration/scheduling-and-retries.md)
76+
* [TLS](administration/transport-security.md)
77+
* [Troubleshooting](administration/troubleshooting.md)
7878

7979
## Local testing
8080

@@ -83,7 +83,6 @@
8383

8484
## Data pipeline
8585

86-
* [Pipeline monitoring](pipeline/pipeline-monitoring.md)
8786
* [Inputs](pipeline/inputs.md)
8887
* [Collectd](pipeline/inputs/collectd.md)
8988
* [CPU metrics](pipeline/inputs/cpu-metrics.md)
@@ -93,8 +92,8 @@
9392
* [Dummy](pipeline/inputs/dummy.md)
9493
* [eBPF](pipeline/inputs/ebpf.md)
9594
* [Elasticsearch](pipeline/inputs/elasticsearch.md)
96-
* [Exec WASI](pipeline/inputs/exec-wasi.md)
9795
* [Exec](pipeline/inputs/exec.md)
96+
* [Exec WASI](pipeline/inputs/exec-wasi.md)
9897
* [Fluent Bit metrics](pipeline/inputs/fluentbit-metrics.md)
9998
* [Forward](pipeline/inputs/forward.md)
10099
* [Head](pipeline/inputs/head.md)
@@ -126,25 +125,25 @@
126125
* [TCP](pipeline/inputs/tcp.md)
127126
* [Thermal](pipeline/inputs/thermal.md)
128127
* [UDP](pipeline/inputs/udp.md)
129-
* [Windows Event logs (winevtlog)](pipeline/inputs/windows-event-log-winevtlog.md)
130128
* [Windows Event logs (winlog)](pipeline/inputs/windows-event-log.md)
129+
* [Windows Event logs (winevtlog)](pipeline/inputs/windows-event-log-winevtlog.md)
131130
* [Windows exporter metrics](pipeline/inputs/windows-exporter-metrics.md)
132131
* [Parsers](pipeline/parsers.md)
133132
* [Configuring parsers](pipeline/parsers/configuring-parser.md)
133+
* [Decoders](pipeline/parsers/decoders.md)
134134
* [JSON](pipeline/parsers/json.md)
135-
* [Regular expression](pipeline/parsers/regular-expression.md)
136-
* [LTSV](pipeline/parsers/ltsv.md)
137135
* [Logfmt](pipeline/parsers/logfmt.md)
138-
* [Decoders](pipeline/parsers/decoders.md)
136+
* [LTSV](pipeline/parsers/ltsv.md)
137+
* [Regular expression](pipeline/parsers/regular-expression.md)
139138
* [Processors](pipeline/processors.md)
139+
* [Conditional processing](pipeline/processors/conditional-processing.md)
140140
* [Content modifier](pipeline/processors/content-modifier.md)
141+
* [Filters as processors](pipeline/processors/filters.md)
141142
* [Labels](pipeline/processors/labels.md)
142143
* [Metrics selector](pipeline/processors/metrics-selector.md)
143144
* [OpenTelemetry envelope](pipeline/processors/opentelemetry-envelope.md)
144145
* [Sampling](pipeline/processors/sampling.md)
145146
* [SQL](pipeline/processors/sql.md)
146-
* [Filters as processors](pipeline/processors/filters.md)
147-
* [Conditional processing](pipeline/processors/conditional-processing.md)
148147
* [Filters](pipeline/filters.md)
149148
* [AWS metadata](pipeline/filters/aws-metadata.md)
150149
* [CheckList](pipeline/filters/checklist.md)
@@ -168,22 +167,24 @@
168167
* [Throttle](pipeline/filters/throttle.md)
169168
* [Type converter](pipeline/filters/type-converter.md)
170169
* [Wasm](pipeline/filters/wasm.md)
171-
* [Router](pipeline/router.md)
170+
* [Buffering](pipeline/buffering.md)
171+
* [Routing](pipeline/router.md)
172172
* [Outputs](pipeline/outputs.md)
173+
* [Azure Log Analytics](pipeline/outputs/azure.md)
174+
* [Azure Blob](pipeline/outputs/azure_blob.md)
175+
* [Azure Data Explorer](pipeline/outputs/azure_kusto.md)
176+
* [Azure Logs Ingestion API](pipeline/outputs/azure_logs_ingestion.md)
173177
* [Amazon CloudWatch](pipeline/outputs/cloudwatch.md)
174178
* [Amazon Kinesis Data Firehose](pipeline/outputs/firehose.md)
175179
* [Amazon Kinesis Data Streams](pipeline/outputs/kinesis.md)
176180
* [Amazon S3](pipeline/outputs/s3.md)
177181
* [Apache SkyWalking](pipeline/outputs/skywalking.md)
178-
* [Azure Blob](pipeline/outputs/azure_blob.md)
179-
* [Azure Data Explorer](pipeline/outputs/azure_kusto.md)
180-
* [Azure Log Analytics](pipeline/outputs/azure.md)
181-
* [Azure Logs Ingestion API](pipeline/outputs/azure_logs_ingestion.md)
182182
* [Counter](pipeline/outputs/counter.md)
183183
* [Dash0](pipeline/outputs/dash0.md)
184184
* [Datadog](pipeline/outputs/datadog.md)
185185
* [Dynatrace](pipeline/outputs/dynatrace.md)
186186
* [Elasticsearch](pipeline/outputs/elasticsearch.md)
187+
* [Exit](pipeline/outputs/exit.md)
187188
* [File](pipeline/outputs/file.md)
188189
* [Flow counter](pipeline/outputs/flowcounter.md)
189190
* [Forward](pipeline/outputs/forward.md)
@@ -200,10 +201,12 @@
200201
* [New Relic](pipeline/outputs/new-relic.md)
201202
* [Null](pipeline/outputs/null.md)
202203
* [Observe](pipeline/outputs/observe.md)
204+
* [Oracle Cloud Infrastructure Logging Analytics](pipeline/outputs/oci-logging-analytics.md)
203205
* [OpenObserve](pipeline/outputs/openobserve.md)
204206
* [OpenSearch](pipeline/outputs/opensearch.md)
205207
* [OpenTelemetry](pipeline/outputs/opentelemetry.md)
206-
* [Oracle Cloud Infrastructure Logging Analytics](pipeline/outputs/oci-logging-analytics.md)
208+
* [Output Formats](pipeline/outputs/output_formats.md)
209+
* [Parseable](pipeline/outputs/parseable.md)
207210
* [PostgreSQL](pipeline/outputs/postgresql.md)
208211
* [Prometheus exporter](pipeline/outputs/prometheus-exporter.md)
209212
* [Prometheus remote write](pipeline/outputs/prometheus-remote-write.md)
@@ -216,6 +219,7 @@
216219
* [Treasure Data](pipeline/outputs/treasure-data.md)
217220
* [Vivo Exporter](pipeline/outputs/vivo-exporter.md)
218221
* [WebSocket](pipeline/outputs/websocket.md)
222+
* [Pipeline monitoring](pipeline/pipeline-monitoring.md)
219223

220224
## Stream processing
221225

@@ -232,6 +236,7 @@
232236
* [C library API](development/library_api.md)
233237
* [Ingest records manually](development/ingest-records-manually.md)
234238
* [Golang output plugins](development/golang-output-plugins.md)
239+
* [MessagePack format](development/msgpack-format.md)
235240
* [Wasm filter plugins](development/wasm-filter-plugins.md)
236241
* [Wasm input plugins](development/wasm-input-plugins.md)
237242
* [Contribution guide for beginners](development/developer-guide.md)

administration/backpressure.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ It's possible for logs or data to be ingested or created faster than the ability
66

77
To avoid backpressure, Fluent Bit implements a mechanism in the engine that restricts the amount of data an input plugin can ingest. Restriction is done through the configuration parameters `Mem_Buf_Limit` and `storage.Max_Chunks_Up`.
88

9-
As described in the [Buffering](../concepts/buffering.md) concepts section, Fluent Bit offers two modes for data handling: in-memory only (default) and in-memory and filesystem (optional).
9+
As described in [Buffering and storage](../administration/buffering-and-storage.md) , Fluent Bit offers two modes for data handling: in-memory only (default) and in-memory and filesystem (optional).
1010

1111
The default `storage.type memory` buffer can be restricted with `Mem_Buf_Limit`. If memory reaches this limit and you reach a backpressure scenario, you won't be able to ingest more data until the data chunks that are in memory can be flushed. The input pauses and Fluent Bit [emits](https://github.com/fluent/fluent-bit/blob/v2.0.0/src/flb_input_chunk.c#L1334) a `[warn] [input] {input name or alias} paused (mem buf overlimit)` log message.
1212

1313
Depending on the input plugin in use, this might cause incoming data to be discarded (for example, TCP input plugin). The tail plugin can handle pauses without data loss, storing its current file offset and resuming reading later. When buffer memory is available, the input resumes accepting logs. Fluent Bit [emits](https://github.com/fluent/fluent-bit/blob/v2.0.0/src/flb_input_chunk.c#L1277) a `[info] [input] {input name or alias} resume (mem buf overlimit)` message.
1414

15-
Mitigate the risk of data loss by configuring secondary storage on the filesystem using the `storage.type` of `filesystem` (as described in [Buffering and Storage](buffering-and-storage.md)). Initially, logs will be buffered to both memory and the filesystem. When the `storage.max_chunks_up` limit is reached, all new data will be stored in the filesystem. Fluent Bit stops queueing new data in memory and buffers only to the filesystem. When `storage.type filesystem` is set, the `Mem_Buf_Limit` setting no longer has any effect. Instead, the `[SERVICE]` level `storage.max_chunks_up` setting controls the size of the memory buffer.
15+
Mitigate the risk of data loss by configuring secondary storage on the filesystem using the `storage.type` of `filesystem` (as described in [Buffering and storage](../administration/buffering-and-storage.md)). Initially, logs will be buffered to both memory and the filesystem. When the `storage.max_chunks_up` limit is reached, all new data will be stored in the filesystem. Fluent Bit stops queueing new data in memory and buffers only to the filesystem. When `storage.type filesystem` is set, the `Mem_Buf_Limit` setting no longer has any effect. Instead, the `[SERVICE]` level `storage.max_chunks_up` setting controls the size of the memory buffer.
1616

1717
## `Mem_Buf_Limit`
1818

@@ -70,4 +70,4 @@ With `storage.type filesystem` and `storage.max_chunks_up`, the following log me
7070
```text
7171
[input] {input name or alias} paused (storage buf overlimit)
7272
[input] {input name or alias} resume (storage buf overlimit)
73-
```
73+
```

administration/configuring-fluent-bit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Fluent Bit supports two configuration formats:
44

55
- [YAML](./configuring-fluent-bit/yaml.md): Standard configuration format as of v3.2.
6-
- [Classic mode](./configuring-fluent-bit/classic-mode/README.md): To be deprecated at the end of 2026.
6+
- [Classic mode](./configuring-fluent-bit/classic-mode.md): To be deprecated at the end of 2026.
77

88
## Command line interface
99

administration/configuring-fluent-bit/classic-mode/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

administration/configuring-fluent-bit/classic-mode/configuration-file.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ The `Service` section defines global properties of the service. The following ke
3636
| `scheduler.base` | Set a base of exponential backoff. Supported in v1.8.7 and greater. | `5` |
3737
| `json.convert_nan_to_null` | If enabled, `NaN` converts to `null` when Fluent Bit converts `msgpack` to `json`. | `false` |
3838
| `sp.convert_from_str_to_num` | If enabled, Stream processor converts from number string to number type. | `true` |
39+
| `windows.maxstdio` | If specified, the limit of stdio is adjusted. Only provided for Windows. From 512 to 2048 is allowed. | `512` |
3940

4041
The following is an example of a `SERVICE` section:
4142

@@ -156,4 +157,4 @@ Wildcard character (`*`) supports including multiple files. For example:
156157
@INCLUDE input_*.conf
157158
```
158159

159-
Files matching the wildcard character are included unsorted. If plugin ordering between files needs to be preserved, the files should be included explicitly.
160+
Files matching the wildcard character are included unsorted. If plugin ordering between files needs to be preserved, the files should be included explicitly.

administration/configuring-fluent-bit/yaml/configuration-file.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ The `service` section defines the global properties of the service. The Service
8181
| `scheduler.cap` | Set a maximum retry time in seconds. Supported from v1.8.7. | `2000` |
8282
| `scheduler.base` | Sets the base of exponential backoff. Supported from v1.8.7. | `5` |
8383
| `json.convert_nan_to_null` | If enabled, NaN is converted to null when Fluent Bit converts `msgpack` to JSON. | `false` |
84-
| `sp.convert_from_str_to_num` | If enabled, Stream processor converts from number string to number type. | `true |
84+
| `sp.convert_from_str_to_num` | If enabled, Stream processor converts from number string to number type. | `true` |
85+
| `windows.maxstdio` | If specified, the limit of stdio is adjusted. Only provided for Windows. From 512 to 2048 is allowed. | `512` |
8586

8687
The following is an example of a `service` section:
8788

concepts/data-pipeline.md

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,39 @@
22

33
The Fluent Bit data pipeline incorporates several specific concepts. Data processing flows through the pipeline following these concepts in order.
44

5-
## Filters
5+
```mermaid
6+
graph LR
7+
accTitle: Fluent Bit data pipeline
8+
accDescr: A diagram of the Fluent Bit data pipeline, which includes input, a parser, a filter, a buffer, routing, and various outputs.
9+
A[Input] --> B[Parser]
10+
B --> C[Filter]
11+
C --> D[Buffer]
12+
D --> E((Routing))
13+
E --> F[Output 1]
14+
E --> G[Output 2]
15+
E --> H[Output 3]
16+
```
617

7-
[Filters](../pipeline/filters.md) let you alter the collected data before delivering it to a destination. In production environments you need full control of the data you're collecting. Using filters lets you control data before processing.
18+
## Inputs
819

9-
## Buffer
20+
[Input plugins](../pipeline/inputs.md) gather information from different sources. Some plugins collect data from log files, and others gather metrics information from the operating system. There are many plugins to suit different needs.
1021

11-
The [`buffer`](./buffering.md) phase in the pipeline aims to provide a unified and persistent mechanism to store your data, using the primary in-memory model or the file system-based mode.
22+
## Parser
1223

13-
## Inputs
14-
15-
Fluent Bit provides [input plugins](../pipeline/inputs.md) to gather information from different sources. Some plugins collect data from log files, and others gather metrics information from the operating system. There are many plugins to suit different needs.
24+
[Parsers](../pipeline/parsers.md) convert unstructured data to structured data. Use a parser to set a structure to the incoming data by using input plugins as data is collected.
1625

17-
## Outputs
26+
## Filter
1827

19-
[Output plugins](../pipeline/outputs.md) let you define destinations for your data. Common destinations are remote services, local file systems, or other standard interfaces.
28+
[Filters](../pipeline/filters.md) let you alter the collected data before delivering it to a destination. In production environments you need full control of the data you're collecting. Using filters lets you control data before processing.
2029

21-
## Parsers
30+
## Buffer
2231

23-
[Parsers](../pipeline/parsers.md) convert unstructured data to structured data. Use a parser to set a structure to the incoming data by using input plugins as data is collected.
32+
The [buffering](./buffering.md) phase in the pipeline aims to provide a unified and persistent mechanism to store your data, using the primary in-memory model or the file system-based mode.
2433

25-
## Route
34+
## Routing
2635

2736
[Routing](../pipeline/router.md) is a core feature that lets you route your data through filters, and then to one or multiple destinations. The router relies on the concept of [tags](./key-concepts.md#tag) and [matching](./key-concepts.md#match) rules.
37+
38+
## Output
39+
40+
[Output plugins](../pipeline/outputs.md) let you define destinations for your data. Common destinations are remote services, local file systems, or other standard interfaces.

installation/downloads/docker.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ The following table describes the Linux container tags that are available on Doc
4242

4343
| Tags | Manifest Architectures | Description |
4444
| ------------ | ------------------------- | -------------------------------------------------------------- |
45+
| 4.0.13-debug | x86_64, arm64v8, arm32v7, s390x | Debug images |
46+
| 4.0.13 | x86_64, arm64v8, arm32v7, s390x | Release [v4.0.13](https://fluentbit.io/announcements/v4.0.13/) |
4547
| 4.0.12-debug | x86_64, arm64v8, arm32v7, s390x | Debug images |
4648
| 4.0.12 | x86_64, arm64v8, arm32v7, s390x | Release [v4.0.12](https://fluentbit.io/announcements/v4.0.12/) |
4749
| 4.0.11-debug | x86_64, arm64v8, arm32v7, s390x | Debug images |

0 commit comments

Comments
 (0)