X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fopenstack.py;h=b2ecef03f0a0344bb517325620e8664012cf360a;hb=refs%2Fchanges%2F13%2F7613%2F4;hp=c11f63fd3ddc081c9b74526ec38b618df79b0973;hpb=6b45f219dc6bbb1dde1d3cb88eb51372ee81d359;p=osm%2FMON.git diff --git a/osm_mon/collector/vnf_collectors/openstack.py b/osm_mon/collector/vnf_collectors/openstack.py index c11f63f..b2ecef0 100644 --- a/osm_mon/collector/vnf_collectors/openstack.py +++ b/osm_mon/collector/vnf_collectors/openstack.py @@ -19,8 +19,6 @@ # For those usages not covered by the Apache License, Version 2.0 please # contact: bdiaz@whitestack.com or glavado@whitestack.com ## -import datetime -import json import logging from enum import Enum from typing import List @@ -29,6 +27,7 @@ import gnocchiclient.exceptions from ceilometerclient.v2 import client as ceilometer_client from gnocchiclient.v1 import client as gnocchi_client from keystoneauth1 import session +from keystoneauth1.exceptions.catalog import EndpointNotFound from keystoneauth1.identity import v3 from keystoneclient.v3 import client as keystone_client from neutronclient.v2_0 import client as neutron_client @@ -79,14 +78,6 @@ class OpenstackCollector(BaseVimCollector): vdur = self.common_db.get_vdur(nsr_id, vnf_member_index, vdur_name) return vdur['vim-id'] - def _get_granularity(self, vim_account_id: str): - creds = CollectorUtils.get_credentials(vim_account_id) - vim_config = json.loads(creds.config) - if 'granularity' in vim_config: - return int(vim_config['granularity']) - else: - return int(self.conf.get('openstack', 'default_granularity')) - def collect(self, vnfr: dict) -> List[Metric]: nsr_id = vnfr['nsr-id-ref'] vnf_member_index = vnfr['member-vnf-index-ref'] @@ -113,19 +104,28 @@ class OpenstackCollector(BaseVimCollector): "Was it recently deleted?", vdur['name'], vnf_member_index, nsr_id) continue - value = self.backend.collect_metric(metric_type, openstack_metric_name, resource_id, interface_name) - if value is not None: - metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, value) - metrics.append(metric) + try: + value = self.backend.collect_metric(metric_type, openstack_metric_name, resource_id, + interface_name) + if value is not None: + tags = {} + if interface_name: + tags['interface'] = interface_name + metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, value, tags) + metrics.append(metric) + except Exception: + log.exception("Error collecting metric %s for vdu %s" % (metric_name, vdur['name'])) return metrics def _get_backend(self, vim_account_id: str): - keystone = self._build_keystone_client(vim_account_id) - if keystone.services.list('gnocchi'): - granularity = self._get_granularity(vim_account_id) - return GnocchiBackend(vim_account_id, granularity) - elif keystone.services.list('ceilometer'): - return CeilometerBackend(vim_account_id) + try: + ceilometer = CeilometerBackend(vim_account_id) + ceilometer.client.capabilities.get() + return ceilometer + except EndpointNotFound: + gnocchi = GnocchiBackend(vim_account_id) + gnocchi.client.status.get() + return gnocchi def _get_metric_type(self, metric_name: str, interface_name: str) -> MetricType: if metric_name not in INTERFACE_METRICS: @@ -155,10 +155,9 @@ class OpenstackBackend: class GnocchiBackend(OpenstackBackend): - def __init__(self, vim_account_id: str, granularity: int): + def __init__(self, vim_account_id: str): self.client = self._build_gnocchi_client(vim_account_id) self.neutron = self._build_neutron_client(vim_account_id) - self.granularity = granularity def _build_gnocchi_client(self, vim_account_id: str) -> gnocchi_client.Client: sess = OpenstackBackend.get_session(vim_account_id) @@ -182,8 +181,6 @@ class GnocchiBackend(OpenstackBackend): raise Exception('Unknown metric type %s' % metric_type.value) def _collect_interface_one_metric(self, metric_name, resource_id, interface_name): - delta = 10 * self.granularity - start_date = datetime.datetime.now() - datetime.timedelta(seconds=delta) ports = self.neutron.list_ports(name=interface_name, device_id=resource_id) if not ports or not ports['ports']: raise Exception( @@ -194,23 +191,19 @@ class GnocchiBackend(OpenstackBackend): interfaces = self.client.resource.search(resource_type='instance_network_interface', query={'=': {'name': tap_name}}) measures = self.client.metric.get_measures(metric_name, - start=start_date, resource_id=interfaces[0]['id'], - granularity=self.granularity) + limit=1) return measures[-1][2] if measures else None def _collect_interface_all_metric(self, openstack_metric_name, resource_id): - delta = 10 * self.granularity - start_date = datetime.datetime.now() - datetime.timedelta(seconds=delta) total_measure = None interfaces = self.client.resource.search(resource_type='instance_network_interface', query={'=': {'instance_id': resource_id}}) for interface in interfaces: try: measures = self.client.metric.get_measures(openstack_metric_name, - start=start_date, resource_id=interface['id'], - granularity=self.granularity) + limit=1) if measures: if not total_measure: total_measure = 0.0 @@ -222,14 +215,11 @@ class GnocchiBackend(OpenstackBackend): return total_measure def _collect_instance_metric(self, openstack_metric_name, resource_id): - delta = 10 * self.granularity - start_date = datetime.datetime.now() - datetime.timedelta(seconds=delta) value = None try: measures = self.client.metric.get_measures(openstack_metric_name, - start=start_date, resource_id=resource_id, - granularity=self.granularity) + limit=1) if measures: value = measures[-1][2] except gnocchiclient.exceptions.NotFound as e: