diff --git a/src/kpi_manager/database/KpiModel.py b/src/kpi_manager/database/KpiModel.py index 169f9d2652cc6656128ca8d6ff671ca7abab6e46..62596d0c964487013d659e945deccc9c5390e9ae 100644 --- a/src/kpi_manager/database/KpiModel.py +++ b/src/kpi_manager/database/KpiModel.py @@ -18,7 +18,6 @@ from sqlalchemy import Column, Integer, String, Text from sqlalchemy.orm import registry from common.proto.kpi_manager_pb2 import KpiDescriptor -logging.basicConfig(level=logging.INFO) LOGGER = logging.getLogger(__name__) # Create a base class for declarative models diff --git a/src/kpi_manager/service/KpiManagerServiceServicerImpl.py b/src/kpi_manager/service/KpiManagerServiceServicerImpl.py index da3eefe788f61f99e192c5820440928c93c38c79..86683898a5af81ebd605a749b35c3fb3d289280c 100644 --- a/src/kpi_manager/service/KpiManagerServiceServicerImpl.py +++ b/src/kpi_manager/service/KpiManagerServiceServicerImpl.py @@ -35,7 +35,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): self, request: KpiDescriptor, grpc_context: grpc.ServicerContext # type: ignore ) -> KpiId: # type: ignore response = KpiId() - LOGGER.info("Received gRPC message object: {:}".format(request)) + LOGGER.debug(f"SetKpiDescriptor - Received gRPC message object: {request}") kpi_to_insert = KpiModel.convert_KpiDescriptor_to_row(request) if self.kpi_db_obj.add_row_to_db(kpi_to_insert): response.kpi_id.uuid = request.kpi_id.kpi_id.uuid @@ -47,11 +47,11 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): self, request: KpiId, grpc_context: grpc.ServicerContext # type: ignore ) -> KpiDescriptor: # type: ignore response = KpiDescriptor() - LOGGER.info("Received gRPC message object: {:}".format(request)) + LOGGER.debug(f"GetKpiDescriptor - Received gRPC message object: {request}") kpi_id_to_search = request.kpi_id.uuid row = self.kpi_db_obj.search_db_row_by_id(KpiModel, 'kpi_id', kpi_id_to_search) if row is None: - LOGGER.info('No matching row found kpi id: {:}'.format(kpi_id_to_search)) + LOGGER.error(f"No matching row found kpi id: {kpi_id_to_search}") raise NotFoundException('KpiDescriptor', kpi_id_to_search) response = KpiModel.convert_row_to_KpiDescriptor(row) return response @@ -60,7 +60,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): def DeleteKpiDescriptor( self, request: KpiId, grpc_context: grpc.ServicerContext # type: ignore ) -> Empty: # type: ignore - LOGGER.info("Received gRPC message object: {:}".format(request)) + LOGGER.debug(f"DeleteKpiDescriptor - Received gRPC message object: {request}") kpi_id_to_search = request.kpi_id.uuid self.kpi_db_obj.delete_db_row_by_id(KpiModel, 'kpi_id', kpi_id_to_search) return Empty() @@ -69,7 +69,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): def SelectKpiDescriptor( self, filter: KpiDescriptorFilter, grpc_context: grpc.ServicerContext # type: ignore ) -> KpiDescriptorList: # type: ignore - LOGGER.info("Received gRPC message object: {:}".format(filter)) + LOGGER.debug(f"SelectKpiDescriptor - Received gRPC message object: {filter}") response = KpiDescriptorList() rows = self.kpi_db_obj.select_with_filter(KpiModel, filter) for row in rows: diff --git a/src/kpi_manager/service/__main__.py b/src/kpi_manager/service/__main__.py index 936a8fb3da1aaec16b37e98d71ac446a1d7ad117..0421fc6a1542264c520ad9861334bf7562130cf0 100644 --- a/src/kpi_manager/service/__main__.py +++ b/src/kpi_manager/service/__main__.py @@ -30,7 +30,7 @@ def main(): global LOGGER # pylint: disable=global-statement log_level = get_log_level() - logging.basicConfig(level=log_level) + logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s") LOGGER = logging.getLogger(__name__) signal.signal(signal.SIGINT, signal_handler) diff --git a/src/kpi_value_api/service/__main__.py b/src/kpi_value_api/service/__main__.py index 062856874bbe24a6407bd15fe3854b8780c25ad3..be6596e9835cf2b39638e38b6ee63ff07e8324d3 100644 --- a/src/kpi_value_api/service/__main__.py +++ b/src/kpi_value_api/service/__main__.py @@ -27,7 +27,7 @@ def main(): global LOGGER # pylint: disable=global-statement log_level = get_log_level() - logging.basicConfig(level=log_level) + logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s") LOGGER = logging.getLogger(__name__) signal.signal(signal.SIGINT, signal_handler) diff --git a/src/kpi_value_writer/service/KpiValueWriter.py b/src/kpi_value_writer/service/KpiValueWriter.py index fa4d482b583ed69e16563e6aa8944c837f0a0ba4..fe84fabaa15996833523a1301f78bc5506431db1 100644 --- a/src/kpi_value_writer/service/KpiValueWriter.py +++ b/src/kpi_value_writer/service/KpiValueWriter.py @@ -49,21 +49,21 @@ class KpiValueWriter(GenericGrpcService): consumer = self.kafka_consumer consumer.subscribe([KafkaTopic.VALUE.value]) - LOGGER.debug("Kafka Consumer start listenng on topic: {:}".format(KafkaTopic.VALUE.value)) + LOGGER.debug(f"Kafka Consumer start listening on topic: {KafkaTopic.VALUE.value}") while True: raw_kpi = consumer.poll(1.0) if raw_kpi is None: continue elif raw_kpi.error(): if raw_kpi.error().code() != KafkaError._PARTITION_EOF: - print("Consumer error: {}".format(raw_kpi.error())) + LOGGER.debug(f"Consumer error: {raw_kpi.error()}") continue try: kpi_value = json.loads(raw_kpi.value().decode('utf-8')) - LOGGER.info("Received KPI : {:}".format(kpi_value)) + LOGGER.debug(f"Received KPI: {kpi_value}") self.get_kpi_descriptor(kpi_value, kpi_manager_client, metric_writer) - except: - LOGGER.exception("Error detail: ") + except Exception as ex: + LOGGER.exception(f"Error detail: {ex}") continue def get_kpi_descriptor(self, kpi_value: str, kpi_manager_client, metric_writer): @@ -73,9 +73,9 @@ class KpiValueWriter(GenericGrpcService): kpi_descriptor_object = KpiDescriptor() kpi_descriptor_object = kpi_manager_client.GetKpiDescriptor(kpi_id) if kpi_descriptor_object.kpi_id.kpi_id.uuid == kpi_id.kpi_id.uuid: - LOGGER.info("Extracted KpiDescriptor: {:}".format(kpi_descriptor_object)) + LOGGER.debug(f"Extracted KpiDescriptor: {kpi_descriptor_object}") metric_writer.create_and_expose_cooked_kpi(kpi_descriptor_object, kpi_value) else: - LOGGER.info("No KPI Descriptor found in Database for Kpi ID: {:}".format(kpi_id)) + LOGGER.warning(f"No KPI Descriptor found in Database for KPI ID: {kpi_id}") except: LOGGER.exception("Unable to get KpiDescriptor") diff --git a/src/kpi_value_writer/service/__main__.py b/src/kpi_value_writer/service/__main__.py index e90bdf9bd105a112b5d83ae6ce50a7c7588b27fb..ddda5173a0449a342a0d4246ce8ca0bd1f08b253 100644 --- a/src/kpi_value_writer/service/__main__.py +++ b/src/kpi_value_writer/service/__main__.py @@ -27,7 +27,7 @@ def main(): global LOGGER # pylint: disable=global-statement log_level = get_log_level() - logging.basicConfig(level=log_level) + logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s") LOGGER = logging.getLogger(__name__) signal.signal(signal.SIGINT, signal_handler) diff --git a/src/service/service/service_handlers/l3nm_ryu/L3NMRyuServiceHandler.py b/src/service/service/service_handlers/l3nm_ryu/L3NMRyuServiceHandler.py index 4a7ad333b3ee9113c191596b1929e1e920f38448..e3de3553d6f108352326fcae7f3ff41524b68d90 100644 --- a/src/service/service/service_handlers/l3nm_ryu/L3NMRyuServiceHandler.py +++ b/src/service/service/service_handlers/l3nm_ryu/L3NMRyuServiceHandler.py @@ -24,7 +24,6 @@ from service.service.service_handler_api._ServiceHandler import _ServiceHandler from service.service.service_handler_api.SettingsHandler import SettingsHandler from service.service.task_scheduler.TaskExecutor import TaskExecutor -logging.basicConfig(level=logging.DEBUG) LOGGER = logging.getLogger(__name__) METRICS_POOL = MetricsPool('Service', 'Handler', labels={'handler': 'l3nm_ryu'}) diff --git a/src/telemetry/backend/service/collectors/gnmi_oc/GnmiOpenConfigCollector.py b/src/telemetry/backend/service/collectors/gnmi_oc/GnmiOpenConfigCollector.py index 44b1691352262f3b02f6e7cffa0dc1fc7259c551..c383e1cabe717b4b68756560f1fc5023dc969868 100644 --- a/src/telemetry/backend/service/collectors/gnmi_oc/GnmiOpenConfigCollector.py +++ b/src/telemetry/backend/service/collectors/gnmi_oc/GnmiOpenConfigCollector.py @@ -14,6 +14,7 @@ import logging, pytz, queue +from common.Settings import get_log_level from datetime import datetime from typing import Dict, Optional, Tuple, List, Union, Any, Iterator from pygnmi.client import gNMIclient @@ -22,7 +23,7 @@ from .PathMapper import PathMapper from .SubscriptionNew import Subscription logging.basicConfig( - level=logging.DEBUG, + level=get_log_level(), format="%(asctime)s %(levelname)8s [%(name)s - %(funcName)s()]: %(message)s", ) diff --git a/src/telemetry/database/TelemetryModel.py b/src/telemetry/database/TelemetryModel.py index 8238d47c6aeff033cbd7e63b05b9cc88f1768d55..6eaf4180577d76a94a1ebde6b057fd4c0d442bf8 100644 --- a/src/telemetry/database/TelemetryModel.py +++ b/src/telemetry/database/TelemetryModel.py @@ -18,7 +18,6 @@ from sqlalchemy import Column, String, Float from sqlalchemy.orm import registry from common.proto import telemetry_frontend_pb2 -logging.basicConfig(level=logging.INFO) LOGGER = logging.getLogger(__name__) # Create a base class for declarative models