Skip to content

feat: kubernetes namespace labels and annotations with fluent-bit 3.0 #1696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pepov merged 1 commit into from
Mar 14, 2024
Merged

feat: kubernetes namespace labels and annotations with fluent-bit 3.0 #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down
12 changes: 12 additions & 0 deletions charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,6 +2104,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down Expand Up @@ -10778,6 +10784,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down
6 changes: 6 additions & 0 deletions charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3644,6 +3644,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down
12 changes: 12 additions & 0 deletions config/crd/bases/logging.banzaicloud.io_loggings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,6 +2104,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down Expand Up @@ -10778,6 +10784,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/logging.banzaicloud.io_nodeagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3644,6 +3644,12 @@ spec:
type: string
Use_Kubelet:
type: string
kube_meta_namespace_cache_ttl:
type: string
namespace_annotations:
type: string
namespace_labels:
type: string
tls.debug:
type: string
tls.verify:
Expand Down
15 changes: 15 additions & 0 deletions docs/configuration/crds/v1beta1/fluentbit_types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,21 @@ Default: On
Optional parser name to specify how to parse the data contained in the log key. Recommended use is for developers or testing only.


### namespace_annotations (string, optional) {#filterkubernetes-namespace_annotations}

Include Kubernetes namespace annotations on every record


### kube_meta_namespace_cache_ttl (string, optional) {#filterkubernetes-kube_meta_namespace_cache_ttl}

Configurable TTL for K8s cached namespace metadata. (15m)


### namespace_labels (string, optional) {#filterkubernetes-namespace_labels}

Include Kubernetes namespace labels on every record


### Regex_Parser (string, optional) {#filterkubernetes-regex_parser}

Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id. The parser must be registered in a parsers file (refer to parser filter-kube-test as an example).
Expand Down
6 changes: 6 additions & 0 deletions pkg/sdk/logging/api/v1beta1/fluentbit_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,12 @@ type FilterKubernetes struct {
Labels string `json:"Labels,omitempty"`
// Include Kubernetes resource annotations in the extra metadata. (default:On)
Annotations string `json:"Annotations,omitempty"`
// Include Kubernetes namespace labels on every record
NamespaceLabels string `json:"namespace_labels,omitempty"`
// Include Kubernetes namespace annotations on every record
NamespaceAnnotations string `json:"namespace_annotations,omitempty"`
// Configurable TTL for K8s cached namespace metadata. (15m)
NamespaceCacheTTL string `json:"kube_meta_namespace_cache_ttl,omitempty"`
// If set, Kubernetes meta-data can be cached/pre-loaded from files in JSON format in this directory, named as namespace-pod.meta
KubeMetaPreloadCacheDir string `json:"Kube_meta_preload_cache_dir,omitempty"`
// If set, use dummy-meta data (for test/dev purposes) (default:Off)
Expand Down