Skip to content

Commit 351908a

Browse files
committed
chore(addons): fluentbit input and opensearch meta
1 parent 28aee05 commit 351908a

2 files changed

Lines changed: 47 additions & 0 deletions

File tree

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,19 @@ daemonset:
188188
Tag_Regex (?<pod_name>[a-z0-9](?:[-a-z0-9]*[a-z0-9])?(?:\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace_name>[^_]+)_(?<container_name>.+)-(?<container_id>[a-z0-9]{64})\.log$
189189
Read_from_Head false
190190
multiline.parser docker,cri
191+
192+
[FILTER]
193+
Name Lua
194+
Match kubernetes.*
195+
call append_tag
196+
code function append_tag(tag, timestamp, record) new_record = record local namespace, pod_name, container_name, container_id = string.match(tag, "kubernetes%.([^%.]+)%.([^%.]+)%.([^%.]+)%.(.+)") if namespace and pod_name and container_name and container_id then new_record["pod_name"] = pod_name new_record["namespace"] = namespace new_record["container_name"] = container_name new_record["container_id"] = container_id end return 1, timestamp, new_record end
197+
198+
[FILTER]
199+
name multiline
200+
match kubernetes.*
201+
multiline.parser python_multiline,java_multiline,go_multiline
202+
multiline.key_content log
203+
buffer on
191204
## https://docs.fluentbit.io/manual/pipeline/outputs
192205
outputs: |
193206
[OUTPUT]
@@ -211,6 +224,37 @@ daemonset:
211224
Time_Format %Y-%m-%dT%H:%M:%S.%L%z
212225
Time_Keep On
213226
227+
[MULTILINE_PARSER]
228+
Name python_multiline
229+
Type regex
230+
Flush_Timeout 1000
231+
key_content log
232+
Rule "start_state" "/^\[.*ERROR.*-- Internal Server Error: .*$/" "cont"
233+
Rule "cont" "/^Traceback \(most recent call last\):$/" "cont"
234+
Rule "cont" "/^\s+File \"/" "cont"
235+
Rule "cont" "/^\s+raise /" "cont"
236+
Rule "cont" "/^\s?\w+Error: /" "cont"
237+
Rule "cont" "/^\s+/" "cont"
238+
239+
[MULTILINE_PARSER]
240+
Name java_multiline
241+
Type regex
242+
Flush_Timeout 1000
243+
key_content log
244+
Rule "start_state" "/^Exception in thread /" "cont"
245+
Rule "start_state" "/^java\./" "cont"
246+
Rule "cont" "/^\s+at /" "cont"
247+
Rule "cont" "/^Caused by: /" "cont"
248+
249+
[MULTILINE_PARSER]
250+
Name go_multiline
251+
Type regex
252+
Flush_Timeout 1000
253+
key_content log
254+
Rule "start_state" "/^panic: /" "cont"
255+
Rule "cont" "/^\s+/" "cont"
256+
Rule "cont" "/^goroutine /" "cont"
257+
214258
## @section deployment Parameters
215259
##
216260

addons/opensearch/2.10/meta.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ instances_retrievable: true
1515
bindings_retrievable: true
1616
plan_updateable: true
1717
allow_parameters:
18+
- name: "extraConfig"
19+
required: false
20+
description: "extraConfig config for values.yaml"
1821
- name: "plugins"
1922
required: false
2023
description: "plugins config for values.yaml"

0 commit comments

Comments
 (0)