X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fevaluator%2Fevaluator.py;h=44b0af6d3b147489b6c4d6a94c6f26a2ed45efaa;hb=b3173221c25ae915eaca041ebd045f6148cc447d;hp=2d319c92ff94aac235a5c1bbec6042dfcb20bdfc;hpb=8e4179facf22c8096992f0a83caeec9f2f4996c7;p=osm%2FMON.git diff --git a/osm_mon/evaluator/evaluator.py b/osm_mon/evaluator/evaluator.py index 2d319c9..44b0af6 100644 --- a/osm_mon/evaluator/evaluator.py +++ b/osm_mon/evaluator/evaluator.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright 2018 Whitestack, LLC # ************************************************************* @@ -35,11 +33,8 @@ log = logging.getLogger(__name__) class Evaluator: - def __init__(self, config: Config, loop=None): + def __init__(self, config: Config): self.conf = config - if not loop: - loop = asyncio.get_event_loop() - self.loop = loop self.service = EvaluatorService(config) self.msg_bus = MessageBusClient(config) @@ -69,9 +64,13 @@ class Evaluator: log.debug("_notify_alarm") resp_message = self._build_alarm_response(alarm, status) log.info("Sent alarm notification: %s", resp_message) - self.loop.run_until_complete( + asyncio.run( self.msg_bus.aiowrite("alarm_response", "notify_alarm", resp_message) ) + evaluator_service = EvaluatorService(self.conf) + evaluator_service.update_alarm_status(status.value, alarm.uuid) + evaluator_service.update_alarm_extra_labels(alarm.extra_labels, alarm.uuid) + return def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus): log.debug("_build_alarm_response") @@ -90,4 +89,5 @@ class Evaluator: status=status.value, date=now, tags=tags, + extra_tabels=alarm.extra_labels, )