Issue 74 - add fluentd output logging format variable (#75)

Signed-off-by: Jared Burns <[email protected]>

charts/fluentd-elasticsearch/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fluentd-elasticsearch
-version: 11.10.0
+version: 11.11.0
 appVersion: 3.2.0
 type: application
 home: https://www.fluentd.org/

charts/fluentd-elasticsearch/README.md

@@ -70,7 +70,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `awsSigningSidecar.network.remoteReadTimeoutSeconds` | AWS Sidecar socket read timeout when talking to ElasticSearch | `15` |
 | `awsSigningSidecar.image.repository` | AWS signing sidecar repository image | `abutaha/aws-es-proxy` |
 | `awsSigningSidecar.image.tag` | AWS signing sidecar repository tag | `v1.0` |
-| `awsSigningSidecar.args` | Additional command-line arguments for the AWS signing sidecar container | `[]` |
+| `awsSigningSidecar.args` | Additional command-line arguments for the AWS signing sidecar container | `[]`  |
 | `elasticsearch.auth.enabled` | Elasticsearch Auth enabled | `false` |
 | `elasticsearch.auth.user` | Elasticsearch Auth User | `null` |
 | `elasticsearch.auth.password` | Elasticsearch Auth Password | `null` |
@@ -124,10 +124,11 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `elasticsearch.buffer.overflowAction` | Elasticsearch Buffer over flow action | `block` |
 | `env` | List of env vars that are added to the fluentd pods | `{}` |
 | `fluentdArgs` | Fluentd args | `--no-supervisor -q` |
+| `fluentdLogFormat` | Fluentd output log format in the default system.conf (either "text" or "json") | `text` |
 | `secret` | List of env vars that are set from secrets and added to the fluentd pods | `[]` |
 | `extraVolumeMounts` | Mount extra volume, required to mount ssl certificates when ES has tls enabled | `[]` |
 | `extraVolumes` | Extra volume | `[]` |
-| `fluentConfDir` | Specify where to mount fluentd location | `/etc/fluent/config.d`  |
+| `fluentConfDir` | Specify where to mount fluentd location | `/etc/fluent/config.d` |
 | `hostLogDir.varLog` | Specify where fluentd can find var log | `/var/log` |
 | `hostLogDir.dockerContainers` | Specify where fluentd can find logs for docker container | `/var/lib/docker/containers` |
 | `hostLogDir.libSystemdDir` | Specify where fluentd can find logs for lib Systemd | `/usr/lib64` |

charts/fluentd-elasticsearch/templates/configmaps.yaml

@@ -10,6 +10,9 @@ data:
  system.conf: |-
  <system>
  root_dir /tmp/fluentd-buffers/
+ <log>
+ format {{ .Values.fluentdLogFormat }}
+ </log>
  </system>
 {{- end }}
 

charts/fluentd-elasticsearch/values.yaml

@@ -151,6 +151,11 @@ elasticsearch:
 # by example you can add -vv to launch with trace log
 fluentdArgs: "--no-supervisor -q"
 
+# Specifies the output format of fluentd's own log messages. Set to
+# "json" to enable structured logging.
+# See https://docs.fluentd.org/deployment/logging#log-format
+fluentdLogFormat: "text"
+
 # If you want to add custom environment variables, use the env dict
 # You can then reference these in your config file e.g.:
 # user "#{ENV['OUTPUT_USER']}"