Move fluent bit output configureation to values file

Author: ilanRosenbaum

README.md

@@ -225,9 +225,9 @@ We recommend that you use the `values.yaml` file for configuring your installati
 
 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.
 
-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.
+In order to use the logs that are colleceted you must define an output in the outputs section of the values file. Fluent Bit will parse and output all the log files from each pod to the output(s) 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>
+For documentation on how to configure the Fluent Bit output with your logging backend see Fluent Bit's output documentation here: <https://docs.fluentbit.io/manual/pipeline/outputs>
 
 
 ## Adding and Removing Hosts from Clusters

charts/templates/configmap.yaml

@@ -82,17 +82,7 @@ data:
         Mem_Buf_Limit 4MB
       {{- end }}
 
-  outputs.conf: |
-      # Example output config for ElasticSearch output
-      # [OUTPUT]
-      #   Name es
-      #   Match *
-      #   Host {{ .Values.logCollection.host }}
-      #   Port {{ .Values.logCollection.port }}
-      #   HTTP_User {{ .Values.logCollection.username }}
-      #   HTTP_Passwd {{ .Values.logCollection.password }}
-      # Configure desired output below, documentation on how to set up output can be found here
-      # https://docs.fluentbit.io/manual/pipeline/outputs
+  outputs.conf: {{ toYaml .Values.logCollection.outputs | indent 2 }}
 
   filters.conf: |
       # Enrich Logs

charts/values.yaml

@@ -125,8 +125,14 @@ logCollection:
     requestLogs: true
     crashLogs: true
     auditLogs: true
-  # Example values for ElasticSearch output
-  # username: admin
-  # password: admin
-  # host: elasticsearch.default.svc.cluster.local
-  # port: 9200
+  outputs: |-
+      # Example output config for ElasticSearch output
+      # [OUTPUT]
+      #   Name es
+      #   Match *
+      #   Host elasticsearch.default.svc.cluster.local
+      #   Port 9200
+      #   HTTP_User admin
+      #   HTTP_Passwd admin
+      # Documentation on how to set up output can be found here: https://docs.fluentbit.io/manual/pipeline/outputs
+      # Configure desired output below