"cpu_utilization": "cpu",
}
+# Metrics which have new names in Rocky and higher releases
+METRIC_MAPPINGS_FOR_ROCKY_AND_NEWER_RELEASES = {
+ "disk_read_ops": "disk.device.read.requests",
+ "disk_write_ops": "disk.device.write.requests",
+ "disk_read_bytes": "disk.device.read.bytes",
+ "disk_write_bytes": "disk.device.write.bytes",
+ "packets_received": "network.incoming.packets",
+ "packets_sent": "network.outgoing.packets"
+}
+
METRIC_MULTIPLIERS = {"cpu": 0.0000001}
METRIC_AGGREGATORS = {"cpu": "rate:mean"}
"packets_sent",
]
+INSTANCE_DISK = [
+ "disk_read_ops",
+ "disk_write_ops",
+ "disk_read_bytes",
+ "disk_write_bytes",
+]
+
class MetricType(Enum):
INSTANCE = "instance"
INTERFACE_ALL = "interface_all"
INTERFACE_ONE = "interface_one"
+ INSTANCEDISK = 'instancedisk'
class OpenstackCollector(BaseVimCollector):
- def __init__(self, config: Config, vim_account_id: str):
+ def __init__(self, config: Config, vim_account_id: str, vim_session: object):
super().__init__(config, vim_account_id)
self.common_db = CommonDbClient(config)
vim_account = self.common_db.get_vim_account(vim_account_id)
- self.backend = self._get_backend(vim_account)
+ self.backend = self._get_backend(vim_account, vim_session)
def _build_keystone_client(self, vim_account: dict) -> keystone_client.Client:
sess = OpenstackUtils.get_session(vim_account)
value = self.backend.collect_metric(
metric_type, openstack_metric_name, resource_id
)
+
+ if value is None and metric_name in METRIC_MAPPINGS_FOR_ROCKY_AND_NEWER_RELEASES:
+ # Reattempting metric collection with new metric names.
+ # Some metric names have changed in newer Openstack releases
+ log.info(
+ "Reattempting metric collection for type: %s and name: %s and resource_id %s",
+ metric_type,
+ metric_name,
+ resource_id
+ )
+ openstack_metric_name = METRIC_MAPPINGS_FOR_ROCKY_AND_NEWER_RELEASES[metric_name]
+ value = self.backend.collect_metric(
+ metric_type, openstack_metric_name, resource_id
+ )
if value is not None:
log.info("value: %s", value)
metric = VnfMetric(
log.info("Error in metric collection: %s" % e)
return metrics
- def _get_backend(self, vim_account: dict):
+ def _get_backend(self, vim_account: dict, vim_session: object):
try:
- gnocchi = GnocchiBackend(vim_account)
+ gnocchi = GnocchiBackend(vim_account, vim_session)
gnocchi.client.metric.list(limit=1)
log.info("Using gnocchi backend to collect metric")
return gnocchi
except (HTTPException, EndpointNotFound):
- ceilometer = CeilometerBackend(vim_account)
+ ceilometer = CeilometerBackend(vim_account, vim_session)
ceilometer.client.capabilities.get()
log.info("Using ceilometer backend to collect metric")
return ceilometer
def _get_metric_type(self, metric_name: str) -> MetricType:
if metric_name not in INTERFACE_METRICS:
- return MetricType.INSTANCE
+ if metric_name not in INSTANCE_DISK:
+ return MetricType.INSTANCE
+ else:
+ return MetricType.INSTANCEDISK
else:
return MetricType.INTERFACE_ALL
class GnocchiBackend(OpenstackBackend):
- def __init__(self, vim_account: dict):
- self.client = self._build_gnocchi_client(vim_account)
- self.neutron = self._build_neutron_client(vim_account)
+ def __init__(self, vim_account: dict, vim_session: object):
+ self.client = self._build_gnocchi_client(vim_account, vim_session)
+ self.neutron = self._build_neutron_client(vim_account, vim_session)
- def _build_gnocchi_client(self, vim_account: dict) -> gnocchi_client.Client:
- sess = OpenstackUtils.get_session(vim_account)
- return gnocchi_client.Client(session=sess)
+ def _build_gnocchi_client(self, vim_account: dict, vim_session: object) -> gnocchi_client.Client:
+ return gnocchi_client.Client(session=vim_session)
- def _build_neutron_client(self, vim_account: dict) -> neutron_client.Client:
- sess = OpenstackUtils.get_session(vim_account)
- return neutron_client.Client(session=sess)
+ def _build_neutron_client(self, vim_account: dict, vim_session: object) -> neutron_client.Client:
+ return neutron_client.Client(session=vim_session)
def collect_metric(
self, metric_type: MetricType, metric_name: str, resource_id: str
elif metric_type == MetricType.INSTANCE:
return self._collect_instance_metric(metric_name, resource_id)
+ elif metric_type == MetricType.INSTANCEDISK:
+ return self._collect_instance_disk_metric(metric_name, resource_id)
+
else:
raise Exception("Unknown metric type %s" % metric_type.value)
if not total_measure:
total_measure = 0.0
total_measure += measures[-1][2]
-
except (gnocchiclient.exceptions.NotFound, TypeError) as e:
# Gnocchi in some Openstack versions raise TypeError instead of NotFound
log.debug(
)
return total_measure
+ def _collect_instance_disk_metric(self, openstack_metric_name, resource_id):
+ value = None
+ instances = self.client.resource.search(
+ resource_type='instance_disk',
+ query={'=': {'instance_id': resource_id}},
+ )
+ for instance in instances:
+ try:
+ measures = self.client.metric.get_measures(
+ openstack_metric_name, resource_id=instance['id'], limit=1
+ )
+ if measures:
+ value = measures[-1][2]
+
+ except gnocchiclient.exceptions.NotFound as e:
+ log.debug("No metric %s found for instance disk %s: %s", openstack_metric_name,
+ instance['id'], e)
+ return value
+
def _collect_instance_metric(self, openstack_metric_name, resource_id):
value = None
try:
class CeilometerBackend(OpenstackBackend):
- def __init__(self, vim_account: dict):
- self.client = self._build_ceilometer_client(vim_account)
+ def __init__(self, vim_account: dict, vim_session: object):
+ self.client = self._build_ceilometer_client(vim_account, vim_session)
- def _build_ceilometer_client(self, vim_account: dict) -> ceilometer_client.Client:
- sess = OpenstackUtils.get_session(vim_account)
- return ceilometer_client.Client("2", session=sess)
+ def _build_ceilometer_client(self, vim_account: dict, vim_session: object) -> ceilometer_client.Client:
+ return ceilometer_client.Client("2", session=vim_session)
def collect_metric(
self, metric_type: MetricType, metric_name: str, resource_id: str
projects / osm / MON.git / blobdiff