diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index e8e968ace72d..26f98a23b3a8 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: fluent-bit -version: 1.10.2 +version: 1.10.3 appVersion: 1.0.6 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml index c23e46577092..ef69ac5ab6a1 100644 --- a/stable/fluent-bit/templates/config.yaml +++ b/stable/fluent-bit/templates/config.yaml @@ -47,7 +47,7 @@ data: Max_Entries {{ .Values.input.systemd.maxEntries }} Read_From_Tail {{ .Values.input.systemd.readFromTail }} {{- end }} -{{ .Values.extraEntries.input | indent 4 }} +{{ .Values.extraEntries.input | indent 8 }} fluent-bit-filter.conf: |- [FILTER] @@ -65,7 +65,7 @@ data: {{- if .Values.filter.enableExclude }} K8S-Logging.Exclude On {{- end }} -{{ .Values.extraEntries.filter | indent 4 }} +{{ .Values.extraEntries.filter | indent 8 }} fluent-bit-output.conf: |- {{ if eq .Values.backend.type "test" }} @@ -146,7 +146,7 @@ data: {{- end }} Format {{ .Values.backend.http.format }} {{- end }} -{{ .Values.extraEntries.output | indent 4 }} +{{ .Values.extraEntries.output | indent 8 }} fluent-bit.conf: |- @@ -185,7 +185,7 @@ data: Decode_Field_As {{ .decodeFieldAs }} {{ .decodeField | default "log" }} {{- end}} {{- if .extraEntries }} -{{ .extraEntries | indent 4 }} +{{ .extraEntries | indent 8 }} {{- end }} {{ end }} {{- end }} diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml index 9fff20ac16a8..53b558fe8fa2 100644 --- a/stable/fluent-bit/values.yaml +++ b/stable/fluent-bit/values.yaml @@ -131,12 +131,22 @@ fullConfigMap: false ## existingConfigMap: "" + +# NOTE If you want to add extra sections, add them here, inbetween the includes, +# wherever they need to go. Sections order matters. + rawConfig: |- @INCLUDE fluent-bit-service.conf @INCLUDE fluent-bit-input.conf @INCLUDE fluent-bit-filter.conf @INCLUDE fluent-bit-output.conf + +# WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# This is to add extra entries to an existing section, NOT for adding new sections +# Do not submit bugs against indent being wrong. Add your new sections to rawConfig +# instead. +# extraEntries: input: |- # # >=1 additional Key/Value entrie(s) for existing Input section @@ -144,6 +154,8 @@ extraEntries: # # >=1 additional Key/Value entrie(s) for existing Filter section output: |- # # >=1 additional Key/Value entrie(s) for existing Ouput section +# WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ## Extra ports to add to the daemonset ports section extraPorts: []