string(defaultValue: env.GERRIT_REFSPEC, description: '', name: 'GERRIT_REFSPEC'),
string(defaultValue: env.GERRIT_PATCHSET_REVISION, description: '', name: 'GERRIT_PATCHSET_REVISION'),
string(defaultValue: 'https://osm.etsi.org/gerrit', description: '', name: 'PROJECT_URL_PREFIX'),
- booleanParam(defaultValue: true, description: '', name: 'TEST_INSTALL'),
+ booleanParam(defaultValue: false, description: '', name: 'TEST_INSTALL'),
string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
])
])
ENV OSMMON_DATABASE_COMMONKEY changeme
ENV OSMMON_COLLECTOR_INTERVAL 30
ENV OSMMON_EVALUATOR_INTERVAL 30
+ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
EXPOSE 8662 8000
# For those usages not covered by the Apache License, Version 2.0 please
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
+from typing import List
+from osm_mon.collector.metric import Metric
-class BaseCollector:
- def collect(self, vnfr: dict):
- pass
- def collect_one(self, nsr_id: str, vnf_member_index: int, vdur_name: str, metric_name: str):
+class BaseCollector:
+ def collect(self, vnfr: dict) -> List[Metric]:
pass
from osm_mon.collector.collectors.base_vim import BaseVimCollector
from osm_mon.collector.metric import Metric
-from osm_mon.core.common_db import CommonDbClient
from osm_mon.core.auth import AuthManager
-from osm_mon.core.exceptions import MetricNotFound
+from osm_mon.core.common_db import CommonDbClient
from osm_mon.core.settings import Config
log = logging.getLogger(__name__)
log.debug("No metric found: %s", e)
pass
return metrics
-
- def collect_one(self, nsr_id: str, vnf_member_index: int, vdur_name: str, metric_name: str) -> Metric:
- gnocchi_metric_name = METRIC_MAPPINGS[metric_name]
- start_date = datetime.datetime.now() - datetime.timedelta(seconds=self.granularity)
- resource_id = self._get_resource_uuid(nsr_id, vnf_member_index, vdur_name)
- try:
- metrics = self.gnocchi_client.metric.get_measures(gnocchi_metric_name,
- start=start_date,
- resource_id=resource_id,
- granularity=self.granularity)
- if len(metrics):
- metric = Metric(nsr_id, vnf_member_index, vdur_name, metric_name, metrics[-1][2])
- return metric
- except gnocchiclient.exceptions.NotFound as e:
- log.debug("No metric found: %s", e)
- raise MetricNotFound()
{"_id": nslcmop_id})
return nslcmop
- def get_vdur(self, nsr_id, member_index, vdu_name):
+ def get_vdur(self, nsr_id, member_index, vdur_name):
vnfr = self.get_vnfr(nsr_id, member_index)
for vdur in vnfr['vdur']:
- if vdur['name'] == vdu_name:
+ if vdur['name'] == vdur_name:
return vdur
- raise ValueError('vdur not found for nsr-id %s, member_index %s and vdu_name %s', nsr_id, member_index,
- vdu_name)
+ raise ValueError('vdur not found for nsr-id %s, member_index %s and vdur_name %s', nsr_id, member_index,
+ vdur_name)
def decrypt_vim_password(self, vim_password: str, schema_version: str, vim_id: str):
return self.common_db.decrypt(vim_password, schema_version, vim_id)
_configuration = [
CfgParam('BROKER_URI', "localhost:9092", six.text_type),
- CfgParam('MONGO_URI', "mongo:27017", six.text_type),
+ CfgParam('MONGO_URI', "mongodb://mongo:27017", six.text_type),
CfgParam('DATABASE', "sqlite:///mon_sqlite.db", six.text_type),
CfgParam('OS_DEFAULT_GRANULARITY', 300, int),
CfgParam('REQUEST_TIMEOUT', 10, int),
CfgParam('OSMMON_VCA_SECRET', "secret", six.text_type),
CfgParam('OSMMON_VCA_USER', "admin", six.text_type),
CfgParam('OSMMON_DATABASE_COMMONKEY', "changeme", six.text_type),
+ CfgParam('OSMMON_PROMETHEUS_URL', "http://prometheus:9090", six.text_type),
]
_config_dict = {cfg.key: cfg for cfg in _configuration}
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
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:
log.exception("Error evaluating alarms")
def evaluate(self):
+ log.debug('evaluate')
processes = []
for alarm in Alarm.select():
try:
'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,
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
projects / osm / MON.git / commitdiff