Skip to content

Commit

Permalink
Update to Elastic 7.0.1 (deviantony#382)
Browse files Browse the repository at this point in the history
  • Loading branch information
kg-ops authored and antoineco committed May 7, 2019
1 parent e8e238f commit 05e527c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ELK_VERSION=6.7.0
ELK_VERSION=7.0.1
2 changes: 1 addition & 1 deletion .travis/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ source .env
curl -X POST -D- 'http:https://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'
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -167,8 +167,8 @@ Create an index pattern via the Kibana API:
```console
$ curl -XPOST -D- 'http:https://localhost:5601/api/saved_objects/index-pattern' \
-H 'Content-Type: application/json' \
-H 'kbn-version: 6.7.0' \
-u kibana:<your generated kibana password> \
-H 'kbn-version: 7.0.1' \
-u elastic:<your generated elastic password> \
-d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}'
```

Expand Down
6 changes: 3 additions & 3 deletions docker-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions elasticsearch/config/elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
2 changes: 1 addition & 1 deletion logstash/config/logstash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:https://elasticsearch:9200
xpack.monitoring.elasticsearch.hosts: [ "http:https://elasticsearch:9200" ]

## X-Pack security credentials
#
Expand Down

0 comments on commit 05e527c

Please sign in to comment.