Merge pull request #5529 from satnam6502/fluentd-gcp-image

cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest

@@ -2,7 +2,7 @@ version: v1beta2
 id: fluentd-to-gcp
 containers:
   - name: fluentd-gcp-container
-    image: kubernetes/fluentd-gcp:1.0
+    image: kubernetes/fluentd-gcp:1.1
     volumeMounts:
       - name: containers
         mountPath: /var/lib/docker/containers

contrib/logging/fluentd-gcp-image/Makefile

@@ -6,7 +6,7 @@
 .PHONY:	build push
 
 
-TAG = 1.0
+TAG = 1.1
 
 build:	
 	sudo docker build -t kubernetes/fluentd-gcp:$(TAG) .

contrib/logging/fluentd-gcp-image/google-fluentd.conf

@@ -19,10 +19,11 @@
   path /var/lib/docker/containers/*/*-json.log
   pos_file /var/lib/docker/containers/containers.log.pos
   time_format %Y-%m-%dT%H:%M:%S
-  tag docker.container.*
+  tag docker.*
+  read_from_head true
 </source>
 
-<match docker.container.**>
+<match docker.**>
   type google_cloud
   flush_interval 5s
   # Never wait longer than 5 minutes between retries.