From a4b07b5613cd0320315fbfbc22d8a204801a978a Mon Sep 17 00:00:00 2001 From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:41:42 +0800 Subject: [PATCH] docker: adds more defaults to elasticsearch images (#3707) Signed-off-by: Adrian Cole --- .../zipkin-elasticsearch7/config/elasticsearch.yml | 6 +++++- .../zipkin-elasticsearch8/config/elasticsearch.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/test-images/zipkin-elasticsearch7/config/elasticsearch.yml b/docker/test-images/zipkin-elasticsearch7/config/elasticsearch.yml index 8c335ef1f36..1e0eb78366e 100644 --- a/docker/test-images/zipkin-elasticsearch7/config/elasticsearch.yml +++ b/docker/test-images/zipkin-elasticsearch7/config/elasticsearch.yml @@ -1,5 +1,5 @@ # -# Copyright 2015-2023 The OpenZipkin Authors +# Copyright 2015-2024 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -18,3 +18,7 @@ cluster.name: "docker-cluster" xpack.ml.enabled: false cluster.initial_master_nodes: - zipkin-elasticsearch +# Avoid "flood stage disk watermark" errors +cluster.routing.allocation.disk.threshold_enabled: false +# We don't use geoip +ingest.geoip.downloader.enabled: false diff --git a/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml b/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml index e69970ddc6c..cbcb0068529 100644 --- a/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml +++ b/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml @@ -1,5 +1,5 @@ # -# Copyright 2015-2023 The OpenZipkin Authors +# Copyright 2015-2024 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -22,3 +22,7 @@ cluster.initial_master_nodes: # This is a test image, so we are not afraid to delete all indices. Avoids: # Wildcard expressions or all indices are not allowed action.destructive_requires_name: false +# Avoid "flood stage disk watermark" errors +cluster.routing.allocation.disk.threshold_enabled: false +# We don't use geoip +ingest.geoip.downloader.enabled: false