diff --git a/testing/environments/7.11.yml b/testing/environments/7.11.yml deleted file mode 100644 index 7f93445987c..00000000000 --- a/testing/environments/7.11.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This is the latest 7.11 - -version: '2.3' -services: - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.11.2 - healthcheck: - test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] - retries: 300 - interval: 1s - environment: - - "ES_JAVA_OPTS=-Xms1g -Xmx1g" - - "network.host=" - - "transport.host=127.0.0.1" - - "http.host=0.0.0.0" - - "xpack.security.enabled=false" - - "script.context.template.max_compilations_rate=unlimited" - - "script.context.ingest.cache_max_size=2000" - - "script.context.processor_conditional.cache_max_size=2000" - - "script.context.template.cache_max_size=2000" - - "action.destructive_requires_name=false" - - logstash: - image: docker.elastic.co/logstash/logstash:7.11.2 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] - retries: 600 - interval: 1s - volumes: - - ./docker/logstash/pipeline:/usr/share/logstash/pipeline:ro - - ./docker/logstash/pki:/etc/pki:ro - - kibana: - image: docker.elastic.co/kibana/kibana:7.11.2 - healthcheck: - test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"] - retries: 600 - interval: 1s diff --git a/testing/environments/prev-minor.yml b/testing/environments/prev-minor.yml index 5ea3311a58e..a4506188f6b 100644 --- a/testing/environments/prev-minor.yml +++ b/testing/environments/prev-minor.yml @@ -33,6 +33,6 @@ services: kibana: image: docker.elastic.co/kibana/kibana:7.15.0 healthcheck: - test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"] + test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"] retries: 600 interval: 1s diff --git a/testing/environments/snapshot-oss.yml b/testing/environments/snapshot-oss.yml index 759dd22753e..d3a731eb1d8 100644 --- a/testing/environments/snapshot-oss.yml +++ b/testing/environments/snapshot-oss.yml @@ -33,7 +33,7 @@ services: kibana: image: docker.elastic.co/kibana/kibana:8.0.0-7e122dd9-SNAPSHOT healthcheck: - test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status | grep -q 'Looking good'"] + test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"] retries: 600 interval: 1s