Update version to 6.1.0 (#212)

Includes changes from #196

.travis.yml

@@ -28,8 +28,8 @@ script:
   - docker-compose up -d
 
   # Verifications
-  - sleep 4m
+  - sleep 30
   - docker-compose exec -T elasticsearch bin/init_sg.sh
   - docker-compose logs
-  - curl --retry 10 --retry-delay 5 -v http://localhost:9200/ -u kibanaserver:kibanaserver
-  - curl --retry 10 --retry-delay 5 -v http://localhost:5601/
+  - curl --retry 10 --retry-delay 5 -D- http://localhost:9200/ -u kibanaserver:kibanaserver
+  - curl --retry 10 --retry-delay 5 -I http://localhost:5601/

README.md

 # Docker ELK stack
 
 [![Join the chat at https://gitter.im/deviantony/docker-elk](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/deviantony/docker-elk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Elastic Stack version](https://img.shields.io/badge/ELK-5.6.3-blue.svg?style=flat)](https://github.com/deviantony/docker-elk/issues/182)
+[![Elastic Stack version](https://img.shields.io/badge/ELK-6.0.0-blue.svg?style=flat)](https://github.com/deviantony/docker-elk/issues/212)
 [![Build Status](https://api.travis-ci.org/deviantony/docker-elk.svg?branch=searchguard)](https://travis-ci.org/deviantony/docker-elk)
 
 Run the latest version of the ELK (Elasticsearch, Logstash, Kibana) stack with Docker and Docker Compose.
@@ -95,7 +95,7 @@ $ docker-compose exec -T elasticsearch bin/init_sg.sh
 
 _This executes sgadmin and loads the configuration from `elasticsearch/config/sg*.yml`_
 
-Give Kibana about 2 minutes to initialize, then access the Kibana web UI by hitting
+Give Kibana a few seconds to initialize, then access the Kibana web UI by hitting
 [http://localhost:5601](http://localhost:5601) with a web browser and use the aforementioned credentials to login.
 
 By default, the stack exposes the following ports:
@@ -136,20 +136,13 @@ about the index pattern configuration.
 Run this command to create a Kibana index pattern:
 
 ```console
-$ curl -XPUT -D- 'http://localhost:9200/.kibana/index-pattern/logstash-*' \
+$ curl -XPUT -D- 'http://localhost:9200/.kibana/doc/index-pattern:docker-elk' \
     -H 'Content-Type: application/json' \
     -u kibanaserver:kibanaserver \
-    -d '{"title" : "logstash-*", "timeFieldName": "@timestamp", "notExpandable": true}'
+    -d '{"type": "index-pattern", "index-pattern": {"title": "logstash-*", "timeFieldName": "@timestamp"}}'
 ```
 
-This command will mark the Logstash index pattern as the default index pattern:
-
-```console
-$ curl -XPUT -D- 'http://localhost:9200/.kibana/config/5.6.3' \
-    -H 'Content-Type: application/json' \
-    -u kibanaserver:kibanaserver \
-    -d '{"defaultIndex": "logstash-*"}'
-```
+This will automatically be marked as the default index pattern as soon as the Kibana UI is opened for the first time.
 
 ## Configuration
 

elasticsearch/Dockerfile

 # https://github.com/elastic/elasticsearch-docker
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.3
+FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.0
 
 COPY config/ config/
 COPY bin/ bin/
 
 # Search Guard plugin
 # https://github.com/floragunncom/search-guard/wiki
-RUN elasticsearch-plugin install --batch com.floragunn:search-guard-5:5.6.3-16 \
+RUN elasticsearch-plugin install --batch com.floragunn:search-guard-6:6.1.0-20.1 \
 	&& chmod +x \
-		plugins/search-guard-5/tools/hash.sh \
-		plugins/search-guard-5/tools/sgadmin.sh
+		plugins/search-guard-6/tools/hash.sh \
+		plugins/search-guard-6/tools/sgadmin.sh
 
 # Add your elasticsearch plugins setup here
 # Example: RUN elasticsearch-plugin install analysis-icu

elasticsearch/bin/init_sg.sh

 #!/bin/sh
-plugins/search-guard-5/tools/sgadmin.sh -cd config/ -ts config/truststore.jks -ks config/kirk-keystore.jks -nhnv -icl
+plugins/search-guard-6/tools/sgadmin.sh \
+	-cd config/ \
+	-ts config/truststore.jks \
+	-ks config/kirk-keystore.jks \
+	-nhnv \
+	-icl

elasticsearch/config/elasticsearch.yml

@@ -15,18 +15,10 @@ discovery.zen.minimum_master_nodes: 1
 #
 discovery.type: single-node
 
-## Disable X-Pack
-## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
-##     https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
-#
-xpack.security.enabled: false
-xpack.monitoring.enabled: false
-xpack.ml.enabled: false
-xpack.graph.enabled: false
-xpack.watcher.enabled: false
-
 ## Search Guard
 #
+searchguard.enterprise_modules_enabled: false
+
 searchguard.ssl.transport.keystore_filepath: node-0-keystore.jks
 searchguard.ssl.transport.truststore_filepath: truststore.jks
 searchguard.ssl.transport.enforce_hostname_verification: false

kibana/Dockerfile

 # https://github.com/elastic/kibana-docker
-FROM docker.elastic.co/kibana/kibana:5.6.3
+FROM docker.elastic.co/kibana/kibana-oss:6.1.0
 
 # Search Guard plugin
 # https://github.com/floragunncom/search-guard-docs/blob/master/kibana.md
-RUN kibana-plugin install https://github.com/floragunncom/search-guard-kibana-plugin/releases/download/v5.6.3-4/searchguard-kibana-5.6.3-4.zip
+RUN kibana-plugin install https://repo1.maven.org/maven2/com/floragunn/search-guard-kibana-plugin/6.1.0-8/search-guard-kibana-plugin-6.1.0-8.zip
 
 # Add your kibana plugins setup here
 # Example: RUN kibana-plugin install <name|url>

kibana/config/kibana.yml

@@ -6,16 +6,6 @@ server.name: kibana
 server.host: "0"
 elasticsearch.url: http://elasticsearch:9200
 
-## Disable X-Pack
-## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
-##     https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
-#
-xpack.security.enabled: false
-xpack.monitoring.enabled: false
-xpack.ml.enabled: false
-xpack.graph.enabled: false
-xpack.reporting.enabled: false
-
 ## Custom configuration
 #
 elasticsearch.username: "kibanaserver"

logstash/Dockerfile

 # https://github.com/elastic/logstash-docker
-FROM docker.elastic.co/logstash/logstash:5.6.3
+FROM docker.elastic.co/logstash/logstash-oss:6.1.0
 
 # Add your logstash plugins setup here
 # Example: RUN logstash-plugin install logstash-filter-json

logstash/config/logstash.yml

@@ -4,9 +4,3 @@
 #
 http.host: "0.0.0.0"
 path.config: /usr/share/logstash/pipeline
-
-## Disable X-Pack
-## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
-##     https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
-#
-xpack.monitoring.enabled: false