From cfc0ccbc00fe111f63bd3ad4be58510f851f0424 Mon Sep 17 00:00:00 2001
From: Shizuo Fujita <fujita@clear-code.com>
Date: Thu, 8 Jan 2026 13:22:14 +0900
Subject: [PATCH 1/3] config-file-yaml: fix typo

Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
---
 configuration/config-file-yaml.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/config-file-yaml.md b/configuration/config-file-yaml.md
index 70b815da..5e0aaa27 100644
--- a/configuration/config-file-yaml.md
+++ b/configuration/config-file-yaml.md
@@ -23,7 +23,7 @@ Normal Fluentd configuration syntax has the following the list of directives:
 4. **`system`** directives set system-wide configuration
 5. **`label`** directives group the output and filter for internal routing
 6. **`worker`** directives limit to the specific workers
-7. **`@include`** directives include other files
+7. **`!include`** directives include other files
 
 In YAML configuration world, we reconstructed them for YAML format.
 

From 2218c0e9d60f2e88aefb1851815f5683eb2a5213 Mon Sep 17 00:00:00 2001
From: Shizuo Fujita <fujita@clear-code.com>
Date: Thu, 8 Jan 2026 13:40:42 +0900
Subject: [PATCH 2/3] config-file-yaml: add missing $id

Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
---
 configuration/config-file-yaml.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/config-file-yaml.md b/configuration/config-file-yaml.md
index 5e0aaa27..18c59ce2 100644
--- a/configuration/config-file-yaml.md
+++ b/configuration/config-file-yaml.md
@@ -49,7 +49,8 @@ Under `config` object, Fluentd will handle the following elements:
 6. **`$arg`** defines directive **arg**'s equivalent objects (e.g. \<DIRECTIVE **arg**\>)
 7. **`$name`** defines label directive **name** equivalent objects (e.g. \<label **name**\>)
 8. **`$type`** specifies `@type` or `type` for instantiating plugin type
-9. **`$log_level`** specifies `@log_level` per plugin
+9. **`$id`** specifies plugin id
+10. **`$log_level`** specifies `@log_level` per plugin
 
 NOTE: `$log_level` is supported since Fluentd v1.17.1 or v1.16.6. If you want to change log_level per plugin on 1.17.0/v1.16.5 or older versions, you can use `log_level` (without `$`) although it is deprecated.
 

From 537539b3c6736e0b0c47e561b1d63f1d69b9f6a5 Mon Sep 17 00:00:00 2001
From: Shizuo Fujita <fujita@clear-code.com>
Date: Fri, 9 Jan 2026 13:55:25 +0900
Subject: [PATCH 3/3] Fix file extension for including

Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
---
 configuration/config-file-yaml.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/configuration/config-file-yaml.md b/configuration/config-file-yaml.md
index 18c59ce2..1f4a42db 100644
--- a/configuration/config-file-yaml.md
+++ b/configuration/config-file-yaml.md
@@ -313,7 +313,7 @@ The element in separate configuration files can be imported using the **!include
 ```yaml
 config:
   # Include config files in the ./config.d directory
-  - !include config.d/*.conf
+  - !include config.d/*.yaml
 ```
 
 The `!include` YAML tag supports regular file path, glob pattern, and http URL conventions:
@@ -321,33 +321,33 @@ The `!include` YAML tag supports regular file path, glob pattern, and http URL c
 ```yaml
 config:
   # absolute path
-  - !include /path/to/config.conf
+  - !include /path/to/config.yaml
 
   # if using a relative path, the YAML tag will use
   # the dirname of this config file to expand the path
-  - !include extra.conf
+  - !include extra.yaml
 
   # glob match pattern
-  - !include config.d/*.conf
+  - !include config.d/*.yaml
 
   # http
-  - !include http://example.com/fluent.conf
+  - !include http://example.com/fluent.yaml
 ```
 
 
-Note that for the glob pattern, files are expanded in alphabetical order. If there are `a.conf` and `b.conf` then fluentd parses `a.conf` first. But, you should not write the configuration that depends on this order. It is so error-prone, therefore, use multiple separate `!include` YAML tags for safety.
+Note that for the glob pattern, files are expanded in alphabetical order. If there are `a.yaml` and `b.yaml` then fluentd parses `a.yaml` first. But, you should not write the configuration that depends on this order. It is so error-prone, therefore, use multiple separate `!include` YAML tags for safety.
 
 ```yaml
 config:
-  # If you have a.conf, b.conf, ..., z.conf and a.conf / z.conf are important
+  # If you have a.yaml, b.yaml, ..., z.yaml and a.yaml / z.yaml are important
 
   # This is bad
-  - !include *.conf
+  - !include *.yaml
 
   # This is good
-  - !include a.conf
-  - !include config.d/*.conf
-  - !include z.conf
+  - !include a.yaml
+  - !include config.d/*.yaml
+  - !include z.yaml
 ```
 
 ### Share the Same Parameters