Added the ability to set Use_Tag_For_Meta on fluentbit kubernetes filter

solidDoWant · cw-Guo · commit 3d63affe0a57 · 2025-04-17T08:37:46.000-07:00
Signed-off-by: Fred Heinecke &lt;fred.heinecke@yahoo.com&gt;
diff --git a/apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go b/apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go
@@ -105,6 +105,8 @@ type Kubernetes struct {
 	NamespaceMetadataOnly *bool `json:"namespaceMetadataOnly,omitempty"`
 	// Include Kubernetes owner references in the extra metadata.
 	OwnerReferences *bool `json:"ownerReferences,omitempty"`
+	// If true, Kubernetes metadata (e.g., pod_name, container_name, namespace_name etc) will be extracted from the tag itself.
+	UseTagForMeta *bool `json:"useTagForMeta,omitempty"`
 }
 
 func (_ *Kubernetes) Name() string {
@@ -222,6 +224,9 @@ func (k *Kubernetes) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 	if k.OwnerReferences != nil {
 		kvs.Insert("Owner_References", fmt.Sprint(*k.OwnerReferences))
 	}
+	if k.UseTagForMeta != nil {
+		kvs.Insert("Use_Tag_For_Meta", fmt.Sprint(*k.UseTagForMeta))
+	}
 	return kvs, nil
 }
 
diff --git a/apis/fluentbit/v1alpha2/plugins/filter/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/filter/zz_generated.deepcopy.go
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
@@ -317,6 +317,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml
@@ -317,6 +317,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
diff --git a/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml b/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml
@@ -317,6 +317,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
diff --git a/config/crd/bases/fluentbit.fluent.io_filters.yaml b/config/crd/bases/fluentbit.fluent.io_filters.yaml
@@ -317,6 +317,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
diff --git a/docs/plugins/fluentbit/filter/kubernetes.md b/docs/plugins/fluentbit/filter/kubernetes.md
@@ -40,3 +40,4 @@ Kubernetes filter allows to enrich your log files with Kubernetes metadata. <br
 | namespaceAnnotations | Include Kubernetes namespace resource annotations in the extra metadata. | *bool |
 | namespaceMetadataOnly | Include Kubernetes namespace metadata only and no pod metadata. If this is set, the values of Labels and Annotations are ignored. | *bool |
 | ownerReferences | Include Kubernetes owner references in the extra metadata. | *bool |
+| useTagForMeta | If true, Kubernetes metadata (e.g., pod_name, container_name, namespace_name etc) will be extracted from the tag itself. | *bool |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -316,6 +316,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
@@ -15053,6 +15058,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -316,6 +316,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.
@@ -15053,6 +15058,11 @@ spec:
                             instead of calling Kube Server API to enhance the log.
                             This could mitigate the Kube API heavy traffic issue for large cluster.
                           type: boolean
+                        useTagForMeta:
+                          description: If true, Kubernetes metadata (e.g., pod_name,
+                            container_name, namespace_name etc) will be extracted
+                            from the tag itself.
+                          type: boolean
                       type: object
                     logToMetrics:
                       description: LogToMetrics defines a Log to Metrics Filter configuration.

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ type Kubernetes struct {`
`105`	`105`	NamespaceMetadataOnly *bool `json:"namespaceMetadataOnly,omitempty"`
`106`	`106`	`// Include Kubernetes owner references in the extra metadata.`
`107`	`107`	OwnerReferences *bool `json:"ownerReferences,omitempty"`
	`108`	`+ // If true, Kubernetes metadata (e.g., pod_name, container_name, namespace_name etc) will be extracted from the tag itself.`
	`109`	+ UseTagForMeta *bool `json:"useTagForMeta,omitempty"`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`func (_ *Kubernetes) Name() string {`
`@@ -222,6 +224,9 @@ func (k Kubernetes) Params(_ plugins.SecretLoader) (params.KVs, error) {`
`222`	`224`	`if k.OwnerReferences != nil {`
`223`	`225`	`kvs.Insert("Owner_References", fmt.Sprint(*k.OwnerReferences))`
`224`	`226`	`}`
	`227`	`+ if k.UseTagForMeta != nil {`
	`228`	`+ kvs.Insert("Use_Tag_For_Meta", fmt.Sprint(*k.UseTagForMeta))`
	`229`	`+ }`
`225`	`230`	`return kvs, nil`
`226`	`231`	`}`
`227`	`232`