bug-1912356: Add elasticsearch 8 instance in dev (#6686)

bin/test.sh

@@ -19,6 +19,7 @@ echo ">>> set up environment"
 DATABASE_URL="${DATABASE_URL:-}"
 SENTRY_DSN="${SENTRY_DSN:-}"
 ELASTICSEARCH_URL="${ELASTICSEARCH_URL:-}"
+LEGACY_ELASTICSEARCH_URL="${LEGACY_ELASTICSEARCH_URL:-}"
 
 export PYTHONPATH=/app/:$PYTHONPATH
 PYTEST="$(which pytest)"
@@ -27,10 +28,12 @@ PYTHON="$(which python)"
 echo ">>> wait for services to be ready"
 
 urlwait "${DATABASE_URL}"
-urlwait "${ELASTICSEARCH_URL}"
+urlwait "${LEGACY_ELASTICSEARCH_URL}"
 urlwait "http://${PUBSUB_EMULATOR_HOST}" 10
 urlwait "${STORAGE_EMULATOR_HOST}/storage/v1/b" 10
 python ./bin/waitfor.py --verbose --codes=200,404 "${SENTRY_DSN}"
+# wait for this last because it's the slowest to start
+urlwait "${ELASTICSEARCH_URL}" 10
 
 echo ">>> build queue things and db things"
 

docker-compose.yml

@@ -15,6 +15,7 @@ services:
       - statsd
       - pubsub
       - postgresql
+      - legacy-elasticsearch
       - elasticsearch
     volumes:
       - .:/app
@@ -33,6 +34,7 @@ services:
       - gcs-emulator
       - pubsub
       - postgresql
+      - legacy-elasticsearch
       - elasticsearch
     volumes:
       - .:/app
@@ -49,6 +51,7 @@ services:
       - gcs-emulator
       - pubsub
       - postgresql
+      - legacy-elasticsearch
       - elasticsearch
 
   devcontainer:
@@ -69,6 +72,7 @@ services:
       - gcs-emulator
       - pubsub
       - postgresql
+      - legacy-elasticsearch
       - elasticsearch
     volumes:
       - .:/app
@@ -83,6 +87,7 @@ services:
       - statsd
       - gcs-emulator
       - pubsub
+      - legacy-elasticsearch
       - elasticsearch
       - symbolsserver
     command: ["processor"]
@@ -98,6 +103,7 @@ services:
       - fakesentry
       - statsd
       - postgresql
+      - legacy-elasticsearch
       - elasticsearch
     command: ["crontabber"]
     volumes:
@@ -114,6 +120,7 @@ services:
       - gcs-emulator
       - pubsub
       - postgresql
+      - legacy-elasticsearch
       - elasticsearch
       - memcached
       - oidcprovider
@@ -214,12 +221,21 @@ services:
       - "8126:8126"
 
   # https://hub.docker.com/_/elasticsearch/
-  # Note: This image is deprecated, but the new one requires fiddling.
-  elasticsearch:
+  legacy-elasticsearch:
     image: mozilla/socorro_elasticsearch:1.4.5
     ports:
       - "9200:9200"
-      - "9300:9300"
+
+  # https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docker.html
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
+    mem_limit: 1g
+    command:
+      - bin/elasticsearch
+      - -Expack.security.enabled=false
+      - -Ediscovery.type=single-node
+    ports:
+      - "9201:9200"
 
   # https://hub.docker.com/_/postgres/
   postgresql:

docker/config/local_dev.env

@@ -24,6 +24,7 @@ STATSD_HOST=statsd
 # -------------
 
 ELASTICSEARCH_URL=http://elasticsearch:9200
+LEGACY_ELASTICSEARCH_URL=http://legacy-elasticsearch:9200
 
 
 # processor

socorro/mozilla_settings.py

@@ -181,7 +181,11 @@ def _or_none(val):
             default="^socorro[0-9]{6}$",
             doc="Regex for matching Elasticsearch index names.",
         ),
-        "url": _config("ELASTICSEARCH_URL", doc="Elasticsearch url."),
+        "url": _config(
+            "LEGACY_ELASTICSEARCH_URL",
+            alternate_keys=["ELASTICSEARCH_URL"],
+            doc="Elasticsearch url.",
+        ),
     },
 }