diff --git a/.env b/.env index 9cc82f5..9c0f25c 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -ELK_VERSION=7.10.2 +ELK_VERSION=7.11.0 diff --git a/.github/workflows/scripts/run-tests-enterprise-search.sh b/.github/workflows/scripts/run-tests-enterprise-search.sh index e0eb28a..fb1ab99 100755 --- a/.github/workflows/scripts/run-tests-enterprise-search.sh +++ b/.github/workflows/scripts/run-tests-enterprise-search.sh @@ -19,22 +19,12 @@ poll_ready "$cid_es" "http://${ip_es}:9200/" -u 'elastic:testpasswd' log 'Waiting for readiness of Enterprise Search' poll_ready "$cid_en" "http://${ip_en}:3002/api/ent/v1/internal/health" -u 'elastic:testpasswd' -log 'Retrieving private key from Elasticsearch' -response="$(curl "http://${ip_es}:9200/.ent-search-actastic-app_search_api_tokens_v2/_search?q=name:private-key" -s -u elastic:testpasswd)" -hits="$(jq -rn --argjson data "${response}" '$data.hits.hits')" -echo "$hits" -count="$(jq -rn --argjson data "${response}" '$data.hits.total.value')" -if [[ $count -ne 1 ]]; then - echo "Private key not found. Expected 1 result, got ${count}" - exit 1 -fi -key="$(jq -rn --argjson data "${hits}" '$data[0]._source.authentication_token')" - -log 'Creating App Search engine' -response="$(curl "http://${ip_en}:3002/api/as/v1/engines" -s -d '{"name": "dockerelk"}' -H "Authorization: Bearer ${key}")" +log 'Ensuring that App Search API keys were created in Elasticsearch' +response="$(curl "http://${ip_es}:9200/.ent-search-actastic-app_search_api_tokens_v3/_count?pretty" -s -u elastic:testpasswd)" echo "$response" -name="$(jq -rn --argjson data "${response}" '$data.name')" -if [[ $name != 'dockerelk' ]]; then - echo 'Failed to create engine' +declare -i count +count="$(jq -rn --argjson data "${response}" '$data.count')" +if (( count != 2)); then + echo "Expected search and private keys, got ${count} result(s)" exit 1 fi diff --git a/README.md b/README.md index 39d117b..45afe09 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Elastic stack (ELK) on Docker -[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-7.10.2-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases) +[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-7.11.0-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases) [![Build Status](https://github.com/deviantony/docker-elk/workflows/CI/badge.svg?branch=main)](https://github.com/deviantony/docker-elk/actions?query=workflow%3ACI+branch%3Amain) [![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) @@ -256,7 +256,7 @@ 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.10.2' \ + -H 'kbn-version: 7.11.0' \ -u elastic: \ -d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}' ``` diff --git a/docker-stack.yml b/docker-stack.yml index 2a4296e..1a5e55e 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.10.2 + image: docker.elastic.co/elasticsearch/elasticsearch:7.11.0 ports: - "9200:9200" - "9300:9300" @@ -25,7 +25,7 @@ services: replicas: 1 logstash: - image: docker.elastic.co/logstash/logstash:7.10.2 + image: docker.elastic.co/logstash/logstash:7.11.0 ports: - "5044:5044" - "5000:5000" @@ -44,7 +44,7 @@ services: replicas: 1 kibana: - image: docker.elastic.co/kibana/kibana:7.10.2 + image: docker.elastic.co/kibana/kibana:7.11.0 ports: - "5601:5601" configs: