From cc02e50fc73a6365befa39fb24a355e205d5dcfa Mon Sep 17 00:00:00 2001
From: Alex Robinson <arob@google.com>
Date: Wed, 5 Aug 2015 00:22:38 +0000
Subject: [PATCH] Collect more of the VM's log files (monit, salt) in
 fluentd-es.

---
 .../fluentd-es-image/Makefile                    |  2 +-
 .../fluentd-es-image/td-agent.conf               | 16 ++++++++++++++++
 cluster/saltbase/salt/fluentd-es/fluentd-es.yaml |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index a6c745a452e..57f7c563a9c 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -1,7 +1,7 @@
 .PHONY:	build push
 
 IMAGE = fluentd-elasticsearch
-TAG = 1.7
+TAG = 1.8
 
 build:	
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
index 1c744faf0da..950c717851a 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -78,6 +78,22 @@
   tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
 </match>
 
+<source>
+  type tail
+  format none
+  path /varlog/monit.log
+  pos_file /varlog/gcp-monit.log.pos
+  tag monit
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/salt/minion
+  pos_file /varlog/gcp-salt.pos
+  tag salt
+</source>
+
 <source>
   type tail
   format none
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
index c758f431c86..a2075fd9278 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-elasticsearch
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.7
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.8
     resources:
       limits:
         cpu: 100m