Merge pull request #1566 from solidDoWant/feat/add-owner-references-kube-filter-1

Added the ability to set `Owner_References` on fluentbit kubernetes filter

Author: cw-Guo

apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go

@@ -103,6 +103,8 @@ type Kubernetes struct {
 	// Include Kubernetes namespace metadata only and no pod metadata.
 	// If this is set, the values of Labels and Annotations are ignored.
 	NamespaceMetadataOnly *bool `json:"namespaceMetadataOnly,omitempty"`
+	// Include Kubernetes owner references in the extra metadata.
+	OwnerReferences *bool `json:"ownerReferences,omitempty"`
 }
 
 func (_ *Kubernetes) Name() string {
@@ -217,6 +219,9 @@ func (k *Kubernetes) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 	if k.NamespaceMetadataOnly != nil {
 		kvs.Insert("Namespace_Metadata_Only", fmt.Sprint(*k.NamespaceMetadataOnly))
 	}
+	if k.OwnerReferences != nil {
+		kvs.Insert("Owner_References", fmt.Sprint(*k.OwnerReferences))
+	}
 	return kvs, nil
 }
 

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

@@ -279,6 +279,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.

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

@@ -279,6 +279,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.

config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml

@@ -279,6 +279,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.

config/crd/bases/fluentbit.fluent.io_filters.yaml

@@ -279,6 +279,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.

docs/plugins/fluentbit/filter/kubernetes.md

@@ -39,3 +39,4 @@ Kubernetes filter allows to enrich your log files with Kubernetes metadata. <br
 | namespaceLabels | Include Kubernetes namespace resource labels in the extra metadata. | *bool |
 | 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 |

manifests/setup/fluent-operator-crd.yaml

@@ -278,6 +278,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.
@@ -15011,6 +15015,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.

manifests/setup/setup.yaml

@@ -278,6 +278,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.
@@ -15011,6 +15015,10 @@ spec:
                             Include Kubernetes namespace metadata only and no pod metadata.
                             If this is set, the values of Labels and Annotations are ignored.
                           type: boolean
+                        ownerReferences:
+                          description: Include Kubernetes owner references in the
+                            extra metadata.
+                          type: boolean
                         regexParser:
                           description: |-
                             Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.