From 80f3591acb1532a33478954ae748a6ccbf280a59 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Thu, 15 Oct 2020 15:22:05 +0200 Subject: [PATCH] Update to v8.0.0-SNAPSHOT *Warning* Logstash's Elasticsearch output has ecs_compatibility set to v1 by default. Without it, Logstash now prints the following warning message: [deprecation.logstash.outputs.elasticsearch] Relying on default value of `pipeline.ecs_compatibility`, which may change in a future major release of Logstash. To avoid unexpected changes when upgrading Logstash, please explicitly declare your desired ECS Compatibility mode. --- .env | 2 +- .github/workflows/scripts/run-tests-core.sh | 2 +- README.md | 14 +++++++------- docker-stack.yml | 6 +++--- kibana/config/kibana.yml | 2 +- logstash/pipeline/logstash.conf | 1 + 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.env b/.env index 084008c13d..691fb4194a 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -ELK_VERSION=7.9.2 +ELK_VERSION=8.0.0-SNAPSHOT diff --git a/.github/workflows/scripts/run-tests-core.sh b/.github/workflows/scripts/run-tests-core.sh index f4ffd90c93..d0564e3fd5 100755 --- a/.github/workflows/scripts/run-tests-core.sh +++ b/.github/workflows/scripts/run-tests-core.sh @@ -36,7 +36,7 @@ curl -X POST -D- "http://${ip_kb}:5601/api/saved_objects/index-pattern" \ -H 'Content-Type: application/json' \ -H "kbn-version: ${ELK_VERSION}" \ -u elastic:testpasswd \ - -d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}' + -d '{"attributes":{"title":"ecs-logstash-*","timeFieldName":"@timestamp"}}' log 'Searching index pattern via Kibana API' response="$(curl "http://${ip_kb}:5601/api/saved_objects/_find?type=index-pattern" -s -u elastic:testpasswd)" diff --git a/README.md b/README.md index 843f4eda7d..0d64133eef 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-7.9.2-blue.svg?style=flat)](https://github.com/deviantony/docker-elk/issues/539) +[![Elastic Stack version](https://img.shields.io/badge/ELK-8.0.0-blue.svg?style=flat)](https://github.com/deviantony/docker-elk/issues/543) [![Build Status](https://github.com/deviantony/docker-elk/workflows/CI/badge.svg?branch=master)](https://github.com/deviantony/docker-elk/actions?query=workflow%3ACI+branch%3Amaster) Run the latest version of the [Elastic stack][elk-stack] with Docker and Docker Compose. @@ -104,7 +104,7 @@ exclusively. Make sure the repository is cloned in one of those locations or fol ### Version selection This repository tries to stay aligned with the latest version of the Elastic stack. The `master` branch tracks the -current major version (7.x). +current major version (8.x). To use a different version of the core Elastic components, simply change the version number inside the `.env` file. If you are upgrading an existing stack, please carefully read the note in the next section. @@ -114,6 +114,7 @@ performing a stack upgrade.** Older major versions are also supported on separate branches: +* [`release-7.x`](https://github.com/deviantony/docker-elk/tree/release-7.x): 7.x series * [`release-6.x`](https://github.com/deviantony/docker-elk/tree/release-6.x): 6.x series * [`release-5.x`](https://github.com/deviantony/docker-elk/tree/release-5.x): 5.x series (End-Of-Life) @@ -171,9 +172,8 @@ Remove the `ELASTIC_PASSWORD` environment variable from the `elasticsearch` serv 3. Replace usernames and passwords in configuration files -Use the `kibana_system` user (`kibana` for releases <7.8.0) inside the Kibana configuration file -(`kibana/config/kibana.yml`) and the `logstash_system` user inside the Logstash configuration file -(`logstash/config/logstash.yml`) in place of the existing `elastic` user. +Use the `kibana_system` user inside the Kibana configuration file (`kibana/config/kibana.yml`) and the `logstash_system` +user inside the Logstash configuration file (`logstash/config/logstash.yml`) in place of the existing `elastic` user. Replace the password for the `elastic` user inside the Logstash pipeline file (`logstash/pipeline/logstash.conf`). @@ -239,9 +239,9 @@ 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: 7.9.2' \ + -H 'kbn-version: 8.0.0-SNAPSHOT' \ -u elastic: \ - -d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}' + -d '{"attributes":{"title":"ecs-logstash-*","timeFieldName":"@timestamp"}}' ``` The created pattern will automatically be marked as the default index pattern as soon as the Kibana UI is opened for the diff --git a/docker-stack.yml b/docker-stack.yml index ead164937c..ea272dec73 100644 --- a/docker-stack.yml +++ b/docker-stack.yml @@ -3,7 +3,7 @@ version: '3.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2 + image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-SNAPSHOT ports: - "9200:9200" - "9300:9300" @@ -25,7 +25,7 @@ services: replicas: 1 logstash: - image: docker.elastic.co/logstash/logstash:7.9.2 + image: docker.elastic.co/logstash/logstash:8.0.0-SNAPSHOT ports: - "5000:5000" - "9600:9600" @@ -43,7 +43,7 @@ services: replicas: 1 kibana: - image: docker.elastic.co/kibana/kibana:7.9.2 + image: docker.elastic.co/kibana/kibana:8.0.0-SNAPSHOT ports: - "5601:5601" configs: diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml index 5c09ec29cf..0e1dc60c54 100644 --- a/kibana/config/kibana.yml +++ b/kibana/config/kibana.yml @@ -1,6 +1,6 @@ --- ## Default Kibana configuration from Kibana base image. -## https://github.com/elastic/kibana/blob/master/src/dev/build/tasks/os_packages/docker_generator/templates/kibana_yml.template.js +## https://github.com/elastic/kibana/blob/master/src/dev/build/tasks/os_packages/docker_generator/templates/kibana_yml.template.ts # server.name: kibana server.host: 0.0.0.0 diff --git a/logstash/pipeline/logstash.conf b/logstash/pipeline/logstash.conf index 14c76f8579..5240d3984c 100644 --- a/logstash/pipeline/logstash.conf +++ b/logstash/pipeline/logstash.conf @@ -8,6 +8,7 @@ input { output { elasticsearch { + ecs_compatibility => "v1" hosts => "elasticsearch:9200" user => "elastic" password => "changeme"