normalize bool.filter format for elasticsearch 5.x

backend/src/appenlight/celery/tasks.py

@@ -691,14 +691,14 b' def logs_cleanup(resource_id, filter_settings):'
     request.tm.begin()
     es_query = {
         "query": {
-            "bool": {"filter": {"and": [{"term": {"resource_id": resource_id}}]}}
+            "bool": {"filter": [{"term": {"resource_id": resource_id}}]}
         }
     }
 
     query = DBSession.query(Log).filter(Log.resource_id == resource_id)
     if filter_settings["namespace"]:
         query = query.filter(Log.namespace == filter_settings["namespace"][0])
-        es_query["query"]["bool"]["filter"]["and"].append(
+        es_query["query"]["bool"]["filter"].append(
             {"term": {"namespace": filter_settings["namespace"][0]}}
         )
     query.delete(synchronize_session=False)

backend/src/appenlight/models/report.py

@@ -312,13 +312,11 b' class Report(Base, BaseModel):'
             "size": 1,
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {"term": {"group_id": self.group_id}},
                             {"range": {"pg_id": {"lt": self.id}}},
                         ]
                     }
-                }
             },
             "sort": [{"_doc": {"order": "desc"}}],
         }
@@ -333,13 +331,11 b' class Report(Base, BaseModel):'
             "size": 1,
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {"term": {"group_id": self.group_id}},
                             {"range": {"pg_id": {"gt": self.id}}},
                         ]
                     }
-                }
             },
             "sort": [{"_doc": {"order": "asc"}}],
         }

backend/src/appenlight/models/services/log.py

@@ -58,14 +58,14 b' class LogService(BaseService):'
         query = {
             "query": {
                 "bool": {
-                    "filter": {"and": [{"terms": {"resource_id": list(app_ids)}}]}
+                    "filter": [{"terms": {"resource_id": list(app_ids)}}]
                 }
             }
         }
 
         start_date = filter_settings.get("start_date")
         end_date = filter_settings.get("end_date")
-        filter_part = query["query"]["bool"]["filter"]["and"]
+        filter_part = query["query"]["bool"]["filter"]
 
         for tag in filter_settings.get("tags", []):
             tag_values = [v.lower() for v in tag["value"]]

backend/src/appenlight/models/services/report_group.py

@@ -75,8 +75,7 b' class ReportGroupService(BaseService):'
             },
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {
                                 "terms": {
                                     "resource_id": [filter_settings["resource"][0]]
@@ -92,11 +91,10 b' class ReportGroupService(BaseService):'
                             },
                         ]
                     }
-                }
             },
         }
         if tags:
-            es_query["query"]["bool"]["filter"]["and"].extend(tags)
+            es_query["query"]["bool"]["filter"].extend(tags)
 
         result = Datastores.es.search(
             body=es_query, index=index_names, doc_type="log", size=0
@@ -138,7 +136,7 b' class ReportGroupService(BaseService):'
                 "bool": {
                     "must": [],
                     "should": [],
-                    "filter": {"and": [{"terms": {"resource_id": list(app_ids)}}]}
+                    "filter": [{"terms": {"resource_id": list(app_ids)}}]
                 }
             },
             "aggs": {
@@ -160,7 +158,7 b' class ReportGroupService(BaseService):'
 
         start_date = filter_settings.get("start_date")
         end_date = filter_settings.get("end_date")
-        filter_part = query["query"]["bool"]["filter"]["and"]
+        filter_part = query["query"]["bool"]["filter"]
         date_range = {"range": {"start_time": {}}}
         if start_date:
             date_range["range"]["start_time"]["gte"] = start_date
@@ -467,8 +465,7 b' class ReportGroupService(BaseService):'
             },
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {
                                 "terms": {
                                     "resource_id": [filter_settings["resource"][0]]
@@ -484,7 +481,6 b' class ReportGroupService(BaseService):'
                             },
                         ]
                     }
-                }
             },
         }
         if group_id:

backend/src/appenlight/models/services/report_stat.py

@@ -33,24 +33,20 b' class ReportStatService(BaseService):'
                     "aggs": {
                         "sub_agg": {"value_count": {"field": "tags.group_id.values"}}
                     },
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {"terms": {"resource_id": [resource_id]}},
                             {"exists": {"field": "tags.group_id.values"}},
-                        ]
-                    },
+                    ],
                 }
             },
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {"terms": {"resource_id": [resource_id]}},
                             {"terms": {"tags.type.values": [report_type]}},
                             {"range": {"timestamp": {"gte": since_when}}},
                         ]
                     }
-                }
             },
         }
 

backend/src/appenlight/models/services/request_metric.py

@@ -141,8 +141,7 b' class RequestMetricService(BaseService):'
             },
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {
                                 "terms": {
                                     "resource_id": [filter_settings["resource"][0]]
@@ -159,7 +158,6 b' class RequestMetricService(BaseService):'
                             {"terms": {"namespace": ["appenlight.request_metric"]}},
                         ]
                     }
-                }
             },
         }
 
@@ -209,8 +207,7 b' class RequestMetricService(BaseService):'
                 },
                 "query": {
                     "bool": {
-                        "filter": {
-                            "and": [
+                        "filter": [
                                 {
                                     "terms": {
                                         "resource_id": [filter_settings["resource"][0]]
@@ -227,7 +224,6 b' class RequestMetricService(BaseService):'
                                 {"terms": {"namespace": ["appenlight.request_metric"]}},
                             ]
                         }
-                    }
                 },
             }
             result = Datastores.es.search(
@@ -288,8 +284,7 b' class RequestMetricService(BaseService):'
                 },
                 "query": {
                     "bool": {
-                        "filter": {
-                            "and": [
+                        "filter": [
                                 {
                                     "terms": {
                                         "resource_id": [filter_settings["resource"][0]]
@@ -305,7 +300,6 b' class RequestMetricService(BaseService):'
                                 },
                             ]
                         }
-                    }
                 },
             }
             result = Datastores.es.search(
@@ -331,7 +325,7 b' class RequestMetricService(BaseService):'
                     },
                 }
             },
-            "query": {"bool": {"filter": {"and": and_part}}},
+            "query": {"bool": {"filter": and_part}},
         }
         details = {}
         index_names = es_index_name_limiter(ixtypes=["reports"])
@@ -462,8 +456,7 b' class RequestMetricService(BaseService):'
                 },
                 "query": {
                     "bool": {
-                        "filter": {
-                            "and": [
+                        "filter": [
                                 {
                                     "terms": {
                                         "resource_id": [filter_settings["resource"][0]]
@@ -480,7 +473,6 b' class RequestMetricService(BaseService):'
                                 {"terms": {"namespace": ["appenlight.request_metric"]}},
                             ]
                         }
-                    }
                 },
             }
 
@@ -541,8 +533,7 b' class RequestMetricService(BaseService):'
                 },
                 "query": {
                     "bool": {
-                        "filter": {
-                            "and": [
+                        "filter": [
                                 {
                                     "terms": {
                                         "resource_id": [filter_settings["resource"][0]]
@@ -559,7 +550,6 b' class RequestMetricService(BaseService):'
                                 {"terms": {"namespace": ["appenlight.error"]}},
                             ]
                         }
-                    }
                 },
             }
             result = Datastores.es.search(

backend/src/appenlight/models/services/slow_call.py

@@ -68,8 +68,7 b' class SlowCallService(BaseService):'
                 },
                 "query": {
                     "bool": {
-                        "filter": {
-                            "and": [
+                        "filter": [
                                 {
                                     "terms": {
                                         "resource_id": [filter_settings["resource"][0]]
@@ -85,7 +84,6 b' class SlowCallService(BaseService):'
                                 },
                             ]
                         }
-                    }
                 },
             }
             result = Datastores.es.search(
@@ -110,8 +108,7 b' class SlowCallService(BaseService):'
             },
             "query": {
                 "bool": {
-                    "filter": {
-                        "and": [
+                    "filter": [
                             {
                                 "terms": {
                                     "resource_id": [filter_settings["resource"][0]]
@@ -128,7 +125,6 b' class SlowCallService(BaseService):'
                             },
                         ]
                     }
-                }
             },
         }
         calls = Datastores.es.search(

backend/src/appenlight/views/logs.py

@@ -148,13 +148,13 b' def common_tags(request):'
     query = {
         "query": {
             "bool": {
-                "filter": {"and": [{"terms": {"resource_id": list(resources)}}]}
+                "filter": [{"terms": {"resource_id": list(resources)}}]
             }
         }
     }
     start_date = filter_settings.get("start_date")
     end_date = filter_settings.get("end_date")
-    filter_part = query["query"]["bool"]["filter"]["and"]
+    filter_part = query["query"]["bool"]["filter"]
 
     date_range = {"range": {"timestamp": {}}}
     if start_date:
@@ -207,9 +207,7 b' def common_values(request):'
     query = {
         "query": {
             "bool": {
-                "filter": {
-                    "and": and_part
-                }
+                "filter": and_part
             }
         }
     }