Merge pull request #7123 from satnam6502/logging

Propagate pod and container name for log files

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

@@ -1,7 +1,7 @@
 .PHONY:	build push
 
 IMAGE = fluentd-elasticsearch
-TAG = 1.3
+TAG = 1.4
 
 build:	
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .

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

@@ -37,14 +37,14 @@
   type tail
   format json
   time_key time
-  path /var/lib/docker/containers/*/*-json.log
-  pos_file /var/lib/docker/containers/es-containers.log.pos
+  path /varlog/containers/*.log
+  pos_file /varlog/es-containers.log.pos
   time_format %Y-%m-%dT%H:%M:%S
-  tag docker.*
+  tag kubernetes.*
   read_from_head true
 </source>
 
-<match docker.**>
+<match kubernetes.**>
    type elasticsearch
    log_level info
    include_tag_key true