howler-api 3.1.0.dev390__py3-none-any.whl → 3.1.0.dev392__py3-none-any.whl

howler/datastore/collection.py

@@ -377,10 +377,10 @@ class ESCollection(Generic[ModelType]):
                 elasticsearch.exceptions.AuthenticationException,
             ) as e:
                 if not isinstance(e, SearchRetryException):
-                    logger.warning(
+                    logger.exception(
                         f"No connection to Elasticsearch server(s): "
                         f"{' | '.join(self.datastore.get_hosts(safe=True))}"
-                        f", because [{e}] retrying {func.__name__}..."
+                        f", because [{str(e)}] retrying {func.__name__}..."  # noqa: TRY401
                     )
 
                 time.sleep(min(retries, self.MAX_RETRY_BACKOFF))

howler/datastore/store.py

@@ -4,18 +4,28 @@ import logging
 import os
 import re
 from os import environ
+from pathlib import Path
 from typing import Any, Optional, cast
 from urllib.parse import urlparse
 
 import elasticsearch
 import elasticsearch.client
 
+from howler.common.logging.format import HWL_DATE_FORMAT, HWL_LOG_FORMAT
 from howler.datastore.collection import ESCollection
 from howler.datastore.exceptions import DataStoreException
 from howler.odm.models.config import Config
 from howler.odm.models.config import config as _config
 
 TRANSPORT_TIMEOUT = int(environ.get("HWL_DATASTORE_TRANSPORT_TIMEOUT", "10"))
+CERTS_PATH = Path(os.environ.get("HWL_CERT_DIRECTORY", "/etc/howler/certs"))
+
+logger = logging.getLogger("howler.datastore.store")
+logger.setLevel(logging.INFO)
+console = logging.StreamHandler()
+console.setLevel(logging.INFO)
+console.setFormatter(logging.Formatter(HWL_LOG_FORMAT, HWL_DATE_FORMAT))
+logger.addHandler(console)
 
 
 class ESStore(object):
@@ -58,9 +68,23 @@ class ESStore(object):
         self._username: Optional[str] = None
         self._password: Optional[str] = None
         self._hosts = []
+        self._cert: str | None = None
 
         for host in config.datastore.hosts:
             self._hosts.append(str(host))
+
+            cert = CERTS_PATH / f"{host.name}.crt"
+            if cert.exists():
+                if self._cert is None:
+                    self._cert = str(cert)
+                    logger.info("Using certificate %s for elasticsearch network traffic", self._cert)
+                else:
+                    logger.error("Only a single certificate path is supported - ignoring additional paths.")
+                    logger.error(
+                        "If you have multiple certificates, bundle them into a single .pem file and specify "
+                        "it for the first host."
+                    )
+
             if os.getenv(f"{host.name.upper()}_HOST_APIKEY_ID", None) is not None:
                 self._apikey = (
                     os.environ[f"{host.name.upper()}_HOST_APIKEY_ID"],
@@ -81,6 +105,7 @@ class ESStore(object):
         if self._apikey is not None:
             self.client = elasticsearch.Elasticsearch(
                 hosts=self._hosts,  # type: ignore
+                ca_certs=self._cert,  # type: ignore
                 api_key=self._apikey,
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
@@ -88,6 +113,7 @@ class ESStore(object):
         elif self._username is not None and self._password is not None:
             self.client = elasticsearch.Elasticsearch(
                 hosts=self._hosts,  # type: ignore
+                ca_certs=self._cert,  # type: ignore
                 basic_auth=(self._username, self._password),
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
@@ -95,6 +121,7 @@ class ESStore(object):
         else:
             self.client = elasticsearch.Elasticsearch(
                 hosts=self._hosts,  # type: ignore
+                ca_certs=self._cert,  # type: ignore
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
             )

{howler_api-3.1.0.dev390.dist-info → howler_api-3.1.0.dev392.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 3.1.0.dev390
+Version: 3.1.0.dev392
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-3.1.0.dev390.dist-info → howler_api-3.1.0.dev392.dist-info}/RECORD

@@ -53,14 +53,14 @@ howler/cronjobs/view_cleanup.py,sha256=ULWLR1uFcRemRgkEDrMqmBamHiE0dgDvu49VK0qDk
 howler/datastore/README.md,sha256=ekWl1YJSrHlZpU5PgBkPEzPWjdbTdav6Rd2P0ccIesw,4758
 howler/datastore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/datastore/bulk.py,sha256=VfolZfiaBD4ZTK3j6IVVVq4GMjVXb5elrsGwwM_nONE,2829
-howler/datastore/collection.py,sha256=joi4-lUMWGH1DBO3ag36GriSI7J2n-UpIfb1-KaBdTU,91191
+howler/datastore/collection.py,sha256=1VuWTShCVIo3afye9gM7uSpAvSGvqm7j6w0ZOUEX9N8,91214
 howler/datastore/constants.py,sha256=x7ODomtOQmDjmXoAxly4onPAnUkq4BLZ1TBg-UgpU1g,2415
 howler/datastore/exceptions.py,sha256=yZvQXRI4mR50ltGFHbdZAD4TIbhdKJku6LLTPQ0JZRk,955
 howler/datastore/howler_store.py,sha256=kW7FKM-tILcfTmrjSB1yZm-ZnumPS_tiQEZUDaQoDkg,2915
 howler/datastore/migrations/fix_process.py,sha256=J0FxqcXbQ161sgmQ5teyEcPuX7WYB9wqs0CO8m1jk0U,1218
 howler/datastore/operations.py,sha256=5WdJBewXRIG71ZexQcYASv0IYoDi1m9ia8332u5mXSs,3919
 howler/datastore/schemas.py,sha256=kuxqYVWMgqnrdU-ypkDxoSzEtECUrRCKXjU_R5Kg7X4,3158
-howler/datastore/store.py,sha256=MzIvZy8deMgpnKR-TKTTcttH6kkYy4EBSYMCh0Q-J0E,7055
+howler/datastore/store.py,sha256=SvCDaGuZwkx3d0ii-Higg6afITDshtXKQfeBvuXiqDE,8289
 howler/datastore/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/datastore/support/build.py,sha256=iBVfWophzoPlx6rvR5w3Axb6gjqLuDeDBpKj7lO-1l0,7877
 howler/datastore/support/schemas.py,sha256=kuxqYVWMgqnrdU-ypkDxoSzEtECUrRCKXjU_R5Kg7X4,3158
@@ -192,7 +192,7 @@ howler/utils/path.py,sha256=DfOU4i4zSs4wchHoE8iE7aWVLkTxiC_JRGepF2hBYBk,690
 howler/utils/socket_utils.py,sha256=nz1SklC9xBHUSfHyTJjpq3mbozX1GDf01WzdGxfaUII,2212
 howler/utils/str_utils.py,sha256=HE8Hqh2HlOLaj16w0H9zKOyDJLp-f1LQ50y_WeGZaEk,8389
 howler/utils/uid.py,sha256=p9dsqyvZ-lpiAuzZWCPCeEM99kdk0Ly9czf04HNdSuw,1341
-howler_api-3.1.0.dev390.dist-info/METADATA,sha256=B6KC111Nk4ffzkOiq9qvKN2Aux-eiRPsKc3FzGk7ybU,2804
-howler_api-3.1.0.dev390.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-howler_api-3.1.0.dev390.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
-howler_api-3.1.0.dev390.dist-info/RECORD,,
+howler_api-3.1.0.dev392.dist-info/METADATA,sha256=fF6W3KTMSNqqSwcwjZoLozEVP_Gi2cVKNvqGi0iRnVw,2804
+howler_api-3.1.0.dev392.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+howler_api-3.1.0.dev392.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
+howler_api-3.1.0.dev392.dist-info/RECORD,,