Merge branch 'master' of http://git.hudongtang.cn/chenhuan/docker

docker-elk-7.5.1/docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "9209:9200"
       - "9300:9300"
     environment:
-      ES_JAVA_OPTS: "-Xmx256m -Xms256m"
+      ES_JAVA_OPTS: "-Xmx2256m -Xms2256m"
       ELASTIC_PASSWORD: hudongtang2020
       # Use single node discovery in order to disable production mode and avoid bootstrap checks.
       # see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html

docker-elk-7.5.1/kibana/config/kibana.yml

@@ -5,7 +5,10 @@
 server.name: kibana
 server.host: 0.0.0.0
 elasticsearch.hosts: [ "http://elasticsearch:9200" ]
-monitoring.ui.container.elasticsearch.enabled: true
+xpack.monitoring.ui.container.elasticsearch.enabled: true
+i18n.locale: "zh-CN"
+
+
 
 ## X-Pack security credentials
 #