Skip to content

Commit e85e3e9

Browse files
ilanRosenbaumilanRosenbaum
committed
Change value names based on PR comments
1 parent 1fec655 commit e85e3e9

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ We recommend that you use the `values.yaml` file for configuring your installati
223223

224224
### Logging
225225

226-
To enable log collection for all Marklogic logs set logging.enabled to true. Set each option in logging.trackFiles to true of false depending on if you want to track each type of Marklogic log file.
226+
To enable log collection for all Marklogic logs set logCollection.enabled to true. Set each option in logCollection.files to true of false depending on if you want to track each type of Marklogic log file.
227227

228228
In order to use the logs that are colleceted you must define an output in the configmap.yaml file. Fluent Bit will parse and output all the log files from each pod to the output you set.
229229

@@ -420,9 +420,9 @@ This table describes the list of available parameters for Helm Chart.
420420
| `startupProbe.timeoutSeconds` | Timeout seconds for startup probe | `1` |
421421
| `startupProbe.failureThreshold` | Failure threshold for startup probe | `30` |
422422
| `startupProbe.successThreshold` | Success threshold for startup probe | `1` |
423-
| `logging.enabled` | Enable this parameter to enable cluster wide log collection of Marklogic server logs | `false` |
424-
| `logging.trackFiles.errorLogs` | Enable this parameter to enable collection of Marklogics error logs when cluster level logging is enabled | `true` |
425-
| `logging.trackFiles.accessLogs` | Enable this parameter to enable collection of Marklogics access logs when cluster level logging is enabled | `true` |
426-
| `logging.trackFiles.requestLogs` | Enable this parameter to enable collection of Marklogics request logs when cluster level logging is enabled | `true` |
427-
| `logging.trackFiles.crashLogs` | Enable this parameter to enable collection of Marklogics crash logs when cluster level logging is enabled | `true` |
428-
| `logging.trackFiles.auditLogs` | Enable this parameter to enable collection of Marklogics audit logs when cluster level logging is enabled | `true` |
423+
| `logCollection.enabled` | Enable this parameter to enable cluster wide log collection of Marklogic server logs | `false` |
424+
| `logCollection.files.errorLogs` | Enable this parameter to enable collection of Marklogics error logs when cluster level logging is enabled | `true` |
425+
| `logCollection.files.accessLogs` | Enable this parameter to enable collection of Marklogics access logs when cluster level logging is enabled | `true` |
426+
| `logCollection.files.requestLogs` | Enable this parameter to enable collection of Marklogics request logs when cluster level logging is enabled | `true` |
427+
| `logCollection.files.crashLogs` | Enable this parameter to enable collection of Marklogics crash logs when cluster level logging is enabled | `true` |
428+
| `logCollection.files.auditLogs` | Enable this parameter to enable collection of Marklogics audit logs when cluster level logging is enabled | `true` |

‎charts/templates/configmap.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ data:
2929
@INCLUDE outputs.conf
3030
3131
inputs.conf: |
32-
{{- if .Values.logging.trackFiles.errorLogs }}
32+
{{- if .Values.logCollection.files.errorLogs }}
3333
[INPUT]
3434
Name tail
3535
Path {{ .Values.persistence.mountPath }}/Logs/*ErrorLog.txt
@@ -40,7 +40,7 @@ data:
4040
Mem_Buf_Limit 4MB
4141
{{- end }}
4242
43-
{{- if .Values.logging.trackFiles.accessLogs }}
43+
{{- if .Values.logCollection.files.accessLogs }}
4444
[INPUT]
4545
Name tail
4646
Path {{ .Values.persistence.mountPath }}/Logs/*AccessLog.txt
@@ -51,7 +51,7 @@ data:
5151
Mem_Buf_Limit 4MB
5252
{{- end }}
5353
54-
{{- if .Values.logging.trackFiles.requestLogs }}
54+
{{- if .Values.logCollection.files.requestLogs }}
5555
[INPUT]
5656
Name tail
5757
Path {{ .Values.persistence.mountPath }}/Logs/*RequestLog.txt
@@ -62,7 +62,7 @@ data:
6262
Mem_Buf_Limit 4MB
6363
{{- end }}
6464
65-
{{- if .Values.logging.trackFiles.crashLogs }}
65+
{{- if .Values.logCollection.files.crashLogs }}
6666
[INPUT]
6767
Name tail
6868
Path {{ .Values.persistence.mountPath }}/Logs/CrashLog.txt
@@ -72,7 +72,7 @@ data:
7272
Mem_Buf_Limit 4MB
7373
{{- end }}
7474
75-
{{- if .Values.logging.trackFiles.auditLogs }}
75+
{{- if .Values.logCollection.files.auditLogs }}
7676
[INPUT]
7777
Name tail
7878
Path {{ .Values.persistence.mountPath }}/Logs/AuditLog.txt
@@ -87,10 +87,10 @@ data:
8787
# [OUTPUT]
8888
# Name es
8989
# Match *
90-
# Host {{ .Values.logging.host }}
91-
# Port {{ .Values.logging.port }}
92-
# HTTP_User {{ .Values.logging.username }}
93-
# HTTP_Passwd {{ .Values.logging.password }}
90+
# Host {{ .Values.logCollection.host }}
91+
# Port {{ .Values.logCollection.port }}
92+
# HTTP_User {{ .Values.logCollection.username }}
93+
# HTTP_Passwd {{ .Values.logCollection.password }}
9494
# Configure desired output below, documentation on how to set up output can be found here
9595
# https://docs.fluentbit.io/manual/pipeline/outputs
9696

‎charts/templates/statefulset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ spec:
144144
{{- with .Values.resources }}
145145
resources: {{- toYaml . | nindent 12 }}
146146
{{- end }}
147-
{{- if .Values.logging.enabled }}
147+
{{- if .Values.logCollection.enabled }}
148148
- name: fluent-bit
149149
image: fluent/fluent-bit:1.9.7
150150
imagePullPolicy: IfNotPresent
@@ -180,7 +180,7 @@ spec:
180180
- name: {{ include "marklogic.fullname" . }}-registry
181181
{{- end }}
182182
volumes:
183-
{{- if .Values.logging.enabled }}
183+
{{- if .Values.logCollection.enabled }}
184184
- name: {{ include "marklogic.fullname" . }}-fb-config-map
185185
configMap:
186186
name: {{ include "marklogic.fullname" . }}-fb-config-map

‎charts/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ startupProbe:
117117
failureThreshold: 30
118118
successThreshold: 1
119119

120-
logging:
121-
enabled: false
122-
trackFiles:
120+
logCollection:
121+
enabled: true
122+
files:
123123
errorLogs: true
124124
accessLogs: true
125125
requestLogs: true

‎test/e2e/clustering_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestClusterJoin(t *testing.T) {
3737
"image.tag": "10-internal",
3838
"auth.adminUsername": username,
3939
"auth.adminPassword": password,
40-
"logging.enabled": "false",
40+
"logCollection.enabled": "false",
4141
},
4242
}
4343

‎test/e2e/install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestHelmInstall(t *testing.T) {
2929
"replicaCount": "1",
3030
"image.repository": "marklogic-centos/marklogic-server-centos",
3131
"image.tag": "10-internal",
32-
"logging.enabled": "false",
32+
"logCollection.enabled": "false",
3333
},
3434
}
3535

‎test/e2e/upgrade_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestHelmUpgrade(t *testing.T) {
2929
"replicaCount": "1",
3030
"image.repository": "marklogic-centos/marklogic-server-centos",
3131
"image.tag": "10-internal",
32-
"logging.enabled": "false",
32+
"logCollection.enabled": "false",
3333
},
3434
}
3535

@@ -49,7 +49,7 @@ func TestHelmUpgrade(t *testing.T) {
4949
"replicaCount": "2",
5050
"image.repository": "marklogic-centos/marklogic-server-centos",
5151
"image.tag": "10-internal",
52-
"logging.enabled": "false",
52+
"logCollection.enabled": "false",
5353
},
5454
}
5555

‎test/template/template_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestChartTemplateNoLogging(t *testing.T) {
3232
"image.repository": "marklogicdb/marklogic-db",
3333
"image.tag": "latest",
3434
"persistence.enabled": "false",
35-
"logging.enabled": "false",
35+
"logCollection.enabled": "false",
3636
},
3737
KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
3838
}
@@ -73,7 +73,7 @@ func TestChartTemplateLogging(t *testing.T) {
7373
"image.repository": "marklogicdb/marklogic-db",
7474
"image.tag": "latest",
7575
"persistence.enabled": "false",
76-
"logging.enabled": "true",
76+
"logCollection.enabled": "true",
7777
},
7878
KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
7979
}

0 commit comments

Comments
 (0)