projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for bug 1396 - Error creating dashboard with same name in two different users
[osm/MON.git]
/
osm_mon
/
evaluator
/
evaluator.py
diff --git
a/osm_mon/evaluator/evaluator.py
b/osm_mon/evaluator/evaluator.py
index
d3fdfd5
..
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,19
+50,20
@@
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")
def evaluate(self):
log.debug('evaluate')
alarms_tuples = self.service.evaluate_alarms()
except Exception:
log.exception("Error evaluating alarms")
def evaluate(self):
log.debug('evaluate')
alarms_tuples = self.service.evaluate_alarms()
+ processes = []
for alarm, status in alarms_tuples:
p = multiprocessing.Process(target=self.notify_alarm,
args=(alarm, status))
p.start()
for alarm, status in alarms_tuples:
p = multiprocessing.Process(target=self.notify_alarm,
args=(alarm, status))
p.start()
+ processes.append(p)
+ for process in processes:
+ process.join(timeout=10)
def notify_alarm(self, alarm: Alarm, status: AlarmStatus):
log.debug("notify_alarm")
def notify_alarm(self, alarm: Alarm, status: AlarmStatus):
log.debug("notify_alarm")
@@
-74,16
+73,17
@@
class Evaluator:
def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus):
response = ResponseBuilder()
def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus):
response = ResponseBuilder()
+ tags = {}
+ 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',
alarm_id=alarm.uuid,
now = time.strftime("%d-%m-%Y") + " " + time.strftime("%X")
return response.generate_response(
'notify_alarm',
alarm_id=alarm.uuid,
- vdu_name=alarm.vdur_name,
- vnf_member_index=alarm.vnf_member_index,
- ns_id=alarm.nsr_id,
- metric_name=alarm.monitoring_param,
+ metric_name=alarm.metric,
operation=alarm.operation,
threshold_value=alarm.threshold,
sev=alarm.severity,
status=status.value,
operation=alarm.operation,
threshold_value=alarm.threshold,
sev=alarm.severity,
status=status.value,
- date=now)
+ date=now,
+ tags=tags)