Merge branch 'task/show_warn_false' into 'master'

Disable ssl warnings See merge request opensolutions/elastalert!5
datadope-io · Dec 11, 2019 · ddac870 · ddac870
2 parents b4f1466 + 216244c
commit ddac870
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/elastalert/__init__.py b/elastalert/__init__.py
@@ -22,6 +22,7 @@ def __init__(self, conf):
                                                   use_ssl=conf['use_ssl'],
                                                   verify_certs=conf['verify_certs'],
                                                   ca_certs=conf['ca_certs'],
+                                                  ssl_show_warn=conf['ssl_show_warn'],
                                                   connection_class=RequestsHttpConnection,
                                                   http_auth=conf['http_auth'],
                                                   timeout=conf['es_conn_timeout'],

diff --git a/elastalert/util.py b/elastalert/util.py
@@ -348,6 +348,7 @@ def build_es_conn_config(conf):
     parsed_conf['es_url_prefix'] = ''
     parsed_conf['es_conn_timeout'] = conf.get('es_conn_timeout', 20)
     parsed_conf['send_get_body_as'] = conf.get('es_send_get_body_as', 'GET')
+    parsed_conf['ssl_show_warn'] = conf.get('ssl_show_warn', True)
 
     if os.environ.get('ES_USERNAME'):
         parsed_conf['es_username'] = os.environ.get('ES_USERNAME')