Merge pull request #12240 from a-robinson/logs

Also collect the monit and salt logs in our fluentd configs

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) .

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

cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile

@@ -15,7 +15,7 @@
 
 .PHONY:	kbuild kpush
 
-TAG = 1.10
+TAG = 1.11
 
 # Rules for building the test image for deployment to Dockerhub with user kubernetes.
 

cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf

@@ -63,6 +63,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

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

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.10
+    image: gcr.io/google_containers/fluentd-gcp:1.11
     resources:
       limits:
         cpu: 100m

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.10
+    image: gcr.io/google_containers/fluentd-gcp:1.11
     resources:
       limits:
         cpu: 100m