From 9e18c29e9f5d8489029a78921ca6d69c07455b16 Mon Sep 17 00:00:00 2001
From: Alex Robinson <arob@google.com>
Date: Thu, 30 Jul 2015 21:40:40 +0000
Subject: [PATCH] Make fluentd-gcp collect etcd's logs on the master.

---
 cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile     | 2 +-
 .../fluentd-gcp/fluentd-gcp-image/google-fluentd.conf     | 8 ++++++++
 cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml        | 2 +-
 docs/getting-started-guides/logging.md                    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index fae3f59ff7e..344ddda2123 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -15,7 +15,7 @@
 
 .PHONY:	kbuild kpush
 
-TAG = 1.9
+TAG = 1.10
 
 # Rules for building the test image for deployment to Dockerhub with user kubernetes.
 
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
index 4fb6cc30034..07b0f84d9d3 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -79,6 +79,14 @@
   tag docker
 </source>
 
+<source>
+  type tail
+  format none
+  path /varlog/etcd.log
+  pos_file /varlog/gcp-etcd.log.pos
+  tag etcd
+</source>
+
 <source>
   type tail
   format none
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index 2e8087f8e47..3073e62d320 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.9
+    image: gcr.io/google_containers/fluentd-gcp:1.10
     resources:
       limits:
         cpu: 100m
diff --git a/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md
index fabcbf93df8..12ea6749843 100644
--- a/docs/getting-started-guides/logging.md
+++ b/docs/getting-started-guides/logging.md
@@ -169,7 +169,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.9
+    image: gcr.io/google_containers/fluentd-gcp:1.10
     resources:
       limits:
         cpu: 100m