Add django-elasticsearch-metrics and temporary ES6 container

Support both ES2 and ES6

.docker-compose.env

@@ -6,6 +6,7 @@ DOMAIN=http://localhost:5000/
 INTERNAL_DOMAIN=http://192.168.168.167:5000/
 API_DOMAIN=http://localhost:8000/
 ELASTIC_URI=192.168.168.167:9200
+ELASTICSEARCH_HOST=192.168.168.167:9201
 OSF_DB_HOST=192.168.168.167
 DB_HOST=192.168.168.167
 WATERBUTLER_URL=http://localhost:7777

api/base/settings/defaults.py

@@ -90,6 +90,7 @@
     'guardian',
     'storages',
     'waffle',
+    'elasticsearch_metrics',
 
     # OSF
     'osf',
@@ -290,3 +291,8 @@
 
 # salt used for generating hashids
 HASHIDS_SALT = 'pinkhimalayan'
+
+# django-elasticsearch-metrics
+ELASTICSEARCH_DSL = {
+    'default': {'hosts': os.environ.get('ELASTICSEARCH_HOST', 'localhost:9201')}
+}

docker-compose.yml

@@ -9,6 +9,8 @@ volumes:
     external: false
   elasticsearch_data_vol:
     external: false
+  elasticsearch6_data_vol:
+    external: false
   rabbitmq_vol:
     external: false
   ember_osf_web_dist_vol:
@@ -56,6 +58,15 @@ services:
       - elasticsearch_data_vol:/usr/share/elasticsearch/data
     stdin_open: true
 
+  # Temporary: Remove when we've upgraded to ES6
+  elasticsearch6:
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1
+    ports:
+      - 9201:9200
+    volumes:
+      - elasticsearch6_data_vol:/usr/share/elasticsearch/data
+    stdin_open: true
+
   postgres:
     image: postgres:9.6
     command:

requirements.txt

@@ -30,7 +30,8 @@ bleach==2.1.3
 html5lib==0.999999999
 blinker==1.4
 furl==0.4.92
-elasticsearch==2.4.0  # pyup: >=2.4,<3.0 # Major version must be same as ES version
+elasticsearch==6.3.1
+elasticsearch2==2.5.0  # pyup: >=2.4,<3.0 # Major version must be same as ES version
 google-api-python-client==1.6.4
 Babel==2.5.1
 citeproc-py==0.4.0
@@ -106,3 +107,6 @@ enum34==1.1.6
 
 # identifiers
 datacite==1.0.1
+
+# Metrics
+django-elasticsearch-metrics==3.2.0

website/search/elastic_search.py

@@ -17,7 +17,7 @@
 from django.core.paginator import Paginator
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
-from elasticsearch import (ConnectionError, Elasticsearch, NotFoundError,
+from elasticsearch2 import (ConnectionError, Elasticsearch, NotFoundError,
                            RequestError, TransportError, helpers)
 from framework.celery_tasks import app as celery_app
 from framework.database import paginated

website/search_migration/migrate.py

@@ -7,7 +7,7 @@
 import logging
 
 from django.db import connection
-from elasticsearch import helpers
+from elasticsearch2 import helpers
 
 import website.search.search as search
 from website.search.elastic_search import client