Added the ability to set Use_Tag_For_Meta on fluentbit kubernetes filter

Signed-off-by: Fred Heinecke <[email protected]>

Author: solidDoWant

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
 }
 

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: clusterfilters.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io
@@ -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.
@@ -449,9 +454,7 @@ spec:
                                 This field is effectively required, but due to backwards compatibility is
                                 allowed to be empty. Instances of this type with an empty value here are
                                 almost certainly wrong.
-                                TODO: Add other useful fields. apiVersion, kind, uid?
                                 More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                               type: string
                             optional:
                               description: Specify whether the ConfigMap or its key

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: clusterfluentbitconfigs.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: clusterinputs.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io
@@ -282,9 +282,7 @@ spec:
                                       This field is effectively required, but due to backwards compatibility is
                                       allowed to be empty. Instances of this type with an empty value here are
                                       almost certainly wrong.
-                                      TODO: Add other useful fields. apiVersion, kind, uid?
                                       More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                                     type: string
                                   optional:
                                     description: Specify whether the Secret or its

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clustermultilineparsers.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: clustermultilineparsers.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: clusterparsers.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io