Merge branch 'fluent:master' into feature/daemon-out-pgsql

Author: TomlinfreeGit

SUMMARY.md

@@ -25,16 +25,16 @@
     * [Build with static configuration](installation/downloads/source/build-with-static-configuration.md)
   * [Linux packages](installation/downloads/linux.md)
     * [Amazon Linux](installation/downloads/linux/amazon-linux.md)
-    * [Rocky Linux and Alma Linux ](installation/downloads/linux/alma-rocky.md)
-    * [Red Hat and CentOS](installation/downloads/linux/redhat-centos.md)
+    * [Buildroot embedded Linux](installation/downloads/linux/buildroot-embedded-linux.md)
     * [Debian](installation/downloads/linux/debian.md)
-    * [Ubuntu](installation/downloads/linux/ubuntu.md)
     * [Raspbian and Raspberry Pi](installation/downloads/linux/raspbian-raspberry-pi.md)
+    * [Red Hat and CentOS](installation/downloads/linux/redhat-centos.md)
+    * [Rocky Linux and Alma Linux ](installation/downloads/linux/alma-rocky.md)
+    * [Ubuntu](installation/downloads/linux/ubuntu.md)
     * [Yocto embedded Linux](installation/downloads/linux/yocto-embedded-linux.md)
-    * [Buildroot embedded Linux](installation/downloads/linux/buildroot-embedded-linux.md)
-  * [Docker](installation/downloads/docker.md)
-  * [Containers on AWS](installation/downloads/aws-container.md)
   * [Amazon EC2](installation/downloads/amazon-ec2.md)
+  * [Containers on AWS](installation/downloads/aws-container.md)
+  * [Docker](installation/downloads/docker.md)
   * [Kubernetes](installation/downloads/kubernetes.md)
   * [macOS](installation/downloads/macos.md)
   * [Windows](installation/downloads/windows.md)
@@ -44,36 +44,37 @@
 
 * [Configure Fluent Bit](administration/configuring-fluent-bit.md)
   * [YAML configuration](administration/configuring-fluent-bit/yaml.md)
+    * [Configuration file](administration/configuring-fluent-bit/yaml/configuration-file.md)
+    * [Environment variables](administration/configuring-fluent-bit/yaml/environment-variables-section.md)
+    * [Includes](administration/configuring-fluent-bit/yaml/includes-section.md) 
     * [Service](administration/configuring-fluent-bit/yaml/service-section.md)
     * [Parsers](administration/configuring-fluent-bit/yaml/parsers-section.md)
     * [Multiline parsers](administration/configuring-fluent-bit/yaml/multiline-parsers-section.md)
     * [Pipeline](administration/configuring-fluent-bit/yaml/pipeline-section.md)
     * [Plugins](administration/configuring-fluent-bit/yaml/plugins-section.md)
     * [Upstream servers](administration/configuring-fluent-bit/yaml/upstream-servers-section.md)
-    * [Environment variables](administration/configuring-fluent-bit/yaml/environment-variables-section.md)
-    * [Includes](administration/configuring-fluent-bit/yaml/includes-section.md)
   * [Classic mode](administration/configuring-fluent-bit/classic-mode.md)
-    * [Format and schema](administration/configuring-fluent-bit/classic-mode/format-schema.md)
-    * [Configuration file](administration/configuring-fluent-bit/classic-mode/configuration-file.md)
-    * [Variables](administration/configuring-fluent-bit/classic-mode/variables.md)
+    * [Configuration file](administration/configuring-fluent-bit/classic-mode/configuration-file.md) 
     * [Commands](administration/configuring-fluent-bit/classic-mode/commands.md)
+    * [Format and schema](administration/configuring-fluent-bit/classic-mode/format-schema.md)
+    * [Record accessor syntax](administration/configuring-fluent-bit/classic-mode/record-accessor.md) 
     * [Upstream servers](administration/configuring-fluent-bit/classic-mode/upstream-servers.md)
-    * [Record accessor syntax](administration/configuring-fluent-bit/classic-mode/record-accessor.md)
-  * [Unit Sizes](administration/configuring-fluent-bit/unit-sizes.md)
+    * [Variables](administration/configuring-fluent-bit/classic-mode/variables.md)
   * [Multiline parsing](administration/configuring-fluent-bit/multiline-parsing.md)
-* [TLS](administration/transport-security.md)
-* [Buffering and storage](administration/buffering-and-storage.md)
+  * [Unit Sizes](administration/configuring-fluent-bit/unit-sizes.md)
+* [AWS credentials](administration/aws-credentials.md) 
 * [Backpressure](administration/backpressure.md)
-* [Scheduling and retries](administration/scheduling-and-retries.md)
-* [Networking](administration/networking.md)
+* [Buffering and storage](administration/buffering-and-storage.md)
+* [Hot reload](administration/hot-reload.md)
+* [HTTP proxy](administration/http-proxy.md)
 * [Memory management](administration/memory-management.md)
 * [Monitoring](administration/monitoring.md)
 * [Multithreading](administration/multithreading.md)
-* [HTTP proxy](administration/http-proxy.md)
-* [Hot reload](administration/hot-reload.md)
-* [Troubleshooting](administration/troubleshooting.md)
+* [Networking](administration/networking.md)
 * [Performance tips](administration/performance.md)
-* [AWS credentials](administration/aws-credentials.md)
+* [Scheduling and retries](administration/scheduling-and-retries.md)
+* [TLS](administration/transport-security.md) 
+* [Troubleshooting](administration/troubleshooting.md)
 
 ## Local testing
 
@@ -91,10 +92,11 @@
   * [Dummy](pipeline/inputs/dummy.md)
   * [eBPF](pipeline/inputs/ebpf.md)
   * [Elasticsearch](pipeline/inputs/elasticsearch.md)
-  * [Exec WASI](pipeline/inputs/exec-wasi.md)
   * [Exec](pipeline/inputs/exec.md)
+  * [Exec WASI](pipeline/inputs/exec-wasi.md)
   * [Fluent Bit metrics](pipeline/inputs/fluentbit-metrics.md)
   * [Forward](pipeline/inputs/forward.md)
+  * [GPU metrics](pipeline/inputs/gpu-metrics.md)
   * [Head](pipeline/inputs/head.md)
   * [Health](pipeline/inputs/health.md)
   * [HTTP](pipeline/inputs/http.md)
@@ -124,25 +126,25 @@
   * [TCP](pipeline/inputs/tcp.md)
   * [Thermal](pipeline/inputs/thermal.md)
   * [UDP](pipeline/inputs/udp.md)
-  * [Windows Event logs (winevtlog)](pipeline/inputs/windows-event-log-winevtlog.md)
   * [Windows Event logs (winlog)](pipeline/inputs/windows-event-log.md)
+  * [Windows Event logs (winevtlog)](pipeline/inputs/windows-event-log-winevtlog.md)
   * [Windows exporter metrics](pipeline/inputs/windows-exporter-metrics.md)
 * [Parsers](pipeline/parsers.md)
   * [Configuring parsers](pipeline/parsers/configuring-parser.md)
+  * [Decoders](pipeline/parsers/decoders.md)
   * [JSON](pipeline/parsers/json.md)
-  * [Regular expression](pipeline/parsers/regular-expression.md)
-  * [LTSV](pipeline/parsers/ltsv.md)
   * [Logfmt](pipeline/parsers/logfmt.md)
-  * [Decoders](pipeline/parsers/decoders.md)
+  * [LTSV](pipeline/parsers/ltsv.md)
+  * [Regular expression](pipeline/parsers/regular-expression.md)
 * [Processors](pipeline/processors.md)
+  * [Conditional processing](pipeline/processors/conditional-processing.md)
   * [Content modifier](pipeline/processors/content-modifier.md)
+  * [Filters as processors](pipeline/processors/filters.md)
   * [Labels](pipeline/processors/labels.md)
   * [Metrics selector](pipeline/processors/metrics-selector.md)
   * [OpenTelemetry envelope](pipeline/processors/opentelemetry-envelope.md)
   * [Sampling](pipeline/processors/sampling.md)
   * [SQL](pipeline/processors/sql.md)
-  * [Filters as processors](pipeline/processors/filters.md)
-  * [Conditional processing](pipeline/processors/conditional-processing.md)
 * [Filters](pipeline/filters.md)
   * [AWS metadata](pipeline/filters/aws-metadata.md)
   * [CheckList](pipeline/filters/checklist.md)
@@ -169,20 +171,21 @@
 * [Buffering](pipeline/buffering.md)
 * [Routing](pipeline/router.md)
 * [Outputs](pipeline/outputs.md)
+  * [Azure Log Analytics](pipeline/outputs/azure.md)
+  * [Azure Blob](pipeline/outputs/azure_blob.md)
+  * [Azure Data Explorer](pipeline/outputs/azure_kusto.md)
+  * [Azure Logs Ingestion API](pipeline/outputs/azure_logs_ingestion.md)
   * [Amazon CloudWatch](pipeline/outputs/cloudwatch.md)
   * [Amazon Kinesis Data Firehose](pipeline/outputs/firehose.md)
   * [Amazon Kinesis Data Streams](pipeline/outputs/kinesis.md)
   * [Amazon S3](pipeline/outputs/s3.md)
   * [Apache SkyWalking](pipeline/outputs/skywalking.md)
-  * [Azure Blob](pipeline/outputs/azure_blob.md)
-  * [Azure Data Explorer](pipeline/outputs/azure_kusto.md)
-  * [Azure Log Analytics](pipeline/outputs/azure.md)
-  * [Azure Logs Ingestion API](pipeline/outputs/azure_logs_ingestion.md)
   * [Counter](pipeline/outputs/counter.md)
   * [Dash0](pipeline/outputs/dash0.md)
   * [Datadog](pipeline/outputs/datadog.md)
   * [Dynatrace](pipeline/outputs/dynatrace.md)
   * [Elasticsearch](pipeline/outputs/elasticsearch.md)
+  * [Exit](pipeline/outputs/exit.md)
   * [File](pipeline/outputs/file.md)
   * [Flow counter](pipeline/outputs/flowcounter.md)
   * [Forward](pipeline/outputs/forward.md)
@@ -199,10 +202,11 @@
   * [New Relic](pipeline/outputs/new-relic.md)
   * [Null](pipeline/outputs/null.md)
   * [Observe](pipeline/outputs/observe.md)
+  * [Oracle Cloud Infrastructure Logging Analytics](pipeline/outputs/oci-logging-analytics.md)
   * [OpenObserve](pipeline/outputs/openobserve.md)
   * [OpenSearch](pipeline/outputs/opensearch.md)
   * [OpenTelemetry](pipeline/outputs/opentelemetry.md)
-  * [Oracle Cloud Infrastructure Logging Analytics](pipeline/outputs/oci-logging-analytics.md)
+  * [Output Formats](pipeline/outputs/output_formats.md)
   * [Parseable](pipeline/outputs/parseable.md)
   * [PostgreSQL](pipeline/outputs/postgresql.md)
   * [Prometheus exporter](pipeline/outputs/prometheus-exporter.md)
@@ -233,6 +237,7 @@
 * [C library API](development/library_api.md)
 * [Ingest records manually](development/ingest-records-manually.md)
 * [Golang output plugins](development/golang-output-plugins.md)
+* [MessagePack format](development/msgpack-format.md)
 * [Wasm filter plugins](development/wasm-filter-plugins.md)
 * [Wasm input plugins](development/wasm-input-plugins.md)
 * [Contribution guide for beginners](development/developer-guide.md)

administration/configuring-fluent-bit.md

@@ -3,7 +3,7 @@
 Fluent Bit supports two configuration formats:
 
 - [YAML](./configuring-fluent-bit/yaml.md): Standard configuration format as of v3.2.
-- [Classic mode](./configuring-fluent-bit/classic-mode/README.md): To be deprecated at the end of 2026.
+- [Classic mode](./configuring-fluent-bit/classic-mode.md): To be deprecated at the end of 2026.
 
 ## Command line interface
 

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

@@ -36,6 +36,7 @@ The `Service` section defines global properties of the service. The following ke
 | `scheduler.base`  | Set a base of exponential backoff. Supported in v1.8.7 and greater. | `5` |
 | `json.convert_nan_to_null` | If enabled, `NaN` converts to `null` when Fluent Bit converts `msgpack` to `json`. | `false` |
 | `sp.convert_from_str_to_num` | If enabled, Stream processor converts from number string to number type. | `true` |
+| `windows.maxstdio` | If specified, the limit of stdio is adjusted. Only provided for Windows. From 512 to 2048 is allowed. | `512` |
 
 The following is an example of a `SERVICE` section:
 
@@ -156,4 +157,4 @@ Wildcard character (`*`) supports including multiple files. For example:
 @INCLUDE input_*.conf
 ```
 
-Files matching the wildcard character are included unsorted. If plugin ordering between files needs to be preserved, the files should be included explicitly.
+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/classic-mode/configuration-file.md

@@ -81,7 +81,8 @@ The `service` section defines the global properties of the service. The Service
 | `scheduler.cap`   | Set a maximum retry time in seconds. Supported from v1.8.7. | `2000` |
 | `scheduler.base`  | Sets the base of exponential backoff. Supported from v1.8.7. | `5` |
 | `json.convert_nan_to_null` | If enabled, NaN is converted to null when Fluent Bit converts `msgpack` to JSON. | `false` |
-| `sp.convert_from_str_to_num` | If enabled, Stream processor converts from number string to number type. | `true |
+| `sp.convert_from_str_to_num` | If enabled, Stream processor converts from number string to number type. | `true` |
+| `windows.maxstdio` | If specified, the limit of stdio is adjusted. Only provided for Windows. From 512 to 2048 is allowed. | `512` |
 
 The following is an example of a `service` section:
 

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

@@ -176,6 +176,54 @@ $ fluent-bit -c example.conf
 ...
 [0] from.test_tag.new.fluent.bit.out: [1580436933.000050569, {"tool"=>"fluent", "sub"=>{"s1"=>{"s2"=>"bit"}}}]
 ```
+## Configuration example with multiple rules 
+In cases using multiple rules, the rules are passed through in order until one matches. With `AND_COMBINE` using the value `true` as optional fifth  component, the rule is combined with the following rule like an 'and' combination. If the first and following rule match, the message is retagged with the tag in the last matched rule.
+
+An `AND_COMBINE` in the last rule is ignored. 
+```text
+[SERVICE]
+    Flush     5
+    Log_Level info
+
+[INPUT]
+    Name tail
+    Tag  tail
+    Path /var/tmp/loginput.txt
+
+[FILTER]
+    Name          rewrite_tag
+    Match         tail
+    Rule          $log ^(1)$      newtag_or    false
+    Rule          $log ^(.*and)$  newtag_and_1 false true
+    Rule          $log ^(1.*)$    newtag_and_2 false
+    Rule          $log ^(42)$     newtag_or    false
+    Rule          $log ^(9)$      newtag_and_3 false true
+
+[OUTPUT]
+    Name  stdout
+    Match *
+```
+Use the input file `/var/tmp/loginput.txt`:
+```text
+1
+2
+3
+9
+10and
+10
+42
+```
+
+The log messages will be rewritten:
+```
+fluent-bit_1  | [0] tail: [1596050753.241336500, {"log"=>"2"}]
+fluent-bit_1  | [1] tail: [1596050753.241356700, {"log"=>"3"}]
+fluent-bit_1  | [2] tail: [1596050753.241410100, {"log"=>"10"}]
+fluent-bit_1  | [0] newtag_or: [1596050753.237370100, {"log"=>"1"}]
+fluent-bit_1  | [1] newtag_or: [1596050753.241427200, {"log"=>"42"}]
+fluent-bit_1  | [0] newtag_and_3: [1596050753.241374500, {"log"=>"9"}]
+fluent-bit_1  | [0] newtag_and_2: [1596050753.241392800, {"log"=>"10and"}]
+```
 
 ## Monitoring