valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for SSL connections and use of custom CA bundle file

Browse Source
This commit is contained in:
Tanoti 2017-01-05 12:01:31 +00:00
parent 10d5dec2b0
commit 926f147d7d
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/elasticsearch.py
View File

@ -27,6 +27,9 @@ Module to provide Elasticsearch compatibility to Salt
elasticsearch:
hosts:
- '10.10.10.100:9200'
use_ssl: True
verify_certs: True
ca_certs: /path/to/custom_ca_bundle.pem
number_of_shards: 1
number_of_replicas: 0
functions_blacklist:
@ -79,6 +82,9 @@ def _get_instance(hosts=None, profile=None):
'''
es = None
proxies = {}
use_ssl = False
ca_certs = False
verify_certs = False
if profile is None:
profile = 'elasticsearch'
@ -92,6 +98,9 @@ def _get_instance(hosts=None, profile=None):
if not hosts:
hosts = _profile.get('hosts', None)
proxies = _profile.get('proxies', {})
use_ssl = _profile.get('use_ssl', False)
ca_certs = _profile.get('ca_certs', False)
verify_certs = _profile.get('verify_certs', False)
if not hosts:
hosts = ['127.0.0.1:9200']
@ -99,7 +108,12 @@ def _get_instance(hosts=None, profile=None):
hosts = [hosts]
try:
if proxies == {}:
es = elasticsearch.Elasticsearch(hosts)
es = elasticsearch.Elasticsearch(
hosts,
use_ssl=use_ssl,
ca_certs=ca_certs,
verify_certs=verify_certs,
)
else:
# Custom connection class to use requests module with proxies
class ProxyConnection(RequestsHttpConnection):
@ -112,6 +126,9 @@ def _get_instance(hosts=None, profile=None):
hosts,
connection_class=ProxyConnection,
proxies=_profile.get('proxies', {}),
use_ssl=use_ssl,
ca_certs=ca_certs,
verify_certs=verify_certs,
)
if not es.ping():
raise CommandExecutionError('Could not connect to Elasticsearch host/ cluster {0}, is it unhealthy?'.format(hosts))