Merge pull request YelpArchive#2394 from abhishekjiitr/fix-clear-scroll

Catch Scroll Clear NotFound Error

Author: Qmando

elastalert/elastalert.py

@@ -24,6 +24,7 @@
 from elasticsearch.exceptions import ConnectionError
 from elasticsearch.exceptions import ElasticsearchException
 from elasticsearch.exceptions import TransportError
+from elasticsearch.exceptions import NotFoundError
 
 from . import kibana
 from .alerts import DebugAlerter
@@ -657,7 +658,10 @@ def run_query(self, rule, start=None, end=None, scroll=False):
 
         if 'scroll_id' in rule:
             scroll_id = rule.pop('scroll_id')
-            self.thread_data.current_es.clear_scroll(scroll_id=scroll_id)
+            try:
+                self.thread_data.current_es.clear_scroll(scroll_id=scroll_id)
+            except NotFoundError:
+                pass
 
         return True