Merge pull request #5218 from satnam6502/fluentd-es

Change Fluentd config to read from head of Docker container logs

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile

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

cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf

@@ -40,10 +40,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 elasticsearch
    log_level info
    include_tag_key true

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

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