X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fcollector.py;h=ad166e4154f82a3267e9b52d6cf9af9df0d8b9d9;hb=refs%2Fchanges%2F37%2F10737%2F1;hp=ac9408fc5826bfea0bcddc09eeb94de05a8a7561;hpb=0e34244e420bd68e6acb0cf6bb4383fedb662070;p=osm%2FMON.git

diff --git a/osm_mon/collector/collector.py b/osm_mon/collector/collector.py
index ac9408f..ad166e4 100644
--- a/osm_mon/collector/collector.py
+++ b/osm_mon/collector/collector.py
@@ -21,88 +21,40 @@
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
 import logging
-import multiprocessing
 import time
 
 from osm_mon.collector.backends.prometheus import PrometheusBackend
-from osm_mon.collector.collectors.juju import VCACollector
-from osm_mon.collector.collectors.openstack import OpenstackCollector
-from osm_mon.common.common_db_client import CommonDbClient
-from osm_mon.core.database import DatabaseManager
-from osm_mon.core.settings import Config
+from osm_mon.collector.service import CollectorService
+from osm_mon.core.config import Config
 
 log = logging.getLogger(__name__)
 
-VIM_COLLECTORS = {
-    "openstack": OpenstackCollector
-}
+METRIC_BACKENDS = [
+    PrometheusBackend
+]
 
 
 class Collector:
-    def __init__(self):
-        self.common_db = CommonDbClient()
-        self.producer_timeout = 5
-        self.consumer_timeout = 5
-        self.plugins = []
-        self.database_manager = DatabaseManager()
-        self.database_manager.create_tables()
-
-    def init_plugins(self):
-        prometheus_plugin = PrometheusBackend()
-        self.plugins.append(prometheus_plugin)
+    def __init__(self, config: Config):
+        self.conf = config
+        self.service = CollectorService(config)
+        self.backends = []
+        self._init_backends()
 
     def collect_forever(self):
         log.debug('collect_forever')
-        cfg = Config.instance()
         while True:
             try:
                 self.collect_metrics()
-                time.sleep(cfg.OSMMON_COLLECTOR_INTERVAL)
+                time.sleep(int(self.conf.get('collector', 'interval')))
             except Exception:
                 log.exception("Error collecting metrics")
 
-    def _get_vim_account_id(self, nsr_id: str, vnf_member_index: int) -> str:
-        vnfr = self.common_db.get_vnfr(nsr_id, vnf_member_index)
-        return vnfr['vim-account-id']
-
-    def _get_vim_type(self, vim_account_id):
-        """Get the vim type that is required by the message."""
-        credentials = self.database_manager.get_credentials(vim_account_id)
-        return credentials.type
-
-    def _init_vim_collector_and_collect(self, vnfr: dict, vim_account_id: str, queue: multiprocessing.Queue):
-        # TODO(diazb) Add support for vrops and aws
-        vim_type = self._get_vim_type(vim_account_id)
-        if vim_type in VIM_COLLECTORS:
-            collector = VIM_COLLECTORS[vim_type](vim_account_id)
-            collector.collect(vnfr, queue)
-        else:
-            log.debug("vimtype %s is not supported.", vim_type)
-
-    def _init_vca_collector_and_collect(self, vnfr: dict, queue: multiprocessing.Queue):
-        vca_collector = VCACollector()
-        vca_collector.collect(vnfr, queue)
-
     def collect_metrics(self):
-        queue = multiprocessing.Queue()
-        vnfrs = self.common_db.get_vnfrs()
-        processes = []
-        for vnfr in vnfrs:
-            nsr_id = vnfr['nsr-id-ref']
-            vnf_member_index = vnfr['member-vnf-index-ref']
-            vim_account_id = self._get_vim_account_id(nsr_id, vnf_member_index)
-            p = multiprocessing.Process(target=self._init_vim_collector_and_collect,
-                                        args=(vnfr, vim_account_id, queue))
-            processes.append(p)
-            p.start()
-            p = multiprocessing.Process(target=self._init_vca_collector_and_collect,
-                                        args=(vnfr, queue))
-            processes.append(p)
-            p.start()
-        for process in processes:
-            process.join()
-        metrics = []
-        while not queue.empty():
-            metrics.append(queue.get())
-        for plugin in self.plugins:
-            plugin.handle(metrics)
+        metrics = self.service.collect_metrics()
+        for backend in self.backends:
+            backend.handle(metrics)
+
+    def _init_backends(self):
+        for backend in METRIC_BACKENDS:
+            self.backends.append(backend())