Fixing get_hits_count for es 7.x

jertel · Jul 7, 2021 · b9ff8b8 · b9ff8b8
1 parent 3df7643
commit b9ff8b8
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/elastalert/elastalert.py b/elastalert/elastalert.py
@@ -456,8 +456,21 @@ def get_hits_count(self, rule, starttime, endtime, index):
             five=rule['five']
         )
 
+        es_client = self.thread_data.current_es
         try:
-            res = self.thread_data.current_es.count(index=index, doc_type=rule['doc_type'], body=query, ignore_unavailable=True)
+            if es_client.is_atleastsixsix():
+                res = es_client.count(
+                    index=index,
+                    body=query,
+                    ignore_unavailable=True
+                )
+            else:
+                res = es_client.count(
+                    index=index,
+                    doc_type=rule['doc_type'],
+                    body=query,
+                    ignore_unavailable=True
+                )
         except ElasticsearchException as e:
             # Elasticsearch sometimes gives us GIGANTIC error messages
             # (so big that they will fill the entire terminal buffer)