From 7b2509421db1ee9abe557aca0f97ec70e26fc58c Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Fri, 23 Apr 2021 08:09:23 -0400 Subject: [PATCH] [Testing] 7.x Disable geoip downloader Disable database updates via an Elasticsearch property ingest.geoip.downloader.enabled: false. This will cause Elasticsearch to use the circa 2019 maxmind database version that is embedded. This would work for now, but the embedded database will be removed in 8.x IIUC. This prevents our golden file tests from failing everytime the database changes geo or asn values. It also prevents race conditions in tests that might run before the database has been updated or in cases where the downloader service is unavailable. Closes: #25159 --- testing/environments/snapshot.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml index 198d4de85702..b5834700aa1b 100644 --- a/testing/environments/snapshot.yml +++ b/testing/environments/snapshot.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.12.0-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.13.0-SNAPSHOT healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] retries: 300 @@ -14,9 +14,12 @@ services: - "transport.host=127.0.0.1" - "http.host=0.0.0.0" - "xpack.security.enabled=false" + # Disable geoip updates to prevent golden file test failures when the database + # changes and prevent race conditions between tests and database updates. + - "ingest.geoip.downloader.enabled=false" logstash: - image: docker.elastic.co/logstash/logstash:7.12.0-SNAPSHOT + image: docker.elastic.co/logstash/logstash:7.13.0-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 600 @@ -26,7 +29,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:7.12.0-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.13.0-SNAPSHOT healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"] retries: 600