feat(quickwit): some fixes after some tests

Signed-off-by: Idriss Neumann <idriss.neumann@comwork.io>

elastalert/__init__.py

@@ -9,7 +9,7 @@
 
 
 class ElasticSearchClient(Elasticsearch):
-    """ Extension of low level :class:`Elasticsearch` client with additional version resolving features """
+    """ Extension of low level :class:`Elasticsearch` client with additional features """
 
     def __init__(self, conf):
         """
@@ -31,7 +31,9 @@ def __init__(self, conf):
                                                   client_cert=conf['client_cert'],
                                                   client_key=conf['client_key'])
         self._conf = copy.copy(conf)
+        self._http_client_infos = util.http_client_infos(conf.get('es_host'), conf['es_port'], conf['use_ssl'], conf['headers'], conf['http_auth'])
         self._es_version = None
+        self._es_distribution = None
 
     @property
     def conf(self):
@@ -40,6 +42,25 @@ def conf(self):
         """
         return self._conf
 
+    @property
+    def http_client_infos(self):
+        """
+        Returns the http client infos
+        Useful when the elastic client is not handling some endpoints
+        """
+        return self._http_client_infos
+
+    @property
+    def es_distribution(self):
+        """
+        Returns the reported distribution from the Elasticsearch server.
+        """
+        if self._es_version is None:
+            (distribution, _) = util.get_version_from_cluster_info(self)
+            self._es_distribution = distribution if util.is_not_empty(distribution) else "elasticsearch"
+
+        return self._es_distribution
+
     @property
     def es_version(self):
         """

elastalert/create_index.py

@@ -17,7 +17,7 @@
 from envparse import Env
 
 from elastalert.auth import Auth
-from elastalert.util import _quickwit_url_prefix, get_version_from_cluster_info, is_true, is_empty, is_response_ok
+from elastalert.util import _quickwit_url_prefix, get_version_from_cluster_info, http_client_infos, is_true, is_empty, is_response_ok
 
 env = Env(ES_USE_SSL=bool)
 
@@ -272,9 +272,11 @@ def main():
     if api_key is not None:
         headers.update({'Authorization': f'ApiKey {api_key}'})
 
-    if is_true(qw_enable) and not is_empty(url_prefix):
+    if is_true(qw_enable) and is_empty(url_prefix):
         url_prefix=_quickwit_url_prefix
 
+    print("Open an Elasticsearch connection to host = {}, port = {}, url_prefix = {}, use_ssl = {}".format(host, port, url_prefix, use_ssl))
+
     es = Elasticsearch(
         host=host,
         port=port,
@@ -290,11 +292,7 @@ def main():
         ca_certs=ca_certs,
         client_key=client_key)
 
-    client_infos = {
-        'url': "{}://{}:{}".format("https" if use_ssl else "http", host, port),
-        'headers': headers,
-        'http_auth': http_auth
-    }
+    client_infos = http_client_infos(host, port, headers, http_auth)
     create_index_mappings(es_client=es, ea_index=index, client_infos=client_infos, recreate=args.recreate, old_ea_index=old_index)
 
 

elastalert/util.py

@@ -670,3 +670,11 @@ def get_version_from_cluster_info(client):
             time.sleep(3)
 
     return (distribution, esversion)
+
+
+def http_client_infos(host, port, use_ssl, headers, http_auth):
+    return {
+        'url': "{}://{}:{}".format("https" if use_ssl else "http", host, port),
+        'headers': headers,
+        'http_auth': http_auth
+    }

tests/elasticsearch_test.py

@@ -39,6 +39,34 @@ def test_es_version(es_client):
         assert version == "1.2.3"
 
 
+def test_es_distribution_notempty(es_client):
+    mockInfo = {}
+    versionData = {}
+    versionData['number'] = "1.2.3"
+    versionData['distribution'] = "quickwit"
+    mockInfo['version'] = versionData
+
+    with mock.patch('elasticsearch.client.Elasticsearch.info', new=MagicMock(return_value=mockInfo)):
+        distribution = es_client.es_distribution
+        assert distribution == "quickwit"
+
+
+def test_es_distribution_empty(es_client):
+    mockInfo = {}
+    versionData = {}
+    versionData['number'] = "1.2.3"
+    mockInfo['version'] = versionData
+
+    with mock.patch('elasticsearch.client.Elasticsearch.info', new=MagicMock(return_value=mockInfo)):
+        distribution = es_client.es_distribution
+        assert distribution == "elasticsearch"
+
+
+def test_es_http_client_info(es_client):
+    http_client_infos = es_client.http_client_infos
+    assert http_client_infos['url'] == "http://127.0.0.1:9200"
+
+
 @pytest.mark.elasticsearch
 class TestElasticsearch(object):
     # TODO perform teardown removing data inserted into Elasticsearch

tests/util_test.py

@@ -44,6 +44,7 @@
 from elastalert.util import is_not_empty
 from elastalert.util import is_empty
 from elastalert.util import is_response_ok
+from elastalert.util import http_client_infos
 
 from elasticsearch.client import Elasticsearch
 
@@ -752,3 +753,11 @@ def test_is_true(input, result):
 ])
 def test_is_response_ok(code, result):
     assert is_response_ok(code) == result
+
+
+@pytest.mark.parametrize('use_ssl, expected', [
+    (True, 'https://host:9200'),
+    (False, 'http://host:9200')
+])
+def test_http_client_infos(use_ssl, expected):
+    assert http_client_infos('host', 9200, use_ssl, {}, None)['url'] == expected