Commit f67066bd authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Some other changes for KPI value api and writer

parent ceaeba27

src/common/Constants.py

+3 −3
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ class ServiceNameEnum(Enum): 
    ZTP                    = 'ztp'

    POLICY                 = 'policy'

    MONITORING             = 'monitoring'

    KPIMANAGER             = 'kpiManager'

    KPIVALUEAPI            = 'kpiValueApi'

    TELEMETRYFRONTEND      = 'telemetryfrontend'

    KPIMANAGER             = 'kpi_manager'

    KPIVALUEAPI            = 'kpi_value_api'

    TELEMETRYFRONTEND      = 'telemetry_frontend'

    DLT                    = 'dlt'

    NBI                    = 'nbi'

    CYBERSECURITY          = 'cybersecurity'

src/kpi_manager/service/KpiManagerServiceServicerImpl.py

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    def GetKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext # type: ignore

                         ) -> KpiDescriptor: # type: ignore

        response = KpiDescriptor()

        print("--> Received gRPC message object: {:}".format(request))

        LOGGER.debug("Received gRPC message object: {:}".format(request))

        try: 

            kpi_id_to_search = request.kpi_id.uuid

src/kpi_value_writer/service/KpiValueWriter.py

+15 −2
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ from kpi_manager.client.KpiManagerClient import KpiManagerClient 
from monitoring.service.NameMapping import NameMapping

from kpi_manager.service.KpiManagerService import KpiManagerService



# -- test import --

from kpi_value_writer.tests.test_messages import create_kpi_descriptor_request

from .MetricWriterToPrometheus import MetricWriterToPrometheus





LOGGER           = logging.getLogger(__name__)

ACTIVE_CONSUMERS = []
@@ -48,6 +52,8 @@ class KpiValueWriter: 
              'group.id'          : __class__,

              'auto.offset.reset' : 'latest'}

        )

        metric_writer_to_prom = MetricWriterToPrometheus()

        

        kafka_consumer.subscribe([KafkaTopic.VALUE.value])

        LOGGER.debug("Kafka Consumer start listenng on topic: {:}".format(KafkaTopic.VALUE.value))

        print("Kafka Consumer start listenng on topic: {:}".format(KafkaTopic.VALUE.value))
@@ -66,13 +72,20 @@ class KpiValueWriter: 
                kpi_value.ParseFromString(raw_kpi.value())

                LOGGER.debug("Received KPI : {:}".format(kpi_value))

                print("Received KPI : {:}".format(kpi_value))

                KpiValueWriter.get_kpi_descriptor_from_db(kpi_value.kpi_id.kpi_id.uuid)

                KpiValueWriter.get_kpi_descriptor(kpi_value.kpi_id.kpi_id.uuid)

                # -------- Testing section ---------------

                # test_kpi_descriptor_obj = create_kpi_descriptor_request()

                # metric_writer_to_prom.create_and_expose_cooked_kpi(

                #     test_kpi_descriptor_obj, kpi_value

                # )

                # -------- Testing section ---------------

                

            except Exception as e:

                print("Error detail: {:}".format(e))

                continue



    @staticmethod

    def get_kpi_descriptor_from_db(kpi_value_uuid: str):

    def get_kpi_descriptor(kpi_value_uuid: str):

        print("--- START -----")



        kpi_id = KpiId()

src/kpi_value_writer/tests/test_kpi_value_writer.py

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LOGGER = logging.getLogger(__name__) 
#     assert isinstance(response, bool)



def test_KafkaConsumer():

    LOGGER.debug(" --->>> test_validate_kafka_topics: START <<<--- ")

    LOGGER.debug(" --->>> test_kafka_consumer: START <<<--- ")

    KpiValueWriter.RunKafkaConsumer()



# def test_metric_composer_and_writer():