Update to run with Podman

core/lib/context.py

@@ -4,7 +4,7 @@ def construct_query(index, net, channel, src, num, size, type=None, nicks=None):
     extra_should = []
     extra_should2 = []
     if num:
-        extra_must.append({"match_phrase": {"num": num}})
+        extra_must.append({"equals": {"num": num}})
     if net:
         extra_must.append({"match_phrase": {"net": net}})
     if channel:
@@ -52,7 +52,7 @@ def construct_query(index, net, channel, src, num, size, type=None, nicks=None):
             extra_should.append({"match": {"nick": channel}})
         else:
             for ctype in types:
-                extra_should.append({"match": {"mtype": ctype}})
+                extra_should.append({"equals": {"mtype": ctype}})
     else:
         for ctype in types:
             extra_should.append({"match": {"type": ctype}})
@@ -84,4 +84,6 @@ def construct_query(index, net, channel, src, num, size, type=None, nicks=None):
         query["query"]["bool"]["must"].append({"bool": {"should": [*extra_should]}})
     if extra_should2:
         query["query"]["bool"]["must"].append({"bool": {"should": [*extra_should2]}})
+
+    print("CONTEXT QUERY", query)
     return query

core/lib/parsing.py

@@ -90,6 +90,8 @@ def parse_index(user, query_params, raise_error=False):
                 }
     else:
         index = settings.INDEX_MAIN
+
+    print("GOT INDEX", index)
     return index
 
 

core/lib/rules.py

@@ -335,7 +335,8 @@ class NotificationRuleData(object):
         if not isinstance(matches, list):
             matches = [matches]
         matches_copy = matches.copy()
-        match_ts = datetime.utcnow().isoformat()
+        # match_ts = datetime.utcnow().isoformat()
+        match_ts = int(datetime.utcnow().timestamp())
         batch_id = uuid.uuid4()
 
         # Filter empty fields in meta