Merge pull request #347 from georchestra/fix-elastic-health

Add elastic environment file

Author: f-necas

.envs-elastic

@@ -0,0 +1,13 @@
+ES_USERNAME=elastic
+ES_PASSWORD=changeme
+
+# Only needed for the built-in elasticsearch
+ELASTIC_PASSWORD=${ES_PASSWORD}
+
+# Disable SSL for Elasticsearch
+xpack.security.transport.ssl.enabled: false
+xpack.security.http.ssl.enabled: false
+
+#In order to use Kibana, you need to set the password for the kibana_system user.
+#docker exec -it es01 bin/elasticsearch-reset-password -u kibana_system
+#KIBANA_PASSWORD=<your_kibana_password>

README.md

@@ -164,6 +164,14 @@ For [geoserver_privileged_user_passwd.txt](secrets/geoserver_privileged_user_pas
 
 Most changes will require a service restart, except maybe updating viewer contexts & addons (`F5` will do).
 
+### Kibana
+
+In order to have Kibana up and running, you will need to:
+1. After Elasticsearch up and healthy, launch the command `docker compose exec -it elasticsearch bin/elasticsearch-reset-password -u kibana_system`. It will ask to fill a password for the `kibana_system` user.
+2. Uncomment and fill this password into the `.envs-elastic` file.
+3. Enable kibana server with `scale: 1` in `docker-compose.yml`.
+4. Start Kibana with `docker compose up -d kibana`.
+
 ## Building
 
 Images used in the current composition are pulled from docker hub, which means they've been compiled by [github actions](https://github.com/georchestra/georchestra/actions).

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 include:
   - docker-compose.data-api.yml
 
@@ -208,8 +206,6 @@ services:
         condition: service_healthy
       database:
         condition: service_healthy
-      kibana:
-        condition: service_healthy
       elasticsearch:
         condition: service_healthy
     volumes:
@@ -222,6 +218,7 @@ services:
     env_file:
       - .envs-hosts
       - .envs-database-georchestra
+      - .envs-elastic
     restart: always
 
   datahub:
@@ -352,21 +349,22 @@ services:
     volumes:
       - esdata:/usr/share/elasticsearch/data
     healthcheck:
-      test: ["CMD-SHELL", "curl -s -f http://localhost:9200/_cat/health >/dev/null || exit 1"]
+      test: ["CMD-SHELL", "curl -u elastic:$$ELASTIC_PASSWORD -s -f http://localhost:9200/_cat/health  >/dev/null || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 10
     depends_on:
       envsubst:
         condition: service_completed_successfully
+    env_file:
+      - .envs-elastic
     environment:
       discovery.type: single-node
       ES_JAVA_OPTS: -Xms512m -Xmx512m
-      # ES_USERNAME is elastic by default
-      ES_PASSWORD: changeme
     restart: always
 
   kibana:
+    scale: 0
     image: docker.elastic.co/kibana/kibana:8.14.3
     depends_on:
       elasticsearch:
@@ -378,6 +376,7 @@ services:
       retries: 10
     env_file:
       - .envs-hosts
+      - .envs-elastic
     volumes:
       - ./resources/kibana/kibana.yml:/usr/share/kibana/config/kibana.yml
     restart: always