Configure fluentd to collect additional log files, including master log files.

This also merges the output blocks together because there's no compelling
reason to have a separate output block for each input.

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

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

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

@@ -63,25 +63,55 @@
   tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
 </match>
 
-<match kubernetes.**>
-  type google_cloud
-  flush_interval 5s
-  # Never wait longer than 5 minutes between retries.
-  max_retry_wait 300
-  # Disable the limit on the number of retries (retry forever).
-  disable_retry_limit
-</match>
+<source>
+  type tail
+  format none
+  path /varlog/startupscript.log
+  pos_file /varlog/gcp-startupscript.log.pos
+  tag startupscript
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/docker.log
+  pos_file /varlog/gcp-docker.log.pos
+  tag docker
+</source>
 
 <source>
   type tail
   format none
-  time_key time
   path /varlog/kubelet.log
   pos_file /varlog/gcp-kubelet.log.pos
   tag kubelet
 </source>
 
-<match kubelet>
+<source>
+  type tail
+  format none
+  path /varlog/kube-apiserver.log
+  pos_file /varlog/gcp-kube-apiserver.log.pos
+  tag kube-apiserver
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/kube-controller-manager.log
+  pos_file /varlog/gcp-kube-controller-manager.log.pos
+  tag kube-controller-manager
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/kube-scheduler.log
+  pos_file /varlog/gcp-kube-scheduler.log.pos
+  tag kube-scheduler
+</source>
+
+<match **>
   type google_cloud
   flush_interval 5s
   # Never wait longer than 5 minutes between retries.