Merge pull request #86 from pitangainnovare/fix/verify-certs

Fix/verify certs

Author: pitangainnovare

VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

config/settings/base.py

@@ -410,3 +410,4 @@
 ES_INDEX_NAME = env("ES_INDEX_NAME", default="usage-daily")
 ES_API_KEY = env("ES_API_KEY", default="")
 ES_BASIC_AUTH = env("ES_BASIC_AUTH", default=("elastic", "iHktg66E"))
+ES_VERIFY_CERTS = env.bool("ES_VERIFY_CERTS", default=False)

metrics/es.py

@@ -4,13 +4,14 @@
 import logging
 
 
-def get_elasticsearch_client(url=None, basic_auth=None, api_key=None):
+def get_elasticsearch_client(url=None, basic_auth=None, api_key=None, verify_certs=False):
     """
     Create an Elasticsearch client instance using Django settings.
 
     :param url: Elasticsearch URL. If None, it will be taken from Django settings.
     :param basic_auth: Basic authentication credentials. If None, it will be taken from Django settings.
     :param api_key: API key. If None, it will be taken from Django settings.
+    :param verify_certs: Whether to verify SSL certificates. If None, it will be taken from Django settings.
     """
     if not url:
         url = getattr(settings, "ES_URL", None)
@@ -21,12 +22,15 @@ def get_elasticsearch_client(url=None, basic_auth=None, api_key=None):
     if not api_key:
         api_key = getattr(settings, "ES_API_KEY", None)
 
+    if not verify_certs:
+        verify_certs = getattr(settings, "ES_VERIFY_CERTS", False)
+
     if basic_auth:
-        client = Elasticsearch(url, basic_auth=basic_auth)
+        client = Elasticsearch(url, basic_auth=basic_auth, verify_certs=verify_certs)
     elif api_key:
-        client = Elasticsearch(url, api_key=api_key)
+        client = Elasticsearch(url, api_key=api_key, verify_certs=verify_certs)
     else:
-        client = Elasticsearch(url)
+        client = Elasticsearch(url, verify_certs=verify_certs)
 
     return client