From 02a38ac1428cb84c7def5ccfe5bd16019b8af7a3 Mon Sep 17 00:00:00 2001 From: Kshitij Gupta Date: Tue, 7 May 2019 01:49:19 -0700 Subject: [PATCH] Update to Elastic 7.0.1 (#382) --- .travis/run-tests.sh | 2 +- README.md | 6 +++--- docker-stack.yml | 6 +++--- elasticsearch/config/elasticsearch.yml | 5 ----- logstash/config/logstash.yml | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh index 018d2a631f..88ac1c4526 100755 --- a/.travis/run-tests.sh +++ b/.travis/run-tests.sh @@ -35,7 +35,7 @@ source .env curl -X POST -D- 'http://localhost:5601/api/saved_objects/index-pattern' \ -H 'Content-Type: application/json' \ -H "kbn-version: ${ELK_VERSION}" \ - -u kibana:changeme \ + -u elastic:changeme \ -d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}' log 'Searching index pattern via Kibana API' diff --git a/README.md b/README.md index ae2169bbe9..5a29094819 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Elastic stack (ELK) on Docker [![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-6.7.0-blue.svg?style=flat)](https://github.com/deviantony/docker-elk/issues/376) +[![Elastic Stack version](https://img.shields.io/badge/ELK-7.0.1-blue.svg?style=flat)](https://github.com/deviantony/docker-elk/issues/382) [![Build Status](https://api.travis-ci.org/deviantony/docker-elk.svg?branch=master)](https://travis-ci.org/deviantony/docker-elk) Run the latest version of the [Elastic stack][elk-stack] with Docker and Docker Compose. @@ -167,8 +167,8 @@ Create an index pattern via the Kibana API: ```console $ curl -XPOST -D- 'http://localhost:5601/api/saved_objects/index-pattern' \ -H 'Content-Type: application/json' \ - -H 'kbn-version: 6.7.0' \ - -u kibana: \ + -H 'kbn-version: 7.0.1' \ + -u elastic: \ -d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}' ``` diff --git a/docker-stack.yml b/docker-stack.yml index af07dc401d..bf467f31b6 100644 --- a/docker-stack.yml +++ b/docker-stack.yml @@ -3,7 +3,7 @@ version: '3.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:6.7.0 + image: docker.elastic.co/elasticsearch/elasticsearch:7.0.1 ports: - "9200:9200" - "9300:9300" @@ -20,7 +20,7 @@ services: replicas: 1 logstash: - image: docker.elastic.co/logstash/logstash:6.7.0 + image: docker.elastic.co/logstash/logstash:7.0.1 ports: - "5000:5000" - "9600:9600" @@ -38,7 +38,7 @@ services: replicas: 1 kibana: - image: docker.elastic.co/kibana/kibana:6.7.0 + image: docker.elastic.co/kibana/kibana:7.0.1 ports: - "5601:5601" configs: diff --git a/elasticsearch/config/elasticsearch.yml b/elasticsearch/config/elasticsearch.yml index e3a392e129..a736834936 100644 --- a/elasticsearch/config/elasticsearch.yml +++ b/elasticsearch/config/elasticsearch.yml @@ -5,11 +5,6 @@ cluster.name: "docker-cluster" network.host: 0.0.0.0 -# minimum_master_nodes need to be explicitly set when bound on a public IP -# set to 1 to allow single node clusters -# Details: https://github.com/elastic/elasticsearch/pull/17288 -discovery.zen.minimum_master_nodes: 1 - ## 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 # diff --git a/logstash/config/logstash.yml b/logstash/config/logstash.yml index c8e1713ca1..520dbec65d 100644 --- a/logstash/config/logstash.yml +++ b/logstash/config/logstash.yml @@ -3,7 +3,7 @@ ## from https://github.com/elastic/logstash-docker/blob/master/build/logstash/config/logstash-full.yml # http.host: "0.0.0.0" -xpack.monitoring.elasticsearch.url: http://elasticsearch:9200 +xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ] ## X-Pack security credentials #