From 63371a6d0736dc5d9efc2b8e7665b1bca2ddd150 Mon Sep 17 00:00:00 2001
From: Frank Reno <frank.reno@me.com>
Date: Mon, 25 Jun 2018 13:10:32 -0600
Subject: [PATCH] [sumologic-fluentd] Update to latest image and expose new
 configuration to control stat watcher on fluentD in_tail plugins. (#6304)

* upgrade to latest image (v1.15).  Add configuration for new properties.

* Bump minor version for new feature

* update to latest image (v1.16) and add support for new configuration to control the enabling/disabling of stat watcher on in_tail configuration.

* Bump minor version for new feature
---
 stable/sumologic-fluentd/Chart.yaml               | 4 ++--
 stable/sumologic-fluentd/README.md                | 6 +++++-
 stable/sumologic-fluentd/templates/daemonset.yaml | 4 ++++
 stable/sumologic-fluentd/values.yaml              | 6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/stable/sumologic-fluentd/Chart.yaml b/stable/sumologic-fluentd/Chart.yaml
index 0176680209..b589d94cd9 100755
--- a/stable/sumologic-fluentd/Chart.yaml
+++ b/stable/sumologic-fluentd/Chart.yaml
@@ -1,6 +1,6 @@
 name: sumologic-fluentd
-version: 0.5.0
-appVersion: 1.15
+version: 0.6.0
+appVersion: 1.16
 description: Sumologic Log Collector
 keywords:
   - monitoring
diff --git a/stable/sumologic-fluentd/README.md b/stable/sumologic-fluentd/README.md
index 68adf810e9..d09fd75d7f 100644
--- a/stable/sumologic-fluentd/README.md
+++ b/stable/sumologic-fluentd/README.md
@@ -92,8 +92,9 @@ The following table lists the configurable parameters of the sumologic-fluentd c
 | `sumologic.addTimeStamp` | Option to control adding timestamp to logs. | `true`
 | `sumologic.containerLogsPath` | Specify the path in_tail should watch for container logs. | `/mnt/log/containers/*.log`
 | `sumologic.proxyUri` | Add the uri of the proxy environment if present. | `Nil`
+| `sumologic.enableStatWatcher` | Option to control the enabling of [stat_watcher](https://docs.fluentd.org/v1.0/articles/in_tail#enable_stat_watcher). | `true`
 | `image.name` | The image repository and name to pull from | `sumologic/fluentd-kubernetes-sumologic` |
-| `image.tag` | The image tag to pull | `v1.15` |
+| `image.tag` | The image tag to pull | `v1.16` |
 | `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` |
@@ -246,3 +247,6 @@ spec:
         ports:
         - containerPort: 80
 ```
+
+### FluentD stops processing logs
+When dealing with large volumes of data (TB's from what we have seen), FluentD may stop processing logs, but continue to run.  This issue seems to be caused by the [scalability of the inotify process](https://github.com/fluent/fluentd/issues/1630) that is packaged with the FluentD in_tail plugin.  If you encounter this situation, setting the `ENABLE_STAT_WATCHER` to `false` should resolve this issue.
\ No newline at end of file
diff --git a/stable/sumologic-fluentd/templates/daemonset.yaml b/stable/sumologic-fluentd/templates/daemonset.yaml
index abbeba47f6..c3124613c3 100644
--- a/stable/sumologic-fluentd/templates/daemonset.yaml
+++ b/stable/sumologic-fluentd/templates/daemonset.yaml
@@ -175,6 +175,10 @@ spec:
             - name: PROXY_URI
               value: {{ quote .Values.sumologic.proxyUri }}
             {{- end }}
+            {{- if .Values.sumologic.enableStatWatcher }}
+            - name: ENABLE_STAT_WATCHER
+              value: {{ quote .Values.sumologic.enableStatWatcher }}
+            {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "sumologic-fluentd.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       volumes:
         - name: pos-files
diff --git a/stable/sumologic-fluentd/values.yaml b/stable/sumologic-fluentd/values.yaml
index c647353062..27a7c3e6bb 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.15
+  tag: v1.16
   pullPolicy: IfNotPresent
 
 ## Annotations to add to the DaemonSet's Pods
@@ -125,6 +125,10 @@ sumologic:
   ## Add the uri of the proxy environment if present.
   # proxyUri:
 
+  ## Option to control the enabling of stat_watcher. (Default true)
+  ## ref: https://docs.fluentd.org/v1.0/articles/in_tail#enable_stat_watcher
+  # enableStatWatcher:
+
   ## Option to control adding timestamp to logs. (Default true)
   addTimeStamp: true