X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fopenstack.py;h=a823b67b827ed8fd05522dd9ca553bba6f1ab09b;hb=refs%2Fchanges%2F56%2F11956%2F3;hp=aba47886453749348f0b0287ab8bd88714209874;hpb=f0d126123e966909728d69d55bfe5fb1bce8bace;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/openstack.py b/osm_mon/collector/vnf_collectors/openstack.py
index aba4788..a823b67 100644
--- a/osm_mon/collector/vnf_collectors/openstack.py
+++ b/osm_mon/collector/vnf_collectors/openstack.py
@@ -31,6 +31,7 @@ from gnocchiclient.v1 import client as gnocchi_client
 from keystoneauth1.exceptions.catalog import EndpointNotFound
 from keystoneclient.v3 import client as keystone_client
 from neutronclient.v2_0 import client as neutron_client
+from prometheus_api_client import PrometheusConnect as prometheus_client
 
 from osm_mon.collector.metric import Metric
 from osm_mon.collector.utils.openstack import OpenstackUtils
@@ -130,7 +131,11 @@ class OpenstackCollector(BaseVimCollector):
             if "monitoring-parameter" in vdu:
                 for param in vdu["monitoring-parameter"]:
                     metric_name = param["performance-metric"]
-                    openstack_metric_name = METRIC_MAPPINGS[metric_name]
+                    log.debug(f"Using an {type(self.backend)} as backend")
+                    if type(self.backend) is PrometheusTSBDBackend:
+                        openstack_metric_name = self.backend.map_metric(metric_name)
+                    else:
+                        openstack_metric_name = METRIC_MAPPINGS[metric_name]
                     metric_type = self._get_metric_type(metric_name)
                     try:
                         resource_id = self._get_resource_uuid(
@@ -156,7 +161,7 @@ class OpenstackCollector(BaseVimCollector):
                             metric_type, openstack_metric_name, resource_id
                         )
 
-                        if value is None and metric_name in METRIC_MAPPINGS_FOR_ROCKY_AND_NEWER_RELEASES:
+                        if value is None and metric_name in METRIC_MAPPINGS_FOR_ROCKY_AND_NEWER_RELEASES and type(self.backend) is not PrometheusTSBDBackend:
                             # Reattempting metric collection with new metric names.
                             # Some metric names have changed in newer Openstack releases
                             log.info(
@@ -191,15 +196,23 @@ class OpenstackCollector(BaseVimCollector):
         return metrics
 
     def _get_backend(self, vim_account: dict, vim_session: object):
+        if vim_account.get("prometheus-config"):
+            try:
+                tsbd = PrometheusTSBDBackend(vim_account)
+                log.debug("Using prometheustsbd backend to collect metric")
+                return tsbd
+            except Exception as e:
+                log.error(f"Can't create prometheus client, {e}")
+                return None
         try:
             gnocchi = GnocchiBackend(vim_account, vim_session)
             gnocchi.client.metric.list(limit=1)
-            log.info("Using gnocchi backend to collect metric")
+            log.debug("Using gnocchi backend to collect metric")
             return gnocchi
         except (HTTPException, EndpointNotFound):
             ceilometer = CeilometerBackend(vim_account, vim_session)
             ceilometer.client.capabilities.get()
-            log.info("Using ceilometer backend to collect metric")
+            log.debug("Using ceilometer backend to collect metric")
             return ceilometer
 
     def _get_metric_type(self, metric_name: str) -> MetricType:
@@ -219,6 +232,33 @@ class OpenstackBackend:
         pass
 
 
+class PrometheusTSBDBackend(OpenstackBackend):
+    def __init__(self, vim_account: dict):
+        self.cred = vim_account["prometheus-config"]["prometheus_cred"]
+        self.map = vim_account["prometheus-config"]["prometheus_map"]
+        self.client = self._build_prometheus_client(vim_account)
+
+    def _build_prometheus_client(self, vim_account: dict) -> prometheus_client:
+        url = vim_account["prometheus-config"]["prometheus_url"]
+        return prometheus_client(url, disable_ssl = True)
+
+    def collect_metric(
+        self, metric_type: MetricType, metric_name: str, resource_id: str
+        ):
+        metric = self.query_metric(metric_name, resource_id)
+        return metric["value"][1] if metric else None
+
+    def map_metric(self, metric_name: str):
+        return self.map[metric_name]
+
+    def query_metric(self, metric_name, resource_id = None):
+        metrics = self.client.get_current_metric_value(metric_name = metric_name)
+        if resource_id:
+            metric = next(filter(lambda x: resource_id in x["metric"]["resource_id"], metrics))
+            return metric
+        return metrics
+
+
 class GnocchiBackend(OpenstackBackend):
     def __init__(self, vim_account: dict, vim_session: object):
         self.client = self._build_gnocchi_client(vim_account, vim_session)