From 3c6a9d5d2b39575a336c9eebcef3c44b2cda321a Mon Sep 17 00:00:00 2001
From: pfamelis <pfamelis@ubitech.eu>
Date: Thu, 30 Mar 2023 14:17:55 +0300
Subject: [PATCH] fix: parse "NaN" for Min/Max values and appropriate checks
---
src/monitoring/service/MetricsDBTools.py | 46 ++++++++-----------
.../service/MonitoringServiceServicerImpl.py | 4 +-
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py
index a51d32d07..f928f07b9 100644
--- a/src/monitoring/service/MetricsDBTools.py
+++ b/src/monitoring/service/MetricsDBTools.py
@@ -264,63 +264,57 @@ class MetricsDB():
for kpi in kpi_list:
alarm = False
kpi_value = kpi[2]
+ kpiMinIsNone = ((kpiMinValue is None) or math.isnan(kpiMinValue))
+ kpiMaxIsNone = ((kpiMaxValue is None) or math.isnan(kpiMaxValue))
if (kpiMinValue == kpi_value and kpiMaxValue == kpi_value and inRange):
alarm = True
- elif (
- inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue):
+ elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and includeMaxValue):
if (kpi_value >= kpiMinValue and kpi_value <= kpiMaxValue):
alarm = True
- elif (
- inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue):
+ elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and not includeMaxValue):
if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue):
alarm = True
- elif (
- inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue):
+ elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and includeMaxValue):
if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue):
alarm = True
- elif (
- inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue):
+ elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and not includeMaxValue):
if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue):
alarm = True
- elif (
- not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue):
+ elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and includeMaxValue):
if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue):
alarm = True
- elif (
- not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue):
+ elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and not includeMaxValue):
if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue):
alarm = True
- elif (
- not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue):
+ elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and includeMaxValue):
if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue):
alarm = True
- elif (
- not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue):
+ elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and not includeMaxValue):
if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue):
alarm = True
- elif (inRange and kpiMinValue is not None and kpiMaxValue is None and includeMinValue):
+ elif (inRange and not kpiMinIsNone and kpiMaxIsNone and includeMinValue):
if (kpi_value >= kpiMinValue):
alarm = True
- elif (inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue):
+ elif (inRange and not kpiMinIsNone and kpiMaxIsNone and not includeMinValue):
if (kpi_value > kpiMinValue):
alarm = True
- elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue):
+ elif (not inRange and not kpiMinIsNone and kpiMaxIsNone and includeMinValue):
if (kpi_value <= kpiMinValue):
alarm = True
- elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue):
- if (kpi_value <= kpiMinValue):
+ elif (not inRange and not kpiMinIsNone and kpiMaxIsNone and not includeMinValue):
+ if (kpi_value < kpiMinValue):
alarm = True
- elif (inRange and kpiMinValue is None and kpiMaxValue is not None and includeMaxValue):
+ elif (inRange and kpiMinIsNone and not kpiMaxIsNone and includeMaxValue):
if (kpi_value <= kpiMaxValue):
alarm = True
- elif (inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue):
+ elif (inRange and kpiMinIsNone and not kpiMaxIsNone and not includeMaxValue):
if (kpi_value < kpiMaxValue):
alarm = True
- elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue):
+ elif (not inRange and kpiMinIsNone and not kpiMaxIsNone and includeMaxValue):
if (kpi_value >= kpiMaxValue):
alarm = True
- elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue):
- if (kpi_value >= kpiMaxValue):
+ elif (not inRange and kpiMinIsNone and not kpiMaxIsNone and not includeMaxValue):
+ if (kpi_value > kpiMaxValue):
alarm = True
if alarm:
valid_kpi_list.append(kpi)
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index f408734df..62adcf465 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -407,8 +407,8 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
alarm_description = request.alarm_description
alarm_name = request.name
kpi_id = request.kpi_id.kpi_id.uuid
- kpi_min_value = request.kpi_value_range.kpiMinValue.floatVal
- kpi_max_value = request.kpi_value_range.kpiMaxValue.floatVal
+ kpi_min_value = float(request.kpi_value_range.kpiMinValue.floatVal)
+ kpi_max_value = float(request.kpi_value_range.kpiMaxValue.floatVal)
in_range = request.kpi_value_range.inRange
include_min_value = request.kpi_value_range.includeMinValue
include_max_value = request.kpi_value_range.includeMaxValue
--
GitLab