Merge pull request #45589 from ITSvitCo/master

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

@@ -19,7 +19,8 @@
 FROM java:openjdk-8-jre-alpine
 
 
-ENV ELASTICSEARCH_VERSION 2.4.1
+ENV DEBIAN_FRONTEND noninteractive
+ENV ELASTICSEARCH_VERSION 5.4.0
 
 RUN apk update && \
     apk --no-cache add \
@@ -33,7 +34,7 @@ RUN apk update && \
 RUN set -x \
     && cd / \
     && mkdir /elasticsearch \
-    && curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.tar.gz \
+    && curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.tar.gz \
     && tar xf elasticsearch-$ELASTICSEARCH_VERSION.tar.gz -C /elasticsearch --strip-components=1 \
     && rm elasticsearch-$ELASTICSEARCH_VERSION.tar.gz
 

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

@@ -16,7 +16,7 @@
 
 # The current value of the tag to be used for building and
 # pushing an image to gcr.io
-TAG = v2.4.1-3
+TAG = v5.4.0
 
 build:	elasticsearch_logging_discovery
 	docker build --pull -t gcr.io/google_containers/elasticsearch:$(TAG) .

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

@@ -12,4 +12,3 @@ path.data: /data
 network.host: 0.0.0.0
 
 discovery.zen.minimum_master_nodes: ${MINIMUM_MASTER_NODES}
-discovery.zen.ping.multicast.enabled: false

cluster/addons/fluentd-elasticsearch/es-image/config/log4j2.properties

+# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
+status = error
+
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
+
+rootLogger.level = info
+rootLogger.appenderRef.console.ref = console
+rootLogger.action = debug
+rootLogger.com.amazonaws = warn

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

-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console
-logger:
-  # log action execution errors for easier debugging
-  action: DEBUG
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
\ No newline at end of file

cluster/addons/fluentd-elasticsearch/es-image/run.sh

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+sysctl -w vm.max_map_count=262144
+
 export NODE_NAME=${NODE_NAME:-${HOSTNAME}}
 export NODE_MASTER=${NODE_MASTER:-true}
 export NODE_DATA=${NODE_DATA:-true}
@@ -25,4 +27,4 @@ export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2}
 
 chown -R elasticsearch:elasticsearch /data
 
-exec gosu elasticsearch /elasticsearch/bin/elasticsearch
+exec gosu elasticsearch sh /elasticsearch/bin/elasticsearch

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

@@ -19,7 +19,7 @@ FROM gcr.io/google_containers/ubuntu-slim:0.6
 
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV KIBANA_VERSION 4.6.1
+ENV KIBANA_VERSION 5.4.0
 
 RUN apt-get update \
     && apt-get install -y curl \
@@ -28,7 +28,7 @@ RUN apt-get update \
 RUN set -x \
     && cd / \
     && mkdir /kibana \
-    && curl -O https://download.elastic.co/kibana/kibana/kibana-$KIBANA_VERSION-linux-x86_64.tar.gz \
+    && curl -O https://artifacts.elastic.co/downloads/kibana/kibana-$KIBANA_VERSION-linux-x86_64.tar.gz \
     && tar xf kibana-$KIBANA_VERSION-linux-x86_64.tar.gz -C /kibana --strip-components=1 \
     && rm kibana-$KIBANA_VERSION-linux-x86_64.tar.gz
 

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

@@ -14,7 +14,7 @@
 
 .PHONY:	build push
 
-TAG = v4.6.1-1
+TAG = v5.4.0
 PREFIX = gcr.io/google_containers
 
 build:

cluster/addons/fluentd-elasticsearch/kibana-image/run.sh

@@ -20,5 +20,7 @@ echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
 export KIBANA_BASE_URL=${KIBANA_BASE_URL:-"''"}
 echo "server.basePath: ${KIBANA_BASE_URL}"
 echo "server.basePath: ${KIBANA_BASE_URL}" >> /kibana/config/kibana.yml
+echo "server.host: ${KIBANA_HOST}"
+echo "server.host: ${KIBANA_HOST}" >> /kibana/config/kibana.yml
 
 /kibana/bin/kibana -e ${ELASTICSEARCH_URL}