From 0f1f98c35a2c85deea725e5d6144863347b7da23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 16 Aug 2023 10:10:21 +0200 Subject: [PATCH 1/2] Disable a few features in Elasticsearch containers started for our integration tests Some settings seem to have only limited effect on what gets disabled on startup: * cluster.deprecation_indexing.enabled doesn't seem to disable index templates * stack.templates.enabled doesn't seem to disable ingest pipelines And some features don't seem to have any settings to disable them, in particular the "Fleet" module. But this is as far as we can go. Co-Authored-By: marko-bekhta --- .../deployment/pom.xml | 10 ++++++++++ .../deployment/pom.xml | 10 ++++++++++ integration-tests/elasticsearch-java-client/pom.xml | 10 ++++++++++ integration-tests/elasticsearch-rest-client/pom.xml | 10 ++++++++++ .../pom.xml | 13 ++++++++++++- .../pom.xml | 10 ++++++++++ .../hibernate-search-orm-elasticsearch/pom.xml | 10 ++++++++++ integration-tests/logging-gelf/pom.xml | 10 ++++++++++ .../src/test/resources/docker-compose-efk.yml | 12 +++++++++++- .../src/test/resources/docker-compose-elk.yml | 10 ++++++++++ .../src/test/resources/docker-compose-graylog.yml | 10 ++++++++++ 11 files changed, 113 insertions(+), 2 deletions(-) diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml index bf5a1e9fb07c4..a276fa8659a55 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml @@ -128,6 +128,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false 9200:9200 diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index 6f2645e3e2bf0..9f9331be27bbf 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -133,6 +133,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false 9200:9200 diff --git a/integration-tests/elasticsearch-java-client/pom.xml b/integration-tests/elasticsearch-java-client/pom.xml index bcb1f3405e81f..9c8cc165289f5 100644 --- a/integration-tests/elasticsearch-java-client/pom.xml +++ b/integration-tests/elasticsearch-java-client/pom.xml @@ -173,6 +173,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false 9200:9200 diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index 0010baf5a2d06..18a106a3dbff5 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -173,6 +173,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml index 4f59a84df7820..a6da8fd9fdecf 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml @@ -213,7 +213,18 @@ and lead to problems on large disks with little space left. See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> - false + false + + false + false + false + false + false + false + false + false + false + 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index a888a9cbbf521..e2364a665a118 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -230,6 +230,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index 5494677e184e1..9e52061daae01 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -192,6 +192,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false 9200:9200 diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 4c1c3e4fd4b5e..03d4e11bcfd49 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -165,6 +165,16 @@ See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation --> false + + false + false + false + false + false + false + false + false + false Elasticsearch: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml index ec5090633fc30..03811a7a0d101 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -7,7 +7,17 @@ services: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" xpack.security.enabled: "false" - cluster.routing.allocation.disk.threshold_enabled: false + cluster.routing.allocation.disk.threshold_enabled: "false" + # Disable some features that are not needed in our tests and just slow down startup --> + xpack.profiling.enabled: "false" + xpack.monitoring.templates.enabled: "false" + xpack.ml.enabled: "false" + xpack.watcher.enabled: "false" + xpack.ent_search.enabled: "false" + stack.templates.enabled: "false" + cluster.deprecation_indexing.enabled: "false" + indices.lifecycle.history_index_enabled: "false" + slm.history_index_enabled: "false" networks: - efk diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml index 6363ac563612e..df8f496fd12d4 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -8,6 +8,16 @@ services: discovery.type: "single-node" xpack.security.enabled: "false" cluster.routing.allocation.disk.threshold_enabled: false + # Disable some features that are not needed in our tests and just slow down startup --> + xpack.profiling.enabled: "false" + xpack.monitoring.templates.enabled: "false" + xpack.ml.enabled: "false" + xpack.watcher.enabled: "false" + xpack.ent_search.enabled: "false" + stack.templates.enabled: "false" + cluster.deprecation_indexing.enabled: "false" + indices.lifecycle.history_index_enabled: "false" + slm.history_index_enabled: "false" networks: - elk diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml index 645a9e1c615ac..b47e514b605eb 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -8,6 +8,16 @@ services: discovery.type: "single-node" xpack.security.enabled: "false" cluster.routing.allocation.disk.threshold_enabled: false + # Disable some features that are not needed in our tests and just slow down startup --> + xpack.profiling.enabled: "false" + xpack.monitoring.templates.enabled: "false" + xpack.ml.enabled: "false" + xpack.watcher.enabled: "false" + xpack.ent_search.enabled: "false" + stack.templates.enabled: "false" + cluster.deprecation_indexing.enabled: "false" + indices.lifecycle.history_index_enabled: "false" + slm.history_index_enabled: "false" networks: - graylog From bbccb844eb053c835fcee7ede7b81510a584c39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 16 Aug 2023 10:14:33 +0200 Subject: [PATCH 2/2] Raise timeout for starting Elasticsearch in integration-tests/elasticsearch-java-client Seems like we had raised the timeout everywhere else, but forgot to do it there. --- integration-tests/elasticsearch-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/elasticsearch-java-client/pom.xml b/integration-tests/elasticsearch-java-client/pom.xml index 9c8cc165289f5..ab829c3e6a9a8 100644 --- a/integration-tests/elasticsearch-java-client/pom.xml +++ b/integration-tests/elasticsearch-java-client/pom.xml @@ -198,7 +198,7 @@ GET 200 - +