X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fevaluator%2Fservice.py;fp=osm_mon%2Fevaluator%2Fservice.py;h=9049d953a48529f062f0e0f91828a30e6d53aab0;hb=f9973edafa925e60ad840684b700356005f1cf51;hp=2ba0625d58055a685827eafc2740e8a8027a52fd;hpb=e5e83ccda4ae62947b3302f7704c433f94a322fd;p=osm%2FMON.git

diff --git a/osm_mon/evaluator/service.py b/osm_mon/evaluator/service.py
index 2ba0625..9049d95 100644
--- a/osm_mon/evaluator/service.py
+++ b/osm_mon/evaluator/service.py
@@ -39,6 +39,7 @@ class AlarmStatus(Enum):
     ALARM = "alarm"
     OK = "ok"
     INSUFFICIENT = "insufficient-data"
+    DISABLED = "disabled"
 
 
 class EvaluatorService:
@@ -55,20 +56,27 @@ class EvaluatorService:
     def _evaluate_metric(self, alarm: Alarm):
         log.debug("_evaluate_metric")
         metric_value = self._get_metric_value(alarm.metric, alarm.tags)
-        if metric_value is None:
-            log.warning("No metric result for alarm %s", alarm.uuid)
-            self.queue.put((alarm, AlarmStatus.INSUFFICIENT))
-        else:
-            if alarm.operation.upper() == "GT":
-                if metric_value > alarm.threshold:
-                    self.queue.put((alarm, AlarmStatus.ALARM))
-                else:
-                    self.queue.put((alarm, AlarmStatus.OK))
-            elif alarm.operation.upper() == "LT":
-                if metric_value < alarm.threshold:
-                    self.queue.put((alarm, AlarmStatus.ALARM))
-                else:
-                    self.queue.put((alarm, AlarmStatus.OK))
+        if alarm.alarm_status.upper() != AlarmStatus.DISABLED.value.upper():
+            if metric_value is None:
+                log.warning("No metric result for alarm %s", alarm.uuid)
+                self.queue.put((alarm, AlarmStatus.INSUFFICIENT))
+            else:
+                if alarm.operation.upper() == "GT":
+                    if metric_value > alarm.threshold:
+                        self.queue.put((alarm, AlarmStatus.ALARM))
+                    else:
+                        self.queue.put((alarm, AlarmStatus.OK))
+                elif alarm.operation.upper() == "LT":
+                    if metric_value < alarm.threshold:
+                        self.queue.put((alarm, AlarmStatus.ALARM))
+                    else:
+                        self.queue.put((alarm, AlarmStatus.OK))
+
+    def update_alarm_status(self, alarm_state, uuid):
+        alarm_data = self.common_db.get_alarm_by_uuid(uuid)
+        if alarm_data.get("alarm_status").upper() != AlarmStatus.DISABLED.value.upper():
+            self.common_db.update_alarm_status(alarm_state, uuid)
+        return
 
     def evaluate_alarms(self) -> List[Tuple[Alarm, AlarmStatus]]:
         log.debug("evaluate_alarms")