Update README, remove unnecesarry parameters

Author: ilanRosenbaum

README.md

@@ -179,7 +179,7 @@ You should see an entry named "my-release" (or the release name you chose) with
 
 ## Configuration Options
 
-This section describes the configuration options you can use with Helm. 
+This section describes the configuration options you can use with Helm.
 
 ### --values
 
@@ -221,6 +221,14 @@ helm install my-release marklogic/marklogic --version=1.0.0-ea1 \
 
 We recommend that you use the `values.yaml` file for configuring your installation.
 
+### Logging
+
+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.
+
+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.
+
+For documentation on how to setup the Fluent Bit output with your logging backend see Fluent Bit's output documentation here: <https://docs.fluentbit.io/manual/pipeline/outputs>
+
 # Access the MarkLogic Server
 
 ## Service
@@ -369,3 +377,9 @@ This table describes the list of available parameters for Helm Chart.
 | `startupProbe.timeoutSeconds`        | Timeout seconds for startup probe                                                                              | `1`                                  |
 | `startupProbe.failureThreshold`      | Failure threshold for startup probe                                                                            | `30`                                 |
 | `startupProbe.successThreshold`      | Success threshold for startup probe                                                                            | `1`                                  |
+| `logging.enabled`                    | Enable this parameter to enable cluster wide log collection of Marklogic server logs                           | `false`                              |
+| `logging.trackFiles.errorLogs`       | Enable this parameter to enable collection of Marklogics error logs when cluster level logging is enabled      | `true`                               |
+| `logging.trackFiles.accessLogs`      | Enable this parameter to enable collection of Marklogics access logs when cluster level logging is enabled     | `true`                               |
+| `logging.trackFiles.requestLogs`     | Enable this parameter to enable collection of Marklogics request logs when cluster level logging is enabled    | `true`                               |
+| `logging.trackFiles.crashLogs`       | Enable this parameter to enable collection of Marklogics crash logs when cluster level logging is enabled      | `true`                               |
+| `logging.trackFiles.auditLogs`       | Enable this parameter to enable collection of Marklogics audit logs when cluster level logging is enabled      | `true`                               |

charts/templates/configmap.yaml

@@ -14,7 +14,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.logging.configMapName }}
+  name: {{ include "marklogic.fullname" . }}-fb-config-map
   namespace: {{ .Release.Namespace }}
 data:
   fluent-bit.conf: |
@@ -36,6 +36,7 @@ data:
         Read_from_head true
         Tag kube.marklogic.logs.error
         Path_Key path
+        Parser error_parser
       {{- end }}
       
       {{- if .Values.logging.trackFiles.accessLogs }}
@@ -45,6 +46,7 @@ data:
         Read_from_head true
         tag kube.marklogic.logs.access
         Path_Key path
+        Parser access_parser
       {{- end }}
 
       {{- if .Values.logging.trackFiles.requestLogs }}
@@ -54,6 +56,7 @@ data:
         Read_from_head true
         tag kube.marklogic.logs.request
         Path_Key path
+        Parser json_parser
       {{- end }}
 
       {{- if .Values.logging.trackFiles.crashLogs }}
@@ -119,28 +122,6 @@ data:
         Match kube.marklogic.logs.crash
         Add tag kube.marklogic.logs.crash
 
-      # Parse Logs
-      [FILTER]
-        Name parser
-        Match kube.marklogic.logs.error
-        Key_Name log
-        Parser error_parser
-        Reserve_Data On
-
-      [FILTER]
-        Name parser
-        Match kube.marklogic.logs.access
-        Key_Name log
-        Parser access_parser
-        Reserve_Data On
-
-      [FILTER]
-        Name parser
-        Match kube.marklogic.logs.request
-        Key_Name log
-        Parser json_parser
-        Reserve_Data On
-
   parsers.conf: |
       [PARSER]
         Name error_parser

charts/templates/statefulset.yaml

@@ -154,7 +154,7 @@ spec:
             {{- if .Values.extraVolumeMounts }}
               {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
             {{- end }}
-            - name: {{ .Values.logging.configMapName }}
+            - name: {{ include "marklogic.fullname" . }}-fb-config-map
               mountPath: /fluent-bit/etc/
           env:
             - name: POD_NAME
@@ -174,9 +174,9 @@ spec:
       {{- end }}
       volumes:
         {{- if .Values.logging.enabled }}
-        - name: {{ .Values.logging.configMapName }}
+        - name: {{ include "marklogic.fullname" . }}-fb-config-map
           configMap:
-            name: {{ .Values.logging.configMapName }}
+            name: {{ include "marklogic.fullname" . }}-fb-config-map
         {{- end }}
       {{- if or (not .Values.persistence.enabled) (.Values.extraVolumes) }}
         {{- if not .Values.persistence.enabled }}

charts/values.yaml

@@ -118,8 +118,7 @@ startupProbe:
   successThreshold: 1
 
 logging:
-  enabled: true
-  configMapName: fluent-bit-config
+  enabled: false
   trackFiles:
     errorLogs: true
     accessLogs: true