X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fevaluator%2Fservice.py;h=ae6191ba3dec1fe596ec2ae77bc5298ff8229ae0;hb=refs%2Fchanges%2F00%2F12200%2F2;hp=b3b0d265a18a1c9aca463875fa33812007e08bc6;hpb=1b7145f6d0d3c0090b7a33b4972861ad9ed48631;p=osm%2FMON.git

diff --git a/osm_mon/evaluator/service.py b/osm_mon/evaluator/service.py
index b3b0d26..ae6191b 100644
--- a/osm_mon/evaluator/service.py
+++ b/osm_mon/evaluator/service.py
@@ -32,54 +32,79 @@ from osm_mon.evaluator.backends.prometheus import PrometheusBackend
 
 log = logging.getLogger(__name__)
 
-BACKENDS = {
-    'prometheus': PrometheusBackend
-}
+BACKENDS = {"prometheus": PrometheusBackend}
 
 
 class AlarmStatus(Enum):
-    ALARM = 'alarm'
-    OK = 'ok'
-    INSUFFICIENT = 'insufficient-data'
+    ALARM = "alarm"
+    OK = "ok"
+    INSUFFICIENT = "insufficient-data"
+    DISABLED = "disabled"
 
 
 class EvaluatorService:
-
     def __init__(self, config: Config):
         self.conf = config
         self.common_db = CommonDbClient(self.conf)
         self.queue = multiprocessing.Queue()
 
-    def _get_metric_value(self,
-                          metric_name: str,
-                          tags: dict):
-        return BACKENDS[self.conf.get('evaluator', 'backend')](self.conf).get_metric_value(metric_name, tags)
+    def _get_metric_value(self, metric_name: str, tags: dict):
+        return BACKENDS[self.conf.get("evaluator", "backend")](
+            self.conf
+        ).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
+        """
 
-    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:
+        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')
+        log.debug("evaluate_alarms")
         processes = []
         for alarm in self.common_db.get_alarms():
-            p = multiprocessing.Process(target=self._evaluate_metric,
-                                        args=(alarm,))
+            p = multiprocessing.Process(target=self._evaluate_metric, args=(alarm,))
             processes.append(p)
             p.start()