Keep container log timestamps (#38)

* Keep container log timestamps Signed-off-by: Guillermo Rodriguez <[email protected]> * Increase minor version of the chart Signed-off-by: Guillermo Rodriguez <[email protected]> * Update Chart.yaml Co-authored-by: André Bauer <[email protected]>
kokuwaio · Dec 8, 2020 · 18d1b5d · 18d1b5d
1 parent 698d207
commit 18d1b5d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fluentd-elasticsearch
-version: 11.2.0
+version: 11.3.0
 appVersion: 3.1.0
 type: application
 home: https://www.fluentd.org/

diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md
@@ -57,6 +57,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `podAnnotations` | Optional daemonset's pods annotations | `NULL` |
 | `configMaps.useDefaults.systemConf` | Use default system.conf | `true` |
 | `configMaps.useDefaults.containersInputConf` | Use default containers.input.conf | `true` |
+| `configMaps.useDefaults.containersKeepTimeKey` | Keep the container log timestamp as part of the log data. | `false` |
 | `configMaps.useDefaults.systemInputConf` | Use default system.input.conf | `true` |
 | `configMaps.useDefaults.forwardInputConf` | Use default forward.input.conf | `true` |
 | `configMaps.useDefaults.monitoringConf` | Use default monitoring.conf | `true` |

diff --git a/charts/fluentd-elasticsearch/templates/configmaps.yaml b/charts/fluentd-elasticsearch/templates/configmaps.yaml
@@ -125,10 +125,16 @@ data:
  format json
  time_key time
  time_format %Y-%m-%dT%H:%M:%S.%NZ
+{{- if .Values.configMaps.useDefaults.containersKeepTimeKey }}
+ keep_time_key true
+{{- end }} 
  </pattern>
  <pattern>
  format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
  time_format %Y-%m-%dT%H:%M:%S.%N%:z
+{{- if .Values.configMaps.useDefaults.containersKeepTimeKey }}
+ keep_time_key true
+{{- end }} 
  </pattern>
  </parse>
  </source>

diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml
@@ -282,6 +282,9 @@ configMaps:
  useDefaults:
  systemConf: true
  containersInputConf: true
+ ## Set containersKeepTimeKey to true to keep the kubernetes container log timestamp as part of the log message
+ ## Read keep_time_key at https://docs.fluentd.org/configuration/parse-section
+ containersKeepTimeKey: false
  systemInputConf: true
  forwardInputConf: true
  monitoringConf: true