X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fevaluator%2Fevaluator.py;h=a672cb22dc0b207657c435701508a62ca6f59bc2;hb=refs%2Fchanges%2F58%2F6958%2F1;hp=b040198c94f1e0623246015baa73408bf701002a;hpb=51f4486b06781541ee15ea332261247ed3e930f6;p=osm%2FMON.git diff --git a/osm_mon/evaluator/evaluator.py b/osm_mon/evaluator/evaluator.py index b040198..a672cb2 100644 --- a/osm_mon/evaluator/evaluator.py +++ b/osm_mon/evaluator/evaluator.py @@ -25,10 +25,10 @@ import logging import multiprocessing import time +import requests from osm_common.dbbase import DbException -from osm_mon.collector.collector import VIM_COLLECTORS -from osm_mon.collector.collectors.juju import VCACollector +from osm_mon.collector.backends.prometheus import OSM_METRIC_PREFIX from osm_mon.core.common_db import CommonDbClient from osm_mon.core.database import DatabaseManager, Alarm from osm_mon.core.message_bus.producer import Producer @@ -46,44 +46,42 @@ class Evaluator: self.database_manager.create_tables() self.queue = multiprocessing.Queue() - def _evaluate_vim_metric(self, - nsr_id: str, - vnf_member_index: int, - vdur_name: str, - nfvi_metric_name: str, - vim_account_id: str, - alarm: Alarm): - vim_type = self.database_manager.get_vim_type(vim_account_id) - if vim_type in VIM_COLLECTORS: - collector = VIM_COLLECTORS[vim_type](vim_account_id) - metric = collector.collect_one(nsr_id, vnf_member_index, vdur_name, nfvi_metric_name) - if alarm.operation.upper() == 'GT': - if metric.value > alarm.threshold: - self.queue.put(alarm) - elif alarm.operation.upper() == 'LT': - if metric.value < alarm.threshold: - self.queue.put(alarm) - + def _evaluate_metric(self, + nsr_id: str, + vnf_member_index: int, + vdur_name: str, + metric_name: str, + alarm: Alarm): + log.debug("_evaluate_metric") + # TODO: Refactor to fit backend plugin model + cfg = Config.instance() + query_section = "query={0}{{ns_id=\"{1}\",vdu_name=\"{2}\",vnf_member_index=\"{3}\"}}".format( + OSM_METRIC_PREFIX + metric_name, nsr_id, vdur_name, vnf_member_index) + request_url = cfg.OSMMON_PROMETHEUS_URL + "/api/v1/query?" + query_section + log.info("Querying Prometheus: %s", request_url) + r = requests.get(request_url) + if r.status_code == 200: + json_response = r.json() + if json_response['status'] == 'success': + result = json_response['data']['result'] + if len(result): + metric_value = float(result[0]['value'][1]) + log.info("Metric value: %s", metric_value) + if alarm.operation.upper() == 'GT': + if metric_value > alarm.threshold: + self.queue.put(alarm) + elif alarm.operation.upper() == 'LT': + if metric_value < alarm.threshold: + self.queue.put(alarm) + else: + log.warning("No metric result for alarm %s", alarm.id) + else: + log.warning("Prometheus response is not success. Got status %s", json_response['status']) else: - log.debug("vimtype %s is not supported.", vim_type) - - def _evaluate_vca_metric(self, - nsr_id: str, - vnf_member_index: int, - vdur_name: str, - vnf_metric_name: str, - alarm: Alarm): - collector = VCACollector() - metric = collector.collect_one(nsr_id, vnf_member_index, vdur_name, vnf_metric_name) - if alarm.operation.upper() == 'GT': - if metric.value > alarm.threshold: - self.queue.put(alarm) - elif alarm.operation.upper() == 'LT': - if metric.value < alarm.threshold: - self.queue.put(alarm) + log.warning("Error contacting Prometheus. Got status code %s: %s", r.status_code, r.text) def evaluate_forever(self): - log.debug('collect_forever') + log.debug('evaluate_forever') cfg = Config.instance() while True: try: @@ -93,6 +91,7 @@ class Evaluator: log.exception("Error evaluating alarms") def evaluate(self): + log.debug('evaluate') processes = [] for alarm in Alarm.select(): try: @@ -118,19 +117,17 @@ class Evaluator: 'vdu-monitoring-param-ref'], vdu['monitoring-param'])) nfvi_metric = vdu_monitoring_param['nfvi-metric'] - vim_account_id = self.common_db.get_vim_account_id(nsr_id, vnf_member_index) - p = multiprocessing.Process(target=self._evaluate_vim_metric, + p = multiprocessing.Process(target=self._evaluate_metric, args=(nsr_id, vnf_member_index, vdur_name, nfvi_metric, - vim_account_id, alarm)) processes.append(p) p.start() if 'vdu-metric' in vnf_monitoring_param: vnf_metric_name = vnf_monitoring_param['vdu-metric']['vdu-metric-name-ref'] - p = multiprocessing.Process(target=self._evaluate_vca_metric, + p = multiprocessing.Process(target=self._evaluate_metric, args=(nsr_id, vnf_member_index, vdur_name, @@ -139,8 +136,15 @@ class Evaluator: processes.append(p) p.start() if 'vnf-metric' in vnf_monitoring_param: - log.warning("vnf-metric is not currently supported.") - continue + vnf_metric_name = vnf_monitoring_param['vnf-metric']['vnf-metric-name-ref'] + p = multiprocessing.Process(target=self._evaluate_metric, + args=(nsr_id, + vnf_member_index, + '', + vnf_metric_name, + alarm)) + processes.append(p) + p.start() for process in processes: process.join() @@ -154,12 +158,13 @@ class Evaluator: p.start() def notify_alarm(self, alarm: Alarm): + log.debug("notify_alarm") response = ResponseBuilder() now = time.strftime("%d-%m-%Y") + " " + time.strftime("%X") # Generate and send response resp_message = response.generate_response( 'notify_alarm', - alarm_id=alarm.id, + alarm_id=alarm.uuid, vdu_name=alarm.vdur_name, vnf_member_index=alarm.vnf_member_index, ns_id=alarm.nsr_id,