X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fopenstack.py;h=2738d5c49584a5c2ab2db6c64631f5fefac08a06;hb=4b9f79e2820a011f6ebbba7fb92cdc120b364650;hp=bd2a6170c657c0dd7be43965e7298ca513780ec0;hpb=426a544c33bd005488d3f68bd525afa5894179c5;p=osm%2FMON.git diff --git a/osm_mon/collector/vnf_collectors/openstack.py b/osm_mon/collector/vnf_collectors/openstack.py index bd2a617..2738d5c 100644 --- a/osm_mon/collector/vnf_collectors/openstack.py +++ b/osm_mon/collector/vnf_collectors/openstack.py @@ -91,7 +91,6 @@ class OpenstackCollector(BaseVimCollector): nsr_id = vnfr['nsr-id-ref'] vnf_member_index = vnfr['member-vnf-index-ref'] vnfd = self.common_db.get_vnfd(vnfr['vnfd-id']) - # Populate extra tags for metrics tags = {} tags['ns_name'] = self.common_db.get_nsr(nsr_id)['name'] @@ -101,6 +100,7 @@ class OpenstackCollector(BaseVimCollector): tags['project_id'] = '' metrics = [] + for vdur in vnfr['vdur']: # This avoids errors when vdur records have not been completely filled if 'name' not in vdur: @@ -108,12 +108,11 @@ class OpenstackCollector(BaseVimCollector): vdu = next( filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu']) ) - if 'monitoring-param' in vdu: - for param in vdu['monitoring-param']: - metric_name = param['nfvi-metric'] - interface_name = param['interface-name-ref'] if 'interface-name-ref' in param else None + if 'monitoring-parameter' in vdu: + for param in vdu['monitoring-parameter']: + metric_name = param['performance-metric'] openstack_metric_name = METRIC_MAPPINGS[metric_name] - metric_type = self._get_metric_type(metric_name, interface_name) + metric_type = self._get_metric_type(metric_name) try: resource_id = self._get_resource_uuid(nsr_id, vnf_member_index, vdur['name']) except ValueError: @@ -123,14 +122,14 @@ class OpenstackCollector(BaseVimCollector): vdur['name'], vnf_member_index, nsr_id) continue try: - log.info("Collecting metric type: %s and metric_name: %s and resource_id %s and " - "interface_name: %s", metric_type, metric_name, resource_id, interface_name) - value = self.backend.collect_metric(metric_type, openstack_metric_name, resource_id, - interface_name) + log.info( + "Collecting metric type: %s and metric_name: %s and resource_id %s and ", + metric_type, + metric_name, + resource_id) + value = self.backend.collect_metric(metric_type, openstack_metric_name, resource_id) if value is not None: log.info("value: %s", value) - if interface_name: - tags['interface'] = interface_name metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, value, tags) metrics.append(metric) else: @@ -142,27 +141,25 @@ class OpenstackCollector(BaseVimCollector): def _get_backend(self, vim_account: dict): try: - ceilometer = CeilometerBackend(vim_account) - ceilometer.client.capabilities.get() - log.info("Using ceilometer backend to collect metric") - return ceilometer - except (HTTPException, EndpointNotFound): gnocchi = GnocchiBackend(vim_account) gnocchi.client.metric.list(limit=1) log.info("Using gnocchi backend to collect metric") return gnocchi + except (HTTPException, EndpointNotFound): + ceilometer = CeilometerBackend(vim_account) + ceilometer.client.capabilities.get() + log.info("Using ceilometer backend to collect metric") + return ceilometer - def _get_metric_type(self, metric_name: str, interface_name: str) -> MetricType: + def _get_metric_type(self, metric_name: str) -> MetricType: if metric_name not in INTERFACE_METRICS: return MetricType.INSTANCE else: - if interface_name: - return MetricType.INTERFACE_ONE return MetricType.INTERFACE_ALL class OpenstackBackend: - def collect_metric(self, metric_type: MetricType, metric_name: str, resource_id: str, interface_name: str): + def collect_metric(self, metric_type: MetricType, metric_name: str, resource_id: str): pass @@ -180,10 +177,7 @@ class GnocchiBackend(OpenstackBackend): sess = OpenstackUtils.get_session(vim_account) return neutron_client.Client(session=sess) - def collect_metric(self, metric_type: MetricType, metric_name: str, resource_id: str, interface_name: str): - if metric_type == MetricType.INTERFACE_ONE: - return self._collect_interface_one_metric(metric_name, resource_id, interface_name) - + def collect_metric(self, metric_type: MetricType, metric_name: str, resource_id: str): if metric_type == MetricType.INTERFACE_ALL: return self._collect_interface_all_metric(metric_name, resource_id) @@ -193,21 +187,6 @@ class GnocchiBackend(OpenstackBackend): else: raise Exception('Unknown metric type %s' % metric_type.value) - def _collect_interface_one_metric(self, metric_name, resource_id, interface_name): - ports = self.neutron.list_ports(name=interface_name, device_id=resource_id) - if not ports or not ports['ports']: - raise Exception( - 'Port not found for interface %s on instance %s' % (interface_name, resource_id)) - port = ports['ports'][0] - port_uuid = port['id'][:11] - tap_name = 'tap' + port_uuid - interfaces = self.client.resource.search(resource_type='instance_network_interface', - query={'=': {'name': tap_name}}) - measures = self.client.metric.get_measures(metric_name, - resource_id=interfaces[0]['id'], - limit=1) - return measures[-1][2] if measures else None - def _collect_interface_all_metric(self, openstack_metric_name, resource_id): total_measure = None interfaces = self.client.resource.search(resource_type='instance_network_interface', @@ -232,17 +211,36 @@ class GnocchiBackend(OpenstackBackend): try: aggregation = METRIC_AGGREGATORS.get(openstack_metric_name) - measures = self.client.metric.get_measures(openstack_metric_name, - aggregation=aggregation, - start=time.time() - 1200, - resource_id=resource_id) - # measures[-1][0] is the time of the reporting interval - # measures[-1][1] is the durcation of the reporting interval - # measures[-1][2] is the value of the metric - if measures: - value = measures[-1][2] + try: + measures = self.client.metric.get_measures(openstack_metric_name, + aggregation=aggregation, + start=time.time() - 1200, + resource_id=resource_id) + if measures: + value = measures[-1][2] + except gnocchiclient.exceptions.NotFound as e: + # CPU metric in previous Openstack versions do not support rate:mean aggregation method + if openstack_metric_name == "cpu": + log.debug("No metric %s found for instance %s: %s", openstack_metric_name, resource_id, e) + log.debug("Retrying to get metric %s for instance %s without aggregation", + openstack_metric_name, resource_id) + measures = self.client.metric.get_measures(openstack_metric_name, + resource_id=resource_id, + limit=1) + else: + raise e + # measures[-1] is the last measure + # measures[-2] is the previous measure + # measures[x][2] is the value of the metric + if measures and len(measures) >= 2: + value = measures[-1][2] - measures[-2][2] + if value: + # measures[-1][0] is the time of the reporting interval + # measures[-1][1] is the duration of the reporting interval if aggregation: # If this is an aggregate, we need to divide the total over the reported time period. + # Even if the aggregation method is not supported by Openstack, the code will execute it + # because aggregation is specified in METRIC_AGGREGATORS value = value / measures[-1][1] if openstack_metric_name in METRIC_MULTIPLIERS: value = value * METRIC_MULTIPLIERS[openstack_metric_name] @@ -260,7 +258,7 @@ class CeilometerBackend(OpenstackBackend): sess = OpenstackUtils.get_session(vim_account) return ceilometer_client.Client("2", session=sess) - def collect_metric(self, metric_type: MetricType, metric_name: str, resource_id: str, interface_name: str): + def collect_metric(self, metric_type: MetricType, metric_name: str, resource_id: str): if metric_type != MetricType.INSTANCE: raise NotImplementedError('Ceilometer backend only support instance metrics') measures = self.client.samples.list(meter_name=metric_name, limit=1, q=[