Allow for Enable/Disable default input and filter options (#897)

* allow to disable the default input and filter options so that user might supply their own. * bump chart version. --------- Co-authored-by: Dancy, Chris <[email protected]>
aws · Feb 16, 2023 · 513eb32 · 513eb32
1 parent 647bec2
commit 513eb32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/stable/aws-for-fluent-bit/templates/configmap.yaml b/stable/aws-for-fluent-bit/templates/configmap.yaml
@@ -18,6 +18,7 @@ data:
         Parsers_File /fluent-bit/etc/parser_extra.conf
 {{- end }}
 
+{{- if .Values.input.enabled }}
     [INPUT]
         Name              tail
         Tag               {{ .Values.input.tag }}
@@ -28,6 +29,7 @@ data:
         Mem_Buf_Limit     {{ .Values.input.memBufLimit }}
         Skip_Long_Lines   {{ .Values.input.skipLongLines }}
         Refresh_Interval  {{ .Values.input.refreshInterval }}
+{{- end }}
 {{- if .Values.input.extraInputs }}
 {{ .Values.input.extraInputs | indent 8 }}
 {{- end }}
@@ -36,6 +38,7 @@ data:
 {{ .Values.additionalInputs | indent 4 }}
 {{- end }}
 
+{{- if .Values.filter.enabled }}
     [FILTER]
         Name                kubernetes
         Match               {{ .Values.filter.match }}
@@ -48,6 +51,8 @@ data:
         K8S-Logging.Parser  {{ .Values.filter.k8sLoggingParser }}
         K8S-Logging.Exclude {{ .Values.filter.k8sLoggingExclude }}
         Buffer_Size         {{ .Values.filter.bufferSize }}
+{{- end }}
+
 {{- if .Values.filter.extraFilters }}
 {{ .Values.filter.extraFilters | indent 8 }}
 {{- end }}

diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml
@@ -30,6 +30,7 @@ service:
   #       Format logfmt
 
 input:
+  enabled: true
   tag: "kube.*"
   path: "/var/log/containers/*.log"
   db: "/var/log/flb_kube.db"
@@ -49,6 +50,7 @@ input:
 #       DB           winlog.sqlite
 
 filter:
+  enabled: true
   match: "kube.*"
   kubeURL: "https://kubernetes.default.svc.cluster.local:443"
   mergeLog: "On"