Skip to content
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

parameterized the tagging of tail plugin #1237

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

parameterized the tagging of tail plugin #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a7019
parameterized the tagging of tail plugin
Jul 11, 2024
6231919
Parametering few more plugins
Jul 12, 2024
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
2 changes: 1 addition & 1 deletion charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-operator/templates/fluentbit-clusterfilter-kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-operator/templates/fluentbit-clusterfilter-multiline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
fluentbit.fluent.io/component: logging
spec:
tail:
tag: kube.*
tag: {{ .Values.fluentbit.input.tail.tag }}
Copy link
Member

@benjaminhuo benjaminhuo Jul 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not enough to modify tag for tail input only.
For example, it's used by other plugins like filter and output:
https://github.com/fluent/fluent-operator/blob/master/charts/fluent-operator/templates/fluentbit-clusterfilter-kubernetes.yaml#L12

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-output-opensearch.yaml#L12

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it.
I will update this PR with the wider plugin lists.

Copy link
Author

@harshvora10101 harshvora10101 Jul 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and I will also sign the commits.

path: {{ .Values.fluentbit.input.tail.path }}
readFromHead: {{ .Values.fluentbit.input.tail.readFromHead }}
{{- if eq .Values.containerRuntime "docker" }}
Expand Down
4 changes: 4 additions & 0 deletions charts/fluent-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ fluentbit:
input:
tail:
enable: true
tag: "kube.*"
refreshIntervalSeconds: 10
memBufLimit: 100MB
bufferMaxSize: ""
Expand Down Expand Up @@ -344,6 +345,7 @@ fluentbit:
multiline:
enable: false
keyContent: log
match: "kube.*"
# emitterMemBufLimit 120 (MB)
emitterMemBufLimit: 120
parsers:
Expand All @@ -356,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

Expand Down