Parametering few more plugins

fluent · Jul 12, 2024 · 09168bb · 09168bb
1 parent 34a7019
commit 09168bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml b/charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml
@@ -9,7 +9,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     fluentbit.fluent.io/component: logging
 spec:
-  match: kube.*
+  match: {{ .Values.fluentbit.filter.containerd.match }}
   filters:
   - lua:
       script:

diff --git a/charts/fluent-operator/templates/fluentbit-clusterfilter-kubernetes.yaml b/charts/fluent-operator/templates/fluentbit-clusterfilter-kubernetes.yaml
@@ -9,7 +9,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     fluentbit.fluent.io/component: logging
 spec:
-  match: kube.*
+  match: {{ .Values.fluentbit.filter.kubernetes.match }}
   filters:
   - kubernetes:
       kubeURL: https://kubernetes.default.svc:443

diff --git a/charts/fluent-operator/templates/fluentbit-clusterfilter-multiline.yaml b/charts/fluent-operator/templates/fluentbit-clusterfilter-multiline.yaml
@@ -9,7 +9,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     fluentbit.fluent.io/component: logging
 spec:
-  match: kube.*
+  match: {{ .Values.fluentbit.filter.multiline.match }}
   filters:
   - multiline:
       keyContent: {{ .Values.fluentbit.filter.multiline.keyContent | quote }}

diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -345,6 +345,7 @@ fluentbit:
     multiline:
       enable: false
       keyContent: log
+      match: "kube.*"
       # emitterMemBufLimit 120 (MB)
       emitterMemBufLimit: 120 
       parsers:
@@ -357,11 +358,13 @@ fluentbit:
       enable: true
       labels: false
       annotations: false
+      match: "kube.*"
     containerd:
       # This is customized lua containerd log format converter, you can refer here:
       # https://github.com/fluent/fluent-operator/blob/master/charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml
       # https://github.com/fluent/fluent-operator/blob/master/charts/fluent-operator/templates/fluentbit-containerd-config.yaml
       enable: true
+      match: "kube.*"
     systemd:
       enable: true