From 34a70199e9cb04312c705a9d04728c6eeaddf18b Mon Sep 17 00:00:00 2001
From: Harsh Vora <harsh.vora@Harshs-MacBook-Pro.local>
Date: Thu, 11 Jul 2024 13:18:55 +0530
Subject: [PATCH 1/2] parameterized the tagging of tail plugin

Signed-off-by: Harsh Vora <harsh.vora@Harshs-MacBook-Pro.local>
---
 .../fluent-operator/templates/fluentbit-clusterinput-tail.yaml  | 2 +-
 charts/fluent-operator/values.yaml                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
index 8f703224c..bcab92b48 100644
--- a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
+++ b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
@@ -10,7 +10,7 @@ metadata:
     fluentbit.fluent.io/component: logging
 spec:
   tail:
-    tag: kube.*
+    tag: {{ .Values.fluentbit.input.tail.tag  }}
     path: {{ .Values.fluentbit.input.tail.path }}
     readFromHead: {{ .Values.fluentbit.input.tail.readFromHead }}
     {{- if eq .Values.containerRuntime "docker" }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 1d1c17b33..d2f97470c 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -185,6 +185,7 @@ fluentbit:
   input:
     tail:
       enable: true
+      tag: "kube.*"
       refreshIntervalSeconds: 10
       memBufLimit: 100MB
       bufferMaxSize: ""

From 6231919eb6ed66fb5d7f0f0b046164e52ba51adf Mon Sep 17 00:00:00 2001
From: Harsh Vora <harsh.vora@Harshs-MacBook-Pro.local>
Date: Fri, 12 Jul 2024 15:34:01 +0530
Subject: [PATCH 2/2] Parametering few more plugins

Signed-off-by: Harsh Vora <harsh.vora@Harshs-MacBook-Pro.local>
---
 .../templates/fluentbit-clusterfilter-containerd.yaml          | 2 +-
 .../templates/fluentbit-clusterfilter-kubernetes.yaml          | 2 +-
 .../templates/fluentbit-clusterfilter-multiline.yaml           | 2 +-
 charts/fluent-operator/values.yaml                             | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml b/charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml
index 7c1fd9435..12a6d47e5 100644
--- 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
index d296eeb27..9fc62ef41 100644
--- 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
index 58144969f..d130ba2e0 100644
--- 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
index d2f97470c..8dbcfd46f 100644
--- 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