Skip to content

Commit b07a641

Browse files
EamonZhangEamonZhang
committed
2 parents 9a3a04d + a575327 commit b07a641

14 files changed

Lines changed: 108 additions & 96 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"

‎addons/redis-cluster/7.0/chart/redis-cluster/templates/configmap.yaml‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,6 @@ metadata:
1111
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
1212
{{- end }}
1313
data:
14-
{{- if .Values.proxy.enabled }}
15-
redis-proxy-default.toml: |-
16-
[log]
17-
level = "libproxy=error" # "trace" "info" "debug" "warn" "error"
18-
ansi = true # support ANSI colors
19-
stdout = true # print logs to stdout
20-
directory = "/tmp" # log file directory
21-
file_name = "redis-cluster-proxy.log" # log file name
22-
23-
[metrics]
24-
port = 2110
25-
26-
[[clusters]]
27-
name = "redis-cluster-proxy"
28-
listen_addr = "0.0.0.0:{{ .Values.proxy.containerPorts.proxy }}"
29-
hash_tag = "{}"
30-
thread = 2
31-
cache_type = "redis_cluster"
32-
servers = ["127.0.0.1:{{ .Values.redis.containerPorts.redis }}"]
33-
34-
fetch_interval = 300000
35-
fetch_since_latest_cmd = 300
36-
read_from_slave = false
37-
38-
ping_fail_limit = 10
39-
ping_interval = 300
40-
41-
read_timeout = 1000
42-
write_timeout = 1000
43-
dial_timeout = 500
44-
listen_proto = "tcp"
45-
node_connections = 1
46-
47-
auth = {REDIS_PASSWORD}
48-
{{- end }}
4914
redis-default.conf: |-
5015
# Redis configuration file example.
5116
#

‎addons/redis-cluster/7.0/chart/redis-cluster/templates/redis-statefulset.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,10 @@ spec:
322322
{{- if .Values.usePasswordFile }}
323323
export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")"
324324
{{- end }}
325-
sed s/{REDIS_PASSWORD}/\"${REDIS_PASSWORD}\"/g /opt/drycc/redis/etc/redis-proxy-default.toml > /opt/drycc/redis/etc/redis-proxy.toml
326-
redis-cluster-proxy /opt/drycc/redis/etc/redis-proxy.toml
325+
redis-cluster-proxy \
326+
-startup-nodes=127.0.0.1:{{ .Values.redis.containerPorts.redis }} \
327+
-addr=0.0.0.0:{{ .Values.proxy.containerPorts.proxy }} \
328+
-password=$(REDIS_PASSWORD)
327329
{{- end }}
328330
env:
329331
{{- if and .Values.usePassword (not .Values.usePasswordFile) }}
@@ -384,8 +386,6 @@ spec:
384386
- name: scripts
385387
mountPath: /scripts
386388
- name: default-config
387-
mountPath: /opt/drycc/redis/etc/redis-proxy-default.toml
388-
subPath: redis-proxy-default.toml
389389
{{- if .Values.usePasswordFile }}
390390
- name: redis-password
391391
mountPath: /opt/drycc/redis/secrets/

‎addons/redis-cluster/7.0/plans/standard-1024/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ redis:
2626
##
2727
resources:
2828
limits:
29-
cpu: 200m
29+
cpu: 300m
3030
memory: 1024Mi
3131
requests:
32-
cpu: 20m
32+
cpu: 150m
3333
memory: 512Mi
3434

3535
## @section Proxy&reg; statefulset parameters
@@ -42,8 +42,8 @@ proxy:
4242
##
4343
resources:
4444
limits:
45-
cpu: 100m
45+
cpu: 200m
4646
memory: 256Mi
4747
requests:
48-
cpu: 10m
49-
memory: 64Mi
48+
cpu: 100m
49+
memory: 128Mi

‎addons/redis-cluster/7.0/plans/standard-128/values.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ redis:
2626
##
2727
resources:
2828
limits:
29-
cpu: 100m
29+
cpu: 200m
3030
memory: 128Mi
3131
requests:
32-
cpu: 10m
32+
cpu: 100m
3333
memory: 64Mi
3434

3535
## @section Proxy&reg; statefulset parameters
@@ -42,8 +42,8 @@ proxy:
4242
##
4343
resources:
4444
limits:
45-
cpu: 100m
46-
memory: 128Mi
45+
cpu: 200m
46+
memory: 256Mi
4747
requests:
48-
cpu: 10m
49-
memory: 64Mi
48+
cpu: 100m
49+
memory: 128Mi

‎addons/redis-cluster/7.0/plans/standard-16384/values.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ redis:
2626
##
2727
resources:
2828
limits:
29-
cpu: 1000m
29+
cpu: 2000m
3030
memory: 16Gi
3131
requests:
32-
cpu: 100m
32+
cpu: 1000m
3333
memory: 8Gi
3434

3535
## @section Proxy&reg; statefulset parameters
@@ -42,8 +42,8 @@ proxy:
4242
##
4343
resources:
4444
limits:
45-
cpu: 100m
46-
memory: 256Mi
45+
cpu: 1000m
46+
memory: 1024Mi
4747
requests:
48-
cpu: 10m
49-
memory: 64Mi
48+
cpu: 500m
49+
memory: 512Mi

‎addons/redis-cluster/7.0/plans/standard-2048/values.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ redis:
2626
##
2727
resources:
2828
limits:
29-
cpu: 300m
29+
cpu: 500m
3030
memory: 2Gi
3131
requests:
32-
cpu: 30m
32+
cpu: 250m
3333
memory: 1Gi
3434

3535
## @section Proxy&reg; statefulset parameters
@@ -42,8 +42,8 @@ proxy:
4242
##
4343
resources:
4444
limits:
45-
cpu: 100m
46-
memory: 256Mi
45+
cpu: 300m
46+
memory: 512Mi
4747
requests:
48-
cpu: 10m
49-
memory: 64Mi
48+
cpu: 150m
49+
memory: 256Mi

‎addons/redis-cluster/7.0/plans/standard-256/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ redis:
2626
##
2727
resources:
2828
limits:
29-
cpu: 100m
29+
cpu: 200m
3030
memory: 256Mi
3131
requests:
32-
cpu: 10m
32+
cpu: 100m
3333
memory: 128Mi
3434

3535
## @section Proxy&reg; statefulset parameters
@@ -42,8 +42,8 @@ proxy:
4242
##
4343
resources:
4444
limits:
45-
cpu: 100m
45+
cpu: 200m
4646
memory: 256Mi
4747
requests:
48-
cpu: 10m
49-
memory: 64Mi
48+
cpu: 100m
49+
memory: 128Mi

‎addons/redis-cluster/7.0/plans/standard-32768/values.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ redis:
2626
##
2727
resources:
2828
limits:
29-
cpu: 1000m
29+
cpu: 4000m
3030
memory: 32Gi
3131
requests:
32-
cpu: 100m
32+
cpu: 2000m
3333
memory: 16Gi
3434

3535
## @section Proxy&reg; statefulset parameters
@@ -42,8 +42,8 @@ proxy:
4242
##
4343
resources:
4444
limits:
45-
cpu: 100m
46-
memory: 256Mi
45+
cpu: 1000m
46+
memory: 1024Mi
4747
requests:
48-
cpu: 10m
49-
memory: 64Mi
48+
cpu: 500m
49+
memory: 512Mi

0 commit comments

Comments
 (0)