Skip to content

Commit 24b036f

Browse files
committed
chore(fluentbit): add multiline config
1 parent 9454a34 commit 24b036f

3 files changed

Lines changed: 24 additions & 18 deletions

File tree

addons/clickhouse/24/chart/clickhouse/values.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,13 @@ resourcesPreset: "small"
206206
## cpu: 3
207207
## memory: 1024Mi
208208
##
209-
resources: {}
209+
resources:
210+
limits:
211+
cpu: 2000m
212+
memory: 4Gi
213+
requests:
214+
cpu: 2000m
215+
memory: 4Gi
210216
## Configure Pods Security Context
211217
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
212218
## @param podSecurityContext.enabled Enabled ClickHouse pods' Security Context

addons/fluentbit/2/chart/fluentbit/values.yaml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ daemonset:
165165
flush: 1
166166
## https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/classic-mode/configuration-file
167167
config:
168+
multilines : python_multiline,java_multiline,go_multiline,gateway_multiline
168169
service: |
169170
[SERVICE]
170171
Flush {{ .Values.daemonset.flush }}
@@ -198,7 +199,7 @@ daemonset:
198199
[FILTER]
199200
name multiline
200201
match kubernetes.*
201-
multiline.parser python_multiline,java_multiline,go_multiline,gateway_multiline
202+
multiline.parser {{ .Values.daemonset.config.multilines }}
202203
multiline.key_content log
203204
buffer on
204205
@@ -257,6 +258,15 @@ daemonset:
257258
Rule "start_state" "/^panic: /" "cont"
258259
Rule "cont" "/^\s+/" "cont"
259260
Rule "cont" "/^goroutine /" "cont"
261+
262+
[MULTILINE_PARSER]
263+
Name gateway_multiline
264+
Type regex
265+
Flush_Timeout 1000
266+
key_content log
267+
Rule "start_state" "/^\[\d{4}-\d{2}-\d{2}/" "cont"
268+
Rule "cont" "/^(?!\[\d{4}-\d{2}-\d{2})/" "cont"
269+
260270
## @param daemonset.extraEnvVars Array with extra environment variables to add to daemonset nodes
261271
## e.g:
262272
## extraEnvVars:
@@ -271,22 +281,6 @@ daemonset:
271281
##
272282
extraEnvVarsSecret: ""
273283

274-
[MULTILINE_PARSER]
275-
Name gateway_multiline
276-
Type regex
277-
Flush_Timeout 1000
278-
key_content log
279-
Rule "start_state" "/^\[\d{4}-\d{2}-\d{2}/" "cont"
280-
Rule "cont" "/^(?!\[\d{4}-\d{2}-\d{2})/" "cont"
281-
282-
[MULTILINE_PARSER]
283-
Name gateway_multiline
284-
Type regex
285-
Flush_Timeout 1000
286-
key_content log
287-
Rule "start_state" "/^\[\d{4}-\d{2}-\d{2}/" "cont"
288-
Rule "cont" "/^(?!\[\d{4}-\d{2}-\d{2})/" "cont"
289-
290284
## @section deployment Parameters
291285
##
292286

addons/fluentbit/2/meta.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,10 @@ allow_parameters:
2121
- name: "daemonset.config.outputs"
2222
required: true
2323
description: "destinations for your data: databases, cloud services and more"
24+
- name: "daemonset.config.multilines"
25+
equired: false
26+
description: "destinations multilines"
27+
- name: "daemonset.config.parsers"
28+
equired: false
29+
description: "destinations parsers"
2430
archive: false

0 commit comments

Comments
 (0)