Commit 25c86b17 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Added Analytics and Telemetry dynamic DB Engine configuration

parent 368cbf29

src/analytics/database/AnalyzerEngine.py

+10 −10
Original line number Diff line number Diff line
@@ -23,18 +23,18 @@ class AnalyzerEngine: 
    def get_engine() -> sqlalchemy.engine.Engine:

        crdb_uri = get_setting('CRDB_URI', default=None)

        if crdb_uri is None:

            CRDB_NAMESPACE = "crdb"

            CRDB_SQL_PORT  = "26257"

            CRDB_DATABASE  = "tfs-analyzer"

            CRDB_USERNAME  = "tfs"

            CRDB_PASSWORD  = "tfs123"

            CRDB_SSLMODE   = "require"

            CRDB_NAMESPACE = get_setting('CRDB_NAMESPACE')

            CRDB_SQL_PORT  = get_setting('CRDB_SQL_PORT')

            CRDB_DATABASE  = "tfs-analyzer"             # TODO: define variable get_setting('CRDB_DATABASE_KPI_MGMT')

            CRDB_USERNAME  = get_setting('CRDB_USERNAME')

            CRDB_PASSWORD  = get_setting('CRDB_PASSWORD')

            CRDB_SSLMODE   = get_setting('CRDB_SSLMODE')

            crdb_uri = CRDB_URI_TEMPLATE.format(

                CRDB_USERNAME, CRDB_PASSWORD, CRDB_NAMESPACE, CRDB_SQL_PORT, CRDB_DATABASE, CRDB_SSLMODE)

        try:

            engine = sqlalchemy.create_engine(crdb_uri, echo=False)

            LOGGER.info(' AnalyzerDB initalized with DB URL: {:}'.format(crdb_uri))

        except: 

        except: # pylint: disable=bare-except # pragma: no cover

            LOGGER.exception('Failed to connect to database: {:s}'.format(str(crdb_uri)))

            return None 

            return None # type: ignore

        return engine

src/telemetry/database/TelemetryEngine.py

+9 −11
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ import logging, sqlalchemy 
from common.Settings import get_setting



LOGGER = logging.getLogger(__name__)



# CRDB_URI_TEMPLATE = 'cockroachdb://{:s}:{:s}@127.0.0.1:{:s}/{:s}?sslmode={:s}'

CRDB_URI_TEMPLATE = 'cockroachdb://{:s}:{:s}@cockroachdb-public.{:s}.svc.cluster.local:{:s}/{:s}?sslmode={:s}'



class TelemetryEngine:
@@ -25,12 +23,12 @@ class TelemetryEngine: 
    def get_engine() -> sqlalchemy.engine.Engine:

        crdb_uri = get_setting('CRDB_URI', default=None)

        if crdb_uri is None:

            CRDB_NAMESPACE = "crdb"

            CRDB_SQL_PORT  = "26257"

            CRDB_DATABASE  = "tfs-telemetry"

            CRDB_USERNAME  = "tfs"

            CRDB_PASSWORD  = "tfs123"

            CRDB_SSLMODE   = "require"

            CRDB_NAMESPACE = get_setting('CRDB_NAMESPACE')

            CRDB_SQL_PORT  = get_setting('CRDB_SQL_PORT')

            CRDB_DATABASE  = "tfs-telemetry"             # TODO: define variable get_setting('CRDB_DATABASE_KPI_MGMT')

            CRDB_USERNAME  = get_setting('CRDB_USERNAME')

            CRDB_PASSWORD  = get_setting('CRDB_PASSWORD')

            CRDB_SSLMODE   = get_setting('CRDB_SSLMODE')

            crdb_uri = CRDB_URI_TEMPLATE.format(

                CRDB_USERNAME, CRDB_PASSWORD, CRDB_NAMESPACE, CRDB_SQL_PORT, CRDB_DATABASE, CRDB_SSLMODE)

        try:
@@ -39,4 +37,4 @@ class TelemetryEngine: 
        except: # pylint: disable=bare-except # pragma: no cover

            LOGGER.exception('Failed to connect to database: {:s}'.format(str(crdb_uri)))

            return None # type: ignore

        return engine # type: ignore
 
        return engine