Update to v9.0.0

List of changes impacting docker-elk:

- [kibana]: Several features now require an encryption key for saved
  objects. Such key must be set via the configuration option
  `xpack.encryptedSavedObjects.encryptionKey`.

  Ref: https://www.elastic.co/guide/en/kibana/8.18/xpack-security-secure-saved-objects.html

- [enterprise-search]: Discontinued in 9.x versions.

  Refs:
  - https://www.elastic.co/guide/en/enterprise-search/8.18/upgrading-to-9-x.html
  - https://www.elastic.co/blog/app-search-to-elasticsearch

Author: antoineco

.env

@@ -1,4 +1,4 @@
-ELASTIC_VERSION=8.17.4
+ELASTIC_VERSION=9.0.0
 
 ## Passwords for stack users
 #

.github/workflows/ci.yml

@@ -35,7 +35,6 @@ jobs:
           -f extensions/metricbeat/metricbeat-compose.yml
           -f extensions/filebeat/filebeat-compose.yml
           -f extensions/heartbeat/heartbeat-compose.yml
-          -f extensions/enterprise-search/enterprise-search-compose.yml
           build
 
       ########################################################
@@ -58,9 +57,7 @@ jobs:
           .env
 
       - name: Generate Kibana encryption keys
-        run: |
-          docker container run --rm docker-elk-kibana bin/kibana-encryption-keys generate -q >>kibana/config/kibana.yml
-          sed -i '/Kibana is currently running with legacy OpenSSL providers enabled/d' kibana/config/kibana.yml
+        run: docker container run --rm docker-elk-kibana bin/kibana-encryption-keys generate -q >>kibana/config/kibana.yml
 
       - name:  Set up users and roles
         run: docker compose up setup
@@ -123,33 +120,6 @@ jobs:
           docker compose -f docker-compose.yml -f extensions/heartbeat/heartbeat-compose.yml up --remove-orphans -d heartbeat
           .github/workflows/scripts/run-tests-heartbeat.sh
 
-      #
-      # Enterprise Search
-      #
-
-      - name: Execute Enterprise Search test suite
-        run: |
-
-          # Set mandatory Elasticsearch settings
-
-          sed -i '$ a xpack.security.authc.api_key.enabled: true' elasticsearch/config/elasticsearch.yml
-
-          # Restart Elasticsearch for changes to take effect
-
-          docker compose restart elasticsearch
-
-          # Run Enterprise Search and execute tests
-
-          sed -i 's/\(secret_management.encryption_keys:\)/\1 [test-encrypt]/g' extensions/enterprise-search/config/enterprise-search.yml
-
-          docker compose -f docker-compose.yml -f extensions/enterprise-search/enterprise-search-compose.yml up --remove-orphans -d enterprise-search
-          .github/workflows/scripts/run-tests-enterprise-search.sh
-
-          # Revert changes to Elasticsearch configuration
-
-          sed -i '/xpack.security.authc.api_key.enabled: true/d' elasticsearch/config/elasticsearch.yml
-          docker compose restart elasticsearch
-
       - name: Collect troubleshooting data
         id: debug-data
         if: failure()
@@ -163,7 +133,6 @@ jobs:
           -f extensions/metricbeat/metricbeat-compose.yml \
           -f extensions/filebeat/filebeat-compose.yml \
           -f extensions/heartbeat/heartbeat-compose.yml \
-          -f extensions/enterprise-search/enterprise-search-compose.yml \
           ps >"$debug_data_dir"/docker_ps.log
 
           docker compose \
@@ -173,7 +142,6 @@ jobs:
           -f extensions/metricbeat/metricbeat-compose.yml \
           -f extensions/filebeat/filebeat-compose.yml \
           -f extensions/heartbeat/heartbeat-compose.yml \
-          -f extensions/enterprise-search/enterprise-search-compose.yml \
           logs >"$debug_data_dir"/docker_logs.log
 
           echo "path=${debug_data_dir}" >>"$GITHUB_OUTPUT"
@@ -201,5 +169,4 @@ jobs:
           -f extensions/metricbeat/metricbeat-compose.yml
           -f extensions/filebeat/filebeat-compose.yml
           -f extensions/heartbeat/heartbeat-compose.yml
-          -f extensions/enterprise-search/enterprise-search-compose.yml
           down -v

.github/workflows/scripts/run-tests-enterprise-search.sh

@@ -9,7 +9,7 @@ on:
       - update/main
       - update/tls
       - update/release-7.x
-      - update/release-9.x
+      - update/release-8.x
 
 jobs:
 

.github/workflows/update-merge.yml

@@ -15,7 +15,7 @@ jobs:
           - main
           - tls
           - release-7.x
-          - release-9.x
+          - release-8.x
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/update.yml

@@ -1,7 +1,7 @@
 # Elastic stack (ELK) on Docker
 
-[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-8.17.4-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases)
-[![Build Status](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml?query=branch%3Amain)
+[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-9.0.0-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases)
+[![Build Status](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml/badge.svg?branch=release-9.x)](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml?query=branch%3Arelease-9.x)
 [![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://app.gitter.im/#/room/#deviantony_docker-elk:gitter.im)
 
 Run the latest version of the [Elastic stack][elk-stack] with Docker and Docker Compose.
@@ -268,7 +268,7 @@ docker compose down -v
 ### Version selection
 
 This repository stays aligned with the latest version of the Elastic stack. The `main` branch tracks the current major
-version (8.x).
+version (9.x).
 
 To use a different version of the core Elastic components, simply change the version number inside the [`.env`](.env)
 file. If you are upgrading an existing stack, remember to rebuild all container images using the `docker compose build`
@@ -280,6 +280,7 @@ command.
 
 Older major versions are also supported on separate branches:
 
+* [`release-8.x`](https://github.com/deviantony/docker-elk/tree/release-8.x): 8.x series
 * [`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 (End-of-life)
 * [`release-5.x`](https://github.com/deviantony/docker-elk/tree/release-5.x): 5.x series (End-of-life)

README.md

@@ -1,7 +1,7 @@
 ARG ELASTIC_VERSION
 
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.17.4}
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-9.0.0}
 
 # Add your elasticsearch plugins setup here
 # Example: RUN elasticsearch-plugin install analysis-icu

elasticsearch/Dockerfile

@@ -1,3 +1,3 @@
 ARG ELASTIC_VERSION
 
-FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-8.17.4}
+FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-9.0.0}