Bug 1342081 - Revert all ES 5.x code (mozilla-services#3854)

* Revert "[DO NOT MERGE] fixes bug 1379662 - add TelemetryEnvironment to super_search_fields.json (mozilla-services#3848)"

This reverts commit 592b652.

* Revert "Bug 1100354 - Use proper way of loading a file. (mozilla-services#3845)"

This reverts commit c7b3e6c.

* Revert "Fixes bug 1100354 - Read Super Search Fields from a json file (mozilla-services#3844)"

This reverts commit 673224a.

* Revert "[DNM] Fixes bug 1342081 - Upgraded ES libraries and related code. (mozilla-services#3676)"

This reverts commit 0dd2f21.

.travis.yml

@@ -1,4 +1,4 @@
-sudo: true
+sudo: no
 cache:
   directories:
     - $HOME/.cache/pip
@@ -8,9 +8,6 @@ python:
 
 addons:
   postgresql: "9.3"
-  apt:
-    packages:
-      - oracle-java8-set-default
 
 services:
   - rabbitmq

Makefile

@@ -55,6 +55,7 @@ dockerbuild:
 # run migrations here, too.
 dockersetup: .docker-build
 	-${DC} run webapp /app/docker/run_setup_postgres.sh
+	-${DC} run webapp /app/docker/run_setup_elasticsearch.sh
 
 dockerclean:
 	rm .docker-build

docker-compose.yml

@@ -62,9 +62,8 @@ services:
 
   # https://hub.docker.com/_/elasticsearch/
   # Note: This image is deprecated, but the new one requires fiddling.
-  # Note: We use 5.3.2 because that is the last supported 5.3.x version.
   elasticsearch:
-    image: elasticsearch:5.3.2
+    image: elasticsearch:1.4.5
     ports:
       - "9200:9200"
       - "9300:9300"

docker/run_setup_elasticsearch.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Sets up Elasticsearch.
+
+# This should get run only to initialize an Elasticsearch cluster and probably
+# only in local development environments.
+
+cd /app/scripts/
+
+# FIXME(willkg): Make this idempotent so that running it after it's already been
+# run doesn't affect anything.
+
+echo "Setting up Elasticsearch indexes..."
+python setup_supersearch_app.py

docs/howto.rst

@@ -30,18 +30,20 @@ Populate Elasticsearch database
 
    See the chapter about :ref:`elasticsearch-chapter` for more information.
 
-Once you have populated your PostgreSQL database with "fake data",
-you can migrate that data into Elasticsearch:
+First you need to setup your Elasticsearch database:
 
 ::
 
-   python socorro/external/postgresql/crash_migration_app.py
+   cd scripts && python ./setup_supersearch_app.py
 
 
-.. Warning::
+Then, and once you have populated your PostgreSQL database with "fake data",
+you can migrate that data into Elasticsearch:
+
+::
+
+   python socorro/external/postgresql/crash_migration_app.py
 
-    This file actually doesn't exist anymore. We need to find a different
-    way of inserting data into Elasticsearch for development.
 
 Sync Django database
 ====================

requirements.txt

@@ -59,12 +59,12 @@ psycopg2==2.6.2 \
     --hash=sha256:8ffbd1128df23c9fdfc3499084021055b3df7818f12ef87af5b3f33e27d58b0a \
     --hash=sha256:8c3b69d743e408527208d5ed6aa136b821bbd3cb1e236aa8479ff47ea986769c \
     --hash=sha256:70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c
-elasticsearch==5.3.0 \
-    --hash=sha256:aea16d6d6ad03a509c9f591eee9ce4ce62918d8ba26bf6513097223929be0a09 \
-    --hash=sha256:cb7f1346ebf7fb3fac1efcd8454d2d124d29cc55a009ed5683fe4c6ecad12925
-elasticsearch-dsl==5.3.0 \
-    --hash=sha256:de81b2322cde9bf1171c8a41d80596cdadd433b88b93daa09060af3a512523a7 \
-    --hash=sha256:de5fd68901c5b94e51e2ae4e8ad6f618b22665d89794d96f9b6b763986665527
+elasticsearch==1.9.0 \
+    --hash=sha256:cbee23c29f9947b1b78be5c0f741c1f8b504d3c53163b1355ea08f69cbd0fc0c \
+    --hash=sha256:eb0d4b5b20a4ccf9e49bd20498b6215d5e960d8a63a0eae44cd4431e3f303a24
+elasticsearch-dsl==0.0.11 \
+    --hash=sha256:663fb62ad39200c7d903e973aa0aa693578613264d83796455cbf4cd172bd878 \
+    --hash=sha256:59a76c4142478a1952bba6f9a9ca4fc7b029afb619e8ffcf0d135ce37ea692da
 urllib3==1.9.1 \
     --hash=sha256:410bea96df2479fa33986c40c3eefa9c1e7ba95a7f70711c315860bbe2d66c7f \
     --hash=sha256:d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b