Merge branch 'master' into berg_cgap_autodeploy

4dn-dcic · Jun 26, 2020 · c7c218d · c7c218d
2 parents dadb28c + 11c9ff3
commit c7c218d
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 50 deletions.
diff --git a/chalicelib/check_setup.json b/chalicelib/check_setup.json
@@ -1390,11 +1390,11 @@
         "schedule": {
             "hourly_checks": {
                 "cgap": {
-                    "kwargs": {"primary": true},
+                    "kwargs": {"primary": true, "queue_action": "prod"},
                     "dependencies": []
                 },
                 "cgapwolf": {
-                    "kwargs": {"primary": true},
+                    "kwargs": {"primary": true, "queue_action": "prod"},
                     "dependencies": []
                 }
             }

diff --git a/chalicelib/es_connection.py b/chalicelib/es_connection.py
@@ -174,7 +174,8 @@ def get_result_history(self, prefix, start, limit):
                         {'term': {'_id': prefix + '/latest.json'}}
                     ],
                     'filter': {
-                        'term': {'name': prefix}
+                        # use MATCH so our 'prefix' is analyzed like the source field 'name', see mapping
+                        'match': {'name': prefix}
                     }
                 }
             }

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "foursight"
 version = "0.11.8"
 description = "Serverless Chalice Application for Monitoring"
-authors = ["4DN Team <william_ronchetti@hms.harvard.edu>"]
+authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"
 packages = [
   { include = "chalicelib" }