Bug 2079 fixed: added more operators to the metric evaluation

[osm/MON.git] / osm_mon / evaluator / service.py

diff --git a/osm_mon/evaluator/service.py b/osm_mon/evaluator/service.py
index 2ba0625..ae6191b 100644 (file)
--- 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:
@@ -53,23 +54,52 @@ class EvaluatorService:
         ).get_metric_value(metric_name, tags)
 
     def _evaluate_metric(self, alarm: Alarm):
+        """Method to evaluate a metric value comparing it against an alarm threshold.
+
+        Args:
+            alarm (Alarm): the alarm with the threshold to compare the metric against
+        """
+
         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:
+        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" and metric_value > alarm.threshold)
+                    or (
+                        alarm.operation.upper() == "LT"
+                        and metric_value < alarm.threshold
+                    )
+                    or (
+                        alarm.operation.upper() == "GE"
+                        and metric_value >= alarm.threshold
+                    )
+                    or (
+                        alarm.operation.upper() == "LE"
+                        and metric_value <= alarm.threshold
+                    )
+                    or (
+                        alarm.operation.upper() == "EQ"
+                        and metric_value == alarm.threshold
+                    )
+                    or (
+                        alarm.operation.upper() == "NE"
+                        and 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:
+                elif alarm.operation.upper() in ("GT", "LT", "GE", "LE", "EQ", "NE"):
                     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")
         processes = []