Commit b3341edc authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Monitoring component: 

- updated name of variable containing target table
parent 9243a1e6

src/monitoring/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ unit_test monitoring: 
    - docker pull questdb/questdb

    - docker run --name questdb -d -p 9000:9000  -p 9009:9009  -p 8812:8812  -p 9003:9003  -e QDB_CAIRO_COMMIT_LAG=1000 -e QDB_CAIRO_MAX_UNCOMMITTED_ROWS=100000 --network=teraflowbridge --rm questdb/questdb

    - sleep 10

    - docker run --name $IMAGE_NAME -d -p 7070:7070 --env METRICSDB_HOSTNAME=questdb --env METRICSDB_ILP_PORT=9009 --env METRICSDB_REST_PORT=9000 --env METRICSDB_TABLE=monitoring -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - docker run --name $IMAGE_NAME -d -p 7070:7070 --env METRICSDB_HOSTNAME=questdb --env METRICSDB_ILP_PORT=9009 --env METRICSDB_REST_PORT=9000 --env METRICSDB_TABLE_MONITORING_KPIS=tfs_monitoring_kpis -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 30

    - docker ps -a

    - docker logs $IMAGE_NAME

src/monitoring/service/MonitoringServiceServicerImpl.py

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ MONITORING_INCLUDEKPI_COUNTER = Counter('monitoring_includekpi_counter', 'Monito 
METRICSDB_HOSTNAME = os.environ.get("METRICSDB_HOSTNAME")

METRICSDB_ILP_PORT = os.environ.get("METRICSDB_ILP_PORT")

METRICSDB_REST_PORT = os.environ.get("METRICSDB_REST_PORT")

METRICSDB_TABLE = os.environ.get("METRICSDB_TABLE")

METRICSDB_TABLE_MONITORING_KPIS = os.environ.get("METRICSDB_TABLE_MONITORING_KPIS")



class MonitoringServiceServicerImpl(MonitoringServiceServicer):

    def __init__(self, name_mapping : NameMapping):
@@ -57,7 +57,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 
        self.management_db = ManagementDBTools.ManagementDB('monitoring.db')

        self.deviceClient = DeviceClient()

        self.metrics_db = MetricsDBTools.MetricsDB(

            METRICSDB_HOSTNAME, name_mapping, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE)

            METRICSDB_HOSTNAME, name_mapping, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE_MONITORING_KPIS)

        self.subs_manager = SubscriptionManager(self.metrics_db)

        self.alarm_manager = AlarmManager(self.metrics_db)

        LOGGER.info('MetricsDB initialized')
@@ -592,8 +592,8 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 
                LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id)))

                response.kpi_id.kpi_id.uuid = "NoID"

            else:

                query = f"SELECT kpi_id, timestamp, kpi_value FROM {METRICSDB_TABLE} WHERE kpi_id = '{kpi_id}' " \

                        f"LATEST ON timestamp PARTITION BY kpi_id"

                query = f"SELECT kpi_id, timestamp, kpi_value FROM {METRICSDB_TABLE_MONITORING_KPIS} " \

                        f"WHERE kpi_id = '{kpi_id}' LATEST ON timestamp PARTITION BY kpi_id"

                data = self.metrics_db.run_query(query)

                LOGGER.debug(data)

                if len(data) == 0:

src/monitoring/tests/test_unitary.py

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ os.environ[get_env_var_name(ServiceNameEnum.MONITORING, ENVVAR_SUFIX_SERVICE_POR 
METRICSDB_HOSTNAME = os.environ.get('METRICSDB_HOSTNAME')

METRICSDB_ILP_PORT = os.environ.get('METRICSDB_ILP_PORT')

METRICSDB_REST_PORT = os.environ.get('METRICSDB_REST_PORT')

METRICSDB_TABLE = os.environ.get('METRICSDB_TABLE')

METRICSDB_TABLE_MONITORING_KPIS = os.environ.get('METRICSDB_TABLE_MONITORING_KPIS')



LOGGER = logging.getLogger(__name__)
@@ -193,7 +193,7 @@ def management_db(): 
def metrics_db(monitoring_service : MonitoringService): # pylint: disable=redefined-outer-name

    return monitoring_service.monitoring_servicer.metrics_db

    #_metrics_db = MetricsDBTools.MetricsDB(

    #    METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE)

    #    METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE_MONITORING_KPIS)

    #return _metrics_db



@pytest.fixture(scope='session')