From e52c3e77e2419c52b087358ef88b54bee2e1cecc Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Tue, 6 Dec 2016 21:50:12 +0100
Subject: [PATCH] Avoid exporting fluentd-gcp own logs

---
 .../addons/fluentd-gcp/fluentd-gcp-image/Makefile  |  2 +-
 .../addons/fluentd-gcp/fluentd-gcp-image/run.sh    |  2 +-
 cluster/log-dump.sh                                |  4 ++--
 cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 14 ++++++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index 400d8b22106..3465509479a 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -26,7 +26,7 @@
 .PHONY:	build push
 
 PREFIX=gcr.io/google_containers
-TAG = 1.29
+TAG = 1.30
 
 build:
 	docker build -t $(PREFIX)/fluentd-gcp:$(TAG) .
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh b/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
index 09f09508b72..c1ec1036d18 100755
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
@@ -26,4 +26,4 @@ fi
 LD_PRELOAD=/opt/td-agent/embedded/lib/libjemalloc.so
 RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0.9
 
-/usr/sbin/td-agent "$@"
+/usr/sbin/td-agent $@
diff --git a/cluster/log-dump.sh b/cluster/log-dump.sh
index 8ac0343f81f..7b93706b2dc 100755
--- a/cluster/log-dump.sh
+++ b/cluster/log-dump.sh
@@ -36,8 +36,8 @@ fi
 readonly master_ssh_supported_providers="gce aws kubemark"
 readonly node_ssh_supported_providers="gce gke aws"
 
-readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd glbc cluster-autoscaler kube-addon-manager"
-readonly node_logfiles="kube-proxy"
+readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd glbc cluster-autoscaler kube-addon-manager fluentd"
+readonly node_logfiles="kube-proxy fluentd"
 readonly aws_logfiles="cloud-init-output"
 readonly gce_logfiles="startupscript"
 readonly kern_logfile="kern"
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index 8ed611e7b94..d52441fbff4 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -11,7 +11,16 @@ spec:
   dnsPolicy: Default
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.29
+    image: gcr.io/google_containers/fluentd-gcp:1.30
+    # If fluentd consumes its own logs, the following situation may happen:
+    # fluentd fails to send a chunk to the server => writes it to the log =>
+    # tries to send this message to the server => fails to send a chunk and so on.
+    # Writing to a file, which is not exported to the back-end prevents it.
+    # It also allows to increase the fluentd verbosity by default.
+    command:
+      - '/bin/sh'
+      - '-c'
+      - '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log'
     resources:
       limits:
         memory: 200Mi
@@ -20,9 +29,6 @@ spec:
         # requests of other per-node add-ons (e.g. kube-proxy).
         cpu: 100m
         memory: 200Mi
-    env:
-    - name: FLUENTD_ARGS
-      value: -q
     volumeMounts:
     - name: varlog
       mountPath: /var/log