Merge pull request #7455 from satnam6502/es-image

Upgrade Elasticsearch to 1.5.2 for cluster logging

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

@@ -12,16 +12,17 @@ RUN apt-get update && \
     apt-get clean
 
 RUN cd / && \
-    curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.tar.gz && \
-    tar xf elasticsearch-1.4.4.tar.gz && \
-    mv elasticsearch-1.4.4 /elasticsearch && \
-    rm -rf elasticsearch-1.4.4.tar.gz
+    curl -O https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.5.2.tar.gz && \
+    tar xf elasticsearch-1.5.2.tar.gz && \
+    mv elasticsearch-1.5.2 /elasticsearch && \
+    rm elasticsearch-1.5.2.tar.gz
 
 ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml
 
 VOLUME ["/data"]
 WORKDIR /data
-CMD ["/elasticsearch/bin/elasticsearch"]
 
 EXPOSE 9200
 EXPOSE 9300
+
+CMD ["/elasticsearch/bin/elasticsearch"]

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

@@ -1,9 +1,9 @@
 .PHONY:	build push
 
-TAG = 1.0
+TAG = 1.1
 
 build:	
 	docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .
 
 push:	
-	docker push gcr.io/google_containers/elasticsearch:$(TAG)
+	gcloud preview docker push gcr.io/google_containers/elasticsearch:$(TAG)

cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml

@@ -1,7 +1,8 @@
-path:
-  data: /data/data
-  logs: /data/log
-  plugins: /data/plugins
-  work: /data/work
-cluster:
-  name: kubernetes_logging
+# These are the Kubernetes-specific settings that differ
+# from the default values.
+cluster.name: kubernetes_logging
+
+path.data: /data/data
+path.work: /data/work
+path.logs: /data/logs
+path.plugins: /data/plugins