Skip to content

Commit 8390b58

Browse files
pengzhoumlPeng Zhou
andauthored
MLE-15572 Update logCollection param section in values.yaml (#270)
* MLE-15572: update logCollection values file * update configMap for logCollection update in values file --------- Co-authored-by: Peng Zhou <[email protected]>
1 parent 38c1486 commit 8390b58

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

charts/templates/configmap.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ data:
4747
@INCLUDE outputs.conf
4848
4949
inputs.conf: |
50-
{{- if .Values.logCollection.files.errorLogs }}
50+
{{- if and .Values.logCollection .Values.logCollection.files .Values.logCollection.files.errorLogs }}
5151
[INPUT]
5252
Name tail
5353
Path /var/opt/MarkLogic/Logs/*ErrorLog.txt
@@ -58,7 +58,7 @@ data:
5858
Mem_Buf_Limit 4MB
5959
{{- end }}
6060
61-
{{- if .Values.logCollection.files.accessLogs }}
61+
{{- if and .Values.logCollection .Values.logCollection.files .Values.logCollection.files.accessLogs }}
6262
[INPUT]
6363
Name tail
6464
Path /var/opt/MarkLogic/Logs/*AccessLog.txt
@@ -69,7 +69,7 @@ data:
6969
Mem_Buf_Limit 4MB
7070
{{- end }}
7171
72-
{{- if .Values.logCollection.files.requestLogs }}
72+
{{- if and .Values.logCollection .Values.logCollection.files .Values.logCollection.files.requestLogs }}
7373
[INPUT]
7474
Name tail
7575
Path /var/opt/MarkLogic/Logs/*RequestLog.txt
@@ -80,7 +80,7 @@ data:
8080
Mem_Buf_Limit 4MB
8181
{{- end }}
8282
83-
{{- if .Values.logCollection.files.crashLogs }}
83+
{{- if and .Values.logCollection .Values.logCollection.files .Values.logCollection.files.crashLogs }}
8484
[INPUT]
8585
Name tail
8686
Path /var/opt/MarkLogic/Logs/CrashLog.txt
@@ -90,7 +90,7 @@ data:
9090
Mem_Buf_Limit 4MB
9191
{{- end }}
9292
93-
{{- if .Values.logCollection.files.auditLogs }}
93+
{{- if and .Values.logCollection .Values.logCollection.files .Values.logCollection.files.auditLogs }}
9494
[INPUT]
9595
Name tail
9696
Path /var/opt/MarkLogic/Logs/AuditLog.txt

charts/values.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -306,23 +306,23 @@ readinessProbe:
306306
## And export them to a logging backend specified in the outputs section below
307307
logCollection:
308308
enabled: false
309-
image: fluent/fluent-bit:3.1.1
310-
resources:
311-
requests:
312-
cpu: "100m"
313-
memory: "128Mi"
314-
limits:
315-
cpu: "100m"
316-
memory: "128Mi"
317-
files:
318-
errorLogs: true
319-
accessLogs: true
320-
requestLogs: true
321-
crashLogs: true
322-
auditLogs: true
309+
# image: fluent/fluent-bit:3.1.1
310+
# resources:
311+
# requests:
312+
# cpu: "100m"
313+
# memory: "128Mi"
314+
# limits:
315+
# cpu: "100m"
316+
# memory: "128Mi"
317+
# files:
318+
# errorLogs: true
319+
# accessLogs: true
320+
# requestLogs: true
321+
# crashLogs: true
322+
# auditLogs: true
323323
## Configure desired output
324324
## Documentation on how to set up output can be found here: https://docs.fluentbit.io/manual/pipeline/outputs
325-
outputs: |-
325+
# outputs: |-
326326
# [OUTPUT]
327327
# name loki
328328
# match *

0 commit comments

Comments
 (0)