projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix(dashboards): searches monitoring parameters through every VDU available inside...
[osm/MON.git]
/
osm_mon
/
evaluator
/
evaluator.py
diff --git
a/osm_mon/evaluator/evaluator.py
b/osm_mon/evaluator/evaluator.py
index
2f22625
..
8d4c276
100644
(file)
--- a/
osm_mon/evaluator/evaluator.py
+++ b/
osm_mon/evaluator/evaluator.py
@@
-25,11
+25,9
@@
import logging
import multiprocessing
import time
import multiprocessing
import time
-import peewee
-
from osm_mon.core.config import Config
from osm_mon.core.config import Config
-from osm_mon.core.database import Alarm
from osm_mon.core.message_bus_client import MessageBusClient
from osm_mon.core.message_bus_client import MessageBusClient
+from osm_mon.core.models import Alarm
from osm_mon.core.response import ResponseBuilder
from osm_mon.evaluator.service import EvaluatorService, AlarmStatus
from osm_mon.core.response import ResponseBuilder
from osm_mon.evaluator.service import EvaluatorService, AlarmStatus
@@
-52,9
+50,6
@@
class Evaluator:
try:
self.evaluate()
time.sleep(int(self.conf.get('evaluator', 'interval')))
try:
self.evaluate()
time.sleep(int(self.conf.get('evaluator', 'interval')))
- except peewee.PeeweeException:
- log.exception("Database error evaluating alarms: ")
- raise
except Exception:
log.exception("Error evaluating alarms")
except Exception:
log.exception("Error evaluating alarms")
@@
-79,8
+74,8
@@
class Evaluator:
def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus):
response = ResponseBuilder()
tags = {}
def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus):
response = ResponseBuilder()
tags = {}
- for
tag in alarm.tags
:
- tags[
tag.name] = tag.
value
+ for
name, value in alarm.tags.items()
:
+ tags[
name] =
value
now = time.strftime("%d-%m-%Y") + " " + time.strftime("%X")
return response.generate_response(
'notify_alarm',
now = time.strftime("%d-%m-%Y") + " " + time.strftime("%X")
return response.generate_response(
'notify_alarm',