diff --git a/api/chalicelib/core/alerts/alerts_processor.py b/api/chalicelib/core/alerts/alerts_processor.py index f07b4984e..f56e0cf04 100644 --- a/api/chalicelib/core/alerts/alerts_processor.py +++ b/api/chalicelib/core/alerts/alerts_processor.py @@ -4,7 +4,8 @@ from pydantic_core._pydantic_core import ValidationError import schemas from chalicelib.core.alerts import alerts, alerts_listener -from chalicelib.core.alerts.modules import sessions, alert_helpers +from chalicelib.core.alerts.modules import alert_helpers +from chalicelib.core.sessions import sessions_pg as sessions from chalicelib.utils import pg_client from chalicelib.utils.TimeUTC import TimeUTC @@ -131,6 +132,7 @@ def Build(a): def process(): + logger.info("> processing alerts on PG") notifications = [] all_alerts = alerts_listener.get_all_alerts() with pg_client.PostgresClient() as cur: diff --git a/api/chalicelib/core/alerts/alerts_processor_ch.py b/api/chalicelib/core/alerts/alerts_processor_ch.py index c8ea00c2c..30368d2de 100644 --- a/api/chalicelib/core/alerts/alerts_processor_ch.py +++ b/api/chalicelib/core/alerts/alerts_processor_ch.py @@ -5,8 +5,9 @@ from pydantic_core._pydantic_core import ValidationError import schemas from chalicelib.utils import pg_client, ch_client, exp_ch_helper from chalicelib.utils.TimeUTC import TimeUTC -from . import alerts, alerts_listener -from .modules import sessions, alert_helpers +from chalicelib.core.alerts import alerts, alerts_listener +from chalicelib.core.alerts.modules import alert_helpers +from chalicelib.core.sessions import sessions_ch as sessions logger = logging.getLogger(__name__) @@ -155,6 +156,7 @@ def Build(a): def process(): + logger.info("> processing alerts on CH") notifications = [] all_alerts = alerts_listener.get_all_alerts() with pg_client.PostgresClient() as cur, ch_client.ClickHouseClient() as ch_cur: diff --git a/api/chalicelib/core/alerts/modules/__init__.py b/api/chalicelib/core/alerts/modules/__init__.py index e1794eed7..9aa7cd6c8 100644 --- a/api/chalicelib/core/alerts/modules/__init__.py +++ b/api/chalicelib/core/alerts/modules/__init__.py @@ -1,9 +1,3 @@ -from decouple import config - TENANT_ID = "-1" -if config("EXP_ALERTS", cast=bool, default=False): - import chalicelib.core.sessions.sessions_ch as sessions -else: - import chalicelib.core.sessions.sessions_pg as sessions from . import helpers as alert_helpers diff --git a/ee/api/chalicelib/core/alerts/modules/__init__.py b/ee/api/chalicelib/core/alerts/modules/__init__.py index e84b08b9f..066c80221 100644 --- a/ee/api/chalicelib/core/alerts/modules/__init__.py +++ b/ee/api/chalicelib/core/alerts/modules/__init__.py @@ -1,15 +1,3 @@ -from decouple import config - TENANT_ID = "tenant_id" -if config("EXP_ALERTS", cast=bool, default=False): - if config("EXP_SESSIONS_SEARCH", cast=bool, default=False): - import chalicelib.core.sessions.sessions_pg as sessions - else: - import chalicelib.core.sessions.sessions_ch as sessions -else: - if config("EXP_SESSIONS_SEARCH", cast=bool, default=False): - import chalicelib.core.sessions.sessions_ch as sessions - else: - import chalicelib.core.sessions.sessions_pg as sessions from . import helpers as alert_helpers