Update fluentd-es to collect etcd logs and remove merge conflict cruft.

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

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

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

@@ -94,20 +94,13 @@
   tag docker
 </source>
 
-<match kubernetes.**>
-   type elasticsearch
-   log_level info
-   include_tag_key true
-   host elasticsearch-logging
-   port 9200
-   logstash_format true
-   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>
->>>>>>> Move things into a 'kube-system' namespace.
+<source>
+  type tail
+  format none
+  path /varlog/etcd.log
+  pos_file /varlog/es-etcd.log.pos
+  tag etcd
+</source>
 
 <source>
   type tail