fluentd-cloudwatch: Fix Fluentd hanging

fluent/fluentd#1630
mfornasa · May 17, 2018 · f519660 · f519660
1 parent 2720cd8
commit f519660
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/incubator/fluentd-cloudwatch/Chart.yaml b/incubator/fluentd-cloudwatch/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluentd-cloudwatch
-version: 0.2.3
+version: 0.2.4
 appVersion: 0.1.1
 description: A Fluentd CloudWatch Helm chart for Kubernetes.
 icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png

diff --git a/incubator/fluentd-cloudwatch/values.yaml b/incubator/fluentd-cloudwatch/values.yaml
@@ -46,6 +46,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     path /var/log/containers/*.log
     pos_file /var/log/fluentd-containers.log.pos
     time_format %Y-%m-%dT%H:%M:%S.%NZ
@@ -56,6 +57,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
     time_format %Y-%m-%d %H:%M:%S
     path /var/log/salt/minion
@@ -65,6 +67,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format syslog
     path /var/log/startupscript.log
     pos_file /var/log/fluentd-startupscript.log.pos
@@ -73,6 +76,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
     path /var/log/docker.log
     pos_file /var/log/fluentd-docker.log.pos
@@ -81,6 +85,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format none
     path /var/log/etcd.log
     pos_file /var/log/fluentd-etcd.log.pos
@@ -89,6 +94,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/kubelet.log
@@ -98,6 +104,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/kube-proxy.log
@@ -107,6 +114,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/kube-apiserver.log
@@ -116,6 +124,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/kube-controller-manager.log
@@ -125,6 +134,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/kube-scheduler.log
@@ -134,6 +144,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/rescheduler.log
@@ -143,6 +154,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/glbc.log
@@ -152,6 +164,7 @@ fluentdConfig: |
 
   <source>
     type tail
+    enable_stat_watcher false
     format kubernetes
     multiline_flush_interval 5s
     path /var/log/cluster-autoscaler.log