config_format: Convert many parser*.conf references to parser*.yaml

hlein · hlein · commit d51265681571 · 2025-11-18T16:01:23.000-07:00
While it's still possible to build without libyaml, it is included by
default and none of our canned builds/distro-packagings disable it. So,
update all clear-cut references to conf/parser*.conf files to the
corresponding .yaml. Also updated some occurances in documentation and
examples. Generally did not touch most of tests/{internal,runtime}/,
unless they were referencing the toplevel conf/ dir.

Signed-off-by: Hank Leininger &lt;hlein@korelogic.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1522,7 +1522,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast data collector for Linux")
 set(CPACK_RPM_SPEC_MORE_DEFINE "%define ignore \#")
 set(CPACK_RPM_RUNTIME_USER_FILELIST
   "%config(noreplace) /etc/${FLB_OUT_NAME}/${FLB_OUT_NAME}.conf"
-  "%config(noreplace) /etc/${FLB_OUT_NAME}/parsers.conf"
+  "%config(noreplace) /etc/${FLB_OUT_NAME}/parsers.yaml"
   "%config(noreplace) /etc/${FLB_OUT_NAME}/plugins.conf"
   "%ignore /lib"
   "%ignore /lib/systemd"
diff --git a/conf/fluent-bit-macos.conf b/conf/fluent-bit-macos.conf
@@ -25,7 +25,7 @@
     # Parsers File
     # ============
     # specify an optional 'Parsers' configuration file
-    parsers_file parsers.conf
+    parsers_file parsers.yaml
 
     # Plugins File
     # ============
diff --git a/conf/fluent-bit-win32.conf b/conf/fluent-bit-win32.conf
@@ -25,7 +25,7 @@
     # Parsers File
     # ============
     # specify an optional 'Parsers' configuration file
-    parsers_file parsers.conf
+    parsers_file parsers.yaml
 
     # Plugins File
     # ============
diff --git a/conf/fluent-bit.conf b/conf/fluent-bit.conf
@@ -25,7 +25,7 @@
     # Parsers File
     # ============
     # specify an optional 'Parsers' configuration file
-    parsers_file parsers.conf
+    parsers_file parsers.yaml
 
     # Plugins File
     # ============
diff --git a/conf/kube.conf b/conf/kube.conf
@@ -2,7 +2,7 @@
     Flush        1
     Daemon       Off
     Log_Level    info
-    Parsers_File parsers.conf
+    Parsers_File parsers.yaml
 
 [INPUT]
     Name          tail
diff --git a/conf/kube_elasticsearch.conf b/conf/kube_elasticsearch.conf
@@ -2,7 +2,7 @@
     Flush        5
     Daemon       Off
     Log_Level    info
-    Parsers_File parsers.conf
+    Parsers_File parsers.yaml
 
 [INPUT]
     Name          tail
diff --git a/conf/rate_limit.conf b/conf/rate_limit.conf
@@ -2,7 +2,7 @@
     Flush        1
     Daemon       Off
     Log_Level    info
-    Parsers_File parsers.conf
+    Parsers_File parsers.yaml
 
 [INPUT]
     Name          tail
@@ -22,4 +22,4 @@
     call   rate_limit
 [OUTPUT]
     Name  stdout
-    Match *
+    Match *
diff --git a/cpack/debian/conffiles b/cpack/debian/conffiles
@@ -1,3 +1,3 @@
-/etc/fluent-bit/parsers.conf
+/etc/fluent-bit/parsers.yaml
 /etc/fluent-bit/plugins.conf
 /etc/fluent-bit/fluent-bit.conf
diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
@@ -100,12 +100,12 @@ RUN install bin/fluent-bit /fluent-bit/bin/
 
 # Configuration files
 COPY conf/fluent-bit.conf \
-    conf/parsers.conf \
-    conf/parsers_ambassador.conf \
-    conf/parsers_java.conf \
-    conf/parsers_extra.conf \
-    conf/parsers_openstack.conf \
-    conf/parsers_cinder.conf \
+    conf/parsers.yaml \
+    conf/parsers_ambassador.yaml \
+    conf/parsers_java.yaml \
+    conf/parsers_extra.yaml \
+    conf/parsers_openstack.yaml \
+    conf/parsers_cinder.yaml \
     conf/plugins.conf \
     /fluent-bit/etc/
 
diff --git a/dockerfiles/Dockerfile.windows b/dockerfiles/Dockerfile.windows
@@ -187,12 +187,12 @@ WORKDIR /fluent-bit/bin
 # Set up config files and binaries in single /fluent-bit hierarchy for easy copy in later stage
 RUN New-Item -Path  /fluent-bit/etc/ -ItemType "directory"; `
     Copy-Item -Path /src/conf/fluent-bit-win32.conf /fluent-bit/etc/fluent-bit.conf; `
-    Copy-Item -Path /src/conf/parsers.conf /fluent-bit/etc/; `
-    Copy-Item -Path /src/conf/parsers_ambassador.conf /fluent-bit/etc/; `
-    Copy-Item -Path /src/conf/parsers_java.conf /fluent-bit/etc/; `
-    Copy-Item -Path /src/conf/parsers_extra.conf /fluent-bit/etc/; `
-    Copy-Item -Path /src/conf/parsers_openstack.conf /fluent-bit/etc/; `
-    Copy-Item -Path /src/conf/parsers_cinder.conf /fluent-bit/etc/; `
+    Copy-Item -Path /src/conf/parsers.yaml /fluent-bit/etc/; `
+    Copy-Item -Path /src/conf/parsers_ambassador.yaml /fluent-bit/etc/; `
+    Copy-Item -Path /src/conf/parsers_java.yaml /fluent-bit/etc/; `
+    Copy-Item -Path /src/conf/parsers_extra.yaml /fluent-bit/etc/; `
+    Copy-Item -Path /src/conf/parsers_openstack.yaml /fluent-bit/etc/; `
+    Copy-Item -Path /src/conf/parsers_cinder.yaml /fluent-bit/etc/; `
     Copy-Item -Path /src/conf/plugins.conf /fluent-bit/etc/; `
     Copy-Item -Path /src/build/bin/fluent-bit.exe /fluent-bit/bin/;
 
diff --git a/documentation/examples/multiline/filter_multiline/fluent-bit.conf b/documentation/examples/multiline/filter_multiline/fluent-bit.conf
@@ -1,7 +1,7 @@
 [SERVICE]
     flush                 1
     log_level             info
-    parsers_file          parsers_multiline.conf
+    parsers_file          parsers_multiline.yaml
 
 [INPUT]
     name                  tail
diff --git a/documentation/examples/multiline/regex-001/fluent-bit.conf b/documentation/examples/multiline/regex-001/fluent-bit.conf
@@ -1,7 +1,7 @@
 [SERVICE]
     flush        1
     log_level    info
-    parsers_file parsers_multiline.conf
+    parsers_file parsers_multiline.yaml
 
 [INPUT]
     name             tail
diff --git a/examples/wasi_serde_json/README.md b/examples/wasi_serde_json/README.md
@@ -31,14 +31,14 @@ target/wasm32-wasip1/release/wasi_serde_json.wasm
 
 ## How to confirm WASI integration
 
-Create parsers.conf as follows:
+Create parsers.yaml as follows:
 
 ```ini
-[PARSER]
-    Name        wasi
-    Format      json
-    Time_Key    time
-    Time_Format %Y-%m-%dT%H:%M:%S.%L %z
+parsers:
+  - name: wasi
+    format: json
+    time_key: time
+    time_format: '%Y-%m-%dT%H:%M:%S.%L %z'
 ```
 
 And Create fluent-bit configuration file as follows:
@@ -47,7 +47,7 @@ And Create fluent-bit configuration file as follows:
 [SERVICE]
     Flush        1
     Daemon       Off
-    Parsers_File parsers.conf
+    Parsers_File parsers.yaml
     Log_Level    info
     HTTP_Server  Off
     HTTP_Listen  0.0.0.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -657,10 +657,17 @@ if(FLB_BINARY)
       RENAME "${FLB_OUT_NAME}.conf")
   endif()
 
-  install(FILES
-    "${PROJECT_SOURCE_DIR}/conf/parsers.conf"
-    COMPONENT binary
-    DESTINATION ${FLB_INSTALL_CONFDIR})
+  if(FLB_HAVE_LIBYAML)
+    install(FILES
+      "${PROJECT_SOURCE_DIR}/conf/parsers.yaml"
+      COMPONENT binary
+      DESTINATION ${FLB_INSTALL_CONFDIR})
+  else()
+    install(FILES
+      "${PROJECT_SOURCE_DIR}/conf/parsers.conf"
+      COMPONENT binary
+      DESTINATION ${FLB_INSTALL_CONFDIR})
+  endif()
 
   install(FILES
     "${PROJECT_SOURCE_DIR}/conf/plugins.conf"
diff --git a/tests/internal/data/stream_processor/gen_msgpack.sh b/tests/internal/data/stream_processor/gen_msgpack.sh
@@ -7,7 +7,7 @@ echo
 rm -rf samples.mp samples-subkeys.mp
 
 # Generate new msgpack file using as a source samples.json
-../../../../build/bin/fluent-bit -R ../../../../conf/parsers.conf              \
+../../../../build/bin/fluent-bit -R ../../../../conf/parsers.yaml              \
  -i tail -t samples         -p path=samples.json          -p parser=json       \
  -i tail -t samples-subkeys -p path=samples-subkeys.json  -p parser=json       \
  -o file -m samples         -p format=msgpack  -p file=samples.mp              \
@@ -31,7 +31,7 @@ rm -rf samples.mp samples-subkeys.mp
      # Generate new msgpack files for hopping window
      echo ""
      echo "=== Generating MessagePack file for $file ... ==="
-     ../../../../build/bin/fluent-bit -R ../../../../conf/parsers.conf   \
+     ../../../../build/bin/fluent-bit -R ../../../../conf/parsers.yaml   \
       -i tail -p path=$file  -p parser=json                              \
       -o file -p format=msgpack -p file=$(echo $file | sed s/json/mp/) -f 1 &
       pid=$!
