From fb5ff1341ee6639fd6b28e895ad57a0fda3da71e Mon Sep 17 00:00:00 2001
From: Daren Desjardins <darend@gmail.com>
Date: Thu, 26 Apr 2018 09:10:02 -0700
Subject: [PATCH] [stable/sumologic-fluentd] Allow the time_key field to be
 defined via environment variables (#4539)

* Allow the time_key field to be defined via environment variables

- The fluentd config for docker containers was hardcoded to use time as the name of the field but this is not a universal standard.

* Increase chart version and add appVersion

* Remove trailing space

* bump version to 0.4.0

* Upgrade to 1.9 release

* Update appVersion in chart to 1.9

* Upgrade to v1.10

* Upgrade sumologic-fluentd to 1.11

* Update appversion to 1.11

* Update readme

* Undo typo in readme
---
 stable/sumologic-fluentd/Chart.yaml               | 4 ++--
 stable/sumologic-fluentd/README.md                | 2 +-
 stable/sumologic-fluentd/templates/daemonset.yaml | 4 ++++
 stable/sumologic-fluentd/values.yaml              | 6 +++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/stable/sumologic-fluentd/Chart.yaml b/stable/sumologic-fluentd/Chart.yaml
index 51cc55a939..03da2fd9b4 100755
--- a/stable/sumologic-fluentd/Chart.yaml
+++ b/stable/sumologic-fluentd/Chart.yaml
@@ -1,6 +1,6 @@
 name: sumologic-fluentd
-version: 0.3.3
-appVersion: v1.6
+version: 0.4.0
+appVersion: 1.11
 description: Sumologic Log Collector
 keywords:
   - monitoring
diff --git a/stable/sumologic-fluentd/README.md b/stable/sumologic-fluentd/README.md
index b3aa3c5426..10037e6c00 100644
--- a/stable/sumologic-fluentd/README.md
+++ b/stable/sumologic-fluentd/README.md
@@ -89,7 +89,7 @@ The following tables lists the configurable parameters of the sumologic-fluentd
 | `sumologic.concatSeparator` | The character to use to delimit lines within the final concatenated message. Most multi-line messages contain a newline at the end of each line | `Nil` |
 | `sumologic.auditLogPath` | Define the path to the [Kubernetes Audit Log](https://kubernetes.io/docs/tasks/debug-application-cluster/audit/) | `/mnt/log/kube-apiserver-audit.log` |
 | `image.name` | The image repository and name to pull from | `sumologic/fluentd-kubernetes-sumologic` |
-| `image.tag` | The image tag to pull | `v1.6` |
+| `image.tag` | The image tag to pull | `v1.11` |
 | `image.pullPolicy` | Image pull policy | `IfNotPresent` |
 | `persistence.enabled` | Boolean value, used to turn on or off fluentd position file persistence, on nodes (requires Kubernetes >= 1.8) | `false` |
 | `persistence.hostPath` | The path, on each node, to a directory for fluentd pos files. You must create the directory on each node first or set `persistence.createPath` (requires Kubernetes >= 1.8) | `/var/run/fluentd-pos` |
diff --git a/stable/sumologic-fluentd/templates/daemonset.yaml b/stable/sumologic-fluentd/templates/daemonset.yaml
index 164816ab54..fa08ee42a8 100644
--- a/stable/sumologic-fluentd/templates/daemonset.yaml
+++ b/stable/sumologic-fluentd/templates/daemonset.yaml
@@ -139,6 +139,10 @@ spec:
             - name: FLUENTD_OPT
               value: {{ quote .Values.sumologic.fluentdOpt }}
             {{- end }}
+            {{- if quote .Values.sumologic.timeKey }}
+            - name: TIME_KEY
+              value: {{ quote .Values.sumologic.timeKey }}
+            {{- end }}
             {{- if quote .Values.sumologic.verifySsl }}
             - name: VERIFY_SSL
               value: {{ quote .Values.sumologic.verifySsl }}
diff --git a/stable/sumologic-fluentd/values.yaml b/stable/sumologic-fluentd/values.yaml
index 10f26b7ea1..6afa5970d0 100644
--- a/stable/sumologic-fluentd/values.yaml
+++ b/stable/sumologic-fluentd/values.yaml
@@ -1,7 +1,7 @@
 # Default values for sumologic-fluentd.
 image:
   name: sumologic/fluentd-kubernetes-sumologic
-  tag: v1.6
+  tag: v1.11
   pullPolicy: IfNotPresent
 
 ## Annotations to add to the DaemonSet's Pods
@@ -115,6 +115,10 @@ sumologic:
   ## ref: https://github.com/SumoLogic/fluentd-kubernetes-sumologic#options
   excludeUnitRegex: ""
 
+  ## The field name for json formatted sources that should be used as the time
+  ## ref: https://docs.fluentd.org/v0.12/articles/formatter_json#time_key-(string,-optional,-defaults-to-%E2%80%9Ctime%E2%80%9D)
+  # timeKey:
+
   ## Fluentd command line options
   ## ref: http://docs.fluentd.org/v0.12/articles/command-line-option
   fluentdOpt: ""