Skip to content

Commit ee5a9ae

Browse files
committed
config_format: Add parser*.yaml references alongside parser*.conf
Install parser*.yaml files alongside .conf and add commented-out references to them in other configs. Signed-off-by: Hank Leininger <hlein@korelogic.com>
1 parent f9507ef commit ee5a9ae

File tree

11 files changed

+26
-1
lines changed

11 files changed

+26
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,7 @@ set(CPACK_RPM_SPEC_MORE_DEFINE "%define ignore \#")
15231523
set(CPACK_RPM_RUNTIME_USER_FILELIST
15241524
"%config(noreplace) /etc/${FLB_OUT_NAME}/${FLB_OUT_NAME}.conf"
15251525
"%config(noreplace) /etc/${FLB_OUT_NAME}/parsers.conf"
1526+
"%config(noreplace) /etc/${FLB_OUT_NAME}/parsers.yaml"
15261527
"%config(noreplace) /etc/${FLB_OUT_NAME}/plugins.conf"
15271528
"%ignore /lib"
15281529
"%ignore /lib/systemd"

conf/fluent-bit-macos.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
# ============
2727
# specify an optional 'Parsers' configuration file
2828
parsers_file parsers.conf
29+
#parsers_file parsers.yaml
2930

3031
# Plugins File
3132
# ============

conf/fluent-bit-win32.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
# ============
2727
# specify an optional 'Parsers' configuration file
2828
parsers_file parsers.conf
29+
#parsers_file parsers.yaml
2930

3031
# Plugins File
3132
# ============

conf/fluent-bit.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
# ============
2727
# specify an optional 'Parsers' configuration file
2828
parsers_file parsers.conf
29+
#parsers_file parsers.yaml
2930

3031
# Plugins File
3132
# ============

conf/kube.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Daemon Off
44
Log_Level info
55
Parsers_File parsers.conf
6+
#Parsers_File parsers.yaml
67

78
[INPUT]
89
Name tail

conf/kube_elasticsearch.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Daemon Off
44
Log_Level info
55
Parsers_File parsers.conf
6+
#Parsers_File parsers.yaml
67

78
[INPUT]
89
Name tail

conf/rate_limit.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Daemon Off
44
Log_Level info
55
Parsers_File parsers.conf
6+
#Parsers_File parsers.yaml
67

78
[INPUT]
89
Name tail
@@ -22,4 +23,4 @@
2223
call rate_limit
2324
[OUTPUT]
2425
Name stdout
25-
Match *
26+
Match *

cpack/debian/conffiles

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/etc/fluent-bit/parsers.conf
2+
/etc/fluent-bit/parsers.yaml
23
/etc/fluent-bit/plugins.conf
34
/etc/fluent-bit/fluent-bit.conf

dockerfiles/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ COPY conf/fluent-bit.conf \
106106
conf/parsers_extra.conf \
107107
conf/parsers_openstack.conf \
108108
conf/parsers_cinder.conf \
109+
conf/parsers.yaml \
110+
conf/parsers_ambassador.yaml \
111+
conf/parsers_java.yaml \
112+
conf/parsers_extra.yaml \
113+
conf/parsers_openstack.yaml \
114+
conf/parsers_cinder.yaml \
109115
conf/plugins.conf \
110116
/fluent-bit/etc/
111117

dockerfiles/Dockerfile.windows

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,12 @@ RUN New-Item -Path /fluent-bit/etc/ -ItemType "directory"; `
193193
Copy-Item -Path /src/conf/parsers_extra.conf /fluent-bit/etc/; `
194194
Copy-Item -Path /src/conf/parsers_openstack.conf /fluent-bit/etc/; `
195195
Copy-Item -Path /src/conf/parsers_cinder.conf /fluent-bit/etc/; `
196+
Copy-Item -Path /src/conf/parsers.yaml /fluent-bit/etc/; `
197+
Copy-Item -Path /src/conf/parsers_ambassador.yaml /fluent-bit/etc/; `
198+
Copy-Item -Path /src/conf/parsers_java.yaml /fluent-bit/etc/; `
199+
Copy-Item -Path /src/conf/parsers_extra.yaml /fluent-bit/etc/; `
200+
Copy-Item -Path /src/conf/parsers_openstack.yaml /fluent-bit/etc/; `
201+
Copy-Item -Path /src/conf/parsers_cinder.yaml /fluent-bit/etc/; `
196202
Copy-Item -Path /src/conf/plugins.conf /fluent-bit/etc/; `
197203
Copy-Item -Path /src/build/bin/fluent-bit.exe /fluent-bit/bin/;
198204

0 commit comments

Comments
 (0)