update fluentd to fix output plugins (#119)

charts/fluentd-aggregator/latest/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Fluentd Aggregator Helm chart Continuously Receive Events From The Log Forwarders.
 icon: https://www.fluentd.org/assets/img/miscellany/fluentd-logo.png
 name: fluentd-aggregator
-version: 0.2.0
+version: 0.2.1
 appVersion: v2.3.1
 home: https://www.fluentd.org/
 sources:

charts/fluentd-aggregator/latest/questions.yml

@@ -106,7 +106,7 @@ questions:
     - "%Y."
 - variable: env.OUTPUT_SPLUNK_HOST
   default: ""
-  description: "e.g. https://192.168.1.10"
+  description: "e.g. 192.168.1.10"
   type: string
   label: Splunk Endpoint
   required: true
@@ -120,6 +120,14 @@ questions:
   required: true
   group: "Output Configs"
   show_if: "output.type=splunk_hec"
+- variable: env.OUTPUT_SPLUNK_TOKEN
+  default: ""
+  description: "Tokens are entities that let logging agents and HTTP clients connect to the HEC input"
+  type: string
+  label: Splunk Token
+  required: true
+  group: "Output Configs"
+  show_if: "output.type=splunk_hec"
 - variable: env.OUTPUT_SPLUNK_SOURCE_TYPE
   default: ""
   description: "A default field that identifies the source of an event, that is, where the event originated"
@@ -264,19 +272,19 @@ questions:
 # fluentd configs
 - variable: configMaps.filter\.conf
   default: ""
-  description: "fluentd filter config"
+  description: "fluentd filter config, https://docs.fluentd.org/v1.0/articles/filter-plugin-overview"
   type: multiline
   label: Fluentd Filter Config
   group: "Filter Configs"
 - variable: configMaps.parser\.conf
   default: ""
-  description: "fluentd parser config"
+  description: "fluentd parser config, https://docs.fluentd.org/v1.0/articles/parser-plugin-overview"
   type: multiline
   label: Fluentd Parser Config
   group: "Fluentd Parser Configs"
 - variable: configMaps.formatter\.conf
   default: ""
-  description: "fluentd formatter config"
+  description: "fluentd formatter config, https://docs.fluentd.org/v1.0/articles/formatter-plugin-overview"
   type: multiline
   label: Fluentd Formatter Config
   group: "Formatter Configs"

charts/fluentd-aggregator/latest/templates/configmap.yaml

@@ -16,8 +16,11 @@ data:
 {{- end }}
 
   output.conf: |-
-    {{- if eq .Values.output.type "elasticsearch" }}
+    {{- if eq .Values.output.type "custom" }}
+{{ .Values.output.customConf | indent 4 }}
+    {{- else }}
     <match **>
+    {{- if eq .Values.output.type "elasticsearch" }}
       @type elasticsearch
       @log_level info
       include_tag_key true
@@ -100,7 +103,7 @@ data:
       # ssl parameter
       # use_ssl true
       # ca_file /path/to/ca.pem
-
+    {{- end }}
       # fluentd file buffer config
       <buffer>
         @type file
@@ -117,7 +120,3 @@ data:
       </buffer>
     </match>
     {{- end }}
-
-    {{- if eq .Values.output.type "custom" }}
-{{ .Values.output.customConf | indent 4 }}
-    {{- end }}