Commit 4040e63f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/71-cttc-separation-of-monitoring' of... 

Merge branch 'feat/71-cttc-separation-of-monitoring' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/71-cttc-separation-of-monitoring
parents 9a86eaed 5f4a7d31

src/common/tools/kafka/Variables.py

+6 −5
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ class KafkaTopic(Enum): 
        """

            Method to create Kafka topics defined as class members

        """

        # LOGGER.debug("Topics to be created: {:}".format(KafkaTopic.__members__.values()))

        # LOGGER.debug("Topics to be created: {:}".format(KafkaTopic.__members__.keys()))

        # LOGGER.debug("Topics to be created: {:}".format([member.value for member in KafkaTopic]))

        all_topics = [member.value for member in KafkaTopic]

        if( KafkaTopic.create_new_topic_if_not_exists( all_topics )):

            LOGGER.debug("All topics created sucsessfully")
@@ -54,16 +51,20 @@ class KafkaTopic(Enum): 
        Args:

            list of topic: containing the topic name(s) to be created on Kafka

        """

        LOGGER.debug("Recevied topic List: {:}".format(new_topics))

        LOGGER.debug("Topics names to be verified and created: {:}".format(new_topics))

        for topic in new_topics:

            try:

                topic_metadata = KafkaConfig.ADMIN_CLIENT.value.list_topics(timeout=5)

                # LOGGER.debug("Existing topic list: {:}".format(topic_metadata.topics))

                if topic not in topic_metadata.topics:

                    # If the topic does not exist, create a new topic

                    print(f"Topic '{topic}' does not exist. Creating...")

                    print("Topic {:} does not exist. Creating...".format(topic))

                    LOGGER.debug("Topic {:} does not exist. Creating...".format(topic))

                    new_topic = NewTopic(topic, num_partitions=1, replication_factor=1)

                    KafkaConfig.ADMIN_CLIENT.value.create_topics([new_topic])

                else:

                    print("Topic name already exists: {:}".format(topic))

                    LOGGER.debug("Topic name already exists: {:}".format(topic))

            except Exception as e:

                LOGGER.debug("Failed to create topic: {:}".format(e))

                return False

src/kpi_manager/service/__main__.py

+0 −39
Original line number Diff line number Diff line
@@ -29,35 +29,6 @@ def signal_handler(signal, frame): # pylint: disable=redefined-outer-name 
    LOGGER.warning('Terminate signal received')

    terminate.set()



# def start_kpi_manager(name_mapping : NameMapping):

#     LOGGER.info('Start Kpi Manager...',)



#     events_collector = EventsDeviceCollector(name_mapping)

#     events_collector.start()



#     # TODO: redesign this method to be more clear and clean



#     # Iterate while terminate is not set

#     while not terminate.is_set():

#         list_new_kpi_ids = events_collector.listen_events()



#         # Monitor Kpis

#         if bool(list_new_kpi_ids):

#             for kpi_id in list_new_kpi_ids:

#                 # Create Monitor Kpi Requests

#                 monitor_kpi_request = monitoring_pb2.MonitorKpiRequest()

#                 monitor_kpi_request.kpi_id.CopyFrom(kpi_id)

#                 monitor_kpi_request.monitoring_window_s = 86400

#                 monitor_kpi_request.sampling_rate_s = 10

#                 events_collector._monitoring_client.MonitorKpi(monitor_kpi_request)

        

#         time.sleep(0.5) # let other tasks run; do not overload CPU

#     else:

#         # Terminate is set, looping terminates

#         LOGGER.warning("Stopping execution...")



#     events_collector.start()



def main():

    global LOGGER # pylint: disable=global-statement
@@ -77,21 +48,11 @@ def main(): 


    LOGGER.debug('Starting...')



    # Start metrics server

    metrics_port = get_metrics_port()

    start_http_server(metrics_port)



    name_mapping = NameMapping()

    # Starting monitoring service

    # grpc_service = MonitoringService(name_mapping)

    # grpc_service.start()

    # start_monitoring(name_mapping)



    grpc_service = KpiManagerService(name_mapping)

    grpc_service.start()



    # start_kpi_manager(name_mapping)



    # Wait for Ctrl+C or termination signal

    while not terminate.wait(timeout=1.0): pass

src/kpi_value_api/requirements.in

0 → 100644
+2 −0
Original line number Diff line number Diff line 
confluent-kafka==2.3.0

requests==2.27.1
 
 No newline at end of file

src/kpi_value_api/service/KpiValueApiServiceServicerImpl.py

+0 −3
Original line number Diff line number Diff line
@@ -105,19 +105,16 @@ class KpiValueApiServiceServicerImpl(KpiValueAPIServiceServicer): 
            return KpiValueType(int64Val=int64_value)

        except ValueError:

            pass



        # Check if the value is a float

        try:

            float_value = float(value)

            return KpiValueType(floatVal=float_value)

        except ValueError:

            pass



        # Check if the value is a boolean

        if value.lower() in ['true', 'false']:

            bool_value = value.lower() == 'true'

            return KpiValueType(boolVal=bool_value)



        # If none of the above, treat it as a string

        return KpiValueType(stringVal=value)

src/kpi_value_api/service/__main__.py

0 → 100644
+55 −0
Original line number Diff line number Diff line 
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



import logging, signal, sys, threading, time

from prometheus_client import start_http_server

from common.Settings import  get_log_level

from .NameMapping import NameMapping          # import updated

from .KpiValueApiService import KpiValueApiService



terminate = threading.Event()

LOGGER = None



def signal_handler(signal, frame): # pylint: disable=redefined-outer-name

    LOGGER.warning('Terminate signal received')

    terminate.set()



def main():

    global LOGGER # pylint: disable=global-statement



    log_level = get_log_level()

    logging.basicConfig(level=log_level)

    LOGGER = logging.getLogger(__name__)



    signal.signal(signal.SIGINT,  signal_handler)

    signal.signal(signal.SIGTERM, signal_handler)



    LOGGER.debug('Starting...')



    name_mapping = NameMapping()



    grpc_service = KpiValueApiService(name_mapping)

    grpc_service.start()



    # Wait for Ctrl+C or termination signal

    while not terminate.wait(timeout=1.0): pass



    LOGGER.debug('Terminating...')

    grpc_service.stop()



    LOGGER.debug('Bye')

    return 0



if __name__ == '__main__':

    sys.exit(main())