Merge pull request #77 from Yelp/add_until_to_mapping

Added until to silence_mapping
Yelp · Apr 24, 2015 · 459f4b2 · 459f4b2
2 parents 166c8e8 + a9c31fa
commit 459f4b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/config.yaml.example b/config.yaml.example
@@ -28,7 +28,7 @@ es_port: 14900
 
 # The index on es_host which is used for metadata storage
 # This can be a unmapped index, but it is reccommended that you run
-# tools/create_index.py to set a mapping
+# elastalert-create-index to set a mapping
 writeback_index: elastalert_status
 
 # If an alert fails for some reason, ElastAlert will retry

diff --git a/elastalert/create_index.py b/elastalert/create_index.py
@@ -44,7 +44,8 @@ def main():
 
     es = Elasticsearch(host=host, port=port, use_ssl=use_ssl, http_auth=http_auth)
 
-    silence_mapping = {'silence': {'properties': {'rule_name': {'index': 'not_analyzed', 'type': 'string'}}}}
+    silence_mapping = {'silence': {'properties': {'rule_name': {'index': 'not_analyzed', 'type': 'string'},
+                                                  'until': {'type': 'date', 'format': 'dateOptionalTime'}}}}
     ess_mapping = {'elastalert_status': {'properties': {'rule_name': {'index': 'not_analyzed', 'type': 'string'},
                                                         '@timestamp': {'format': 'dateOptionalTime', 'type': 'date'}}}}
     es_mapping = {'elastalert': {'properties': {'rule_name': {'index': 'not_analyzed', 'type': 'string'},