X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fcollector.py;h=a69e651a6c3a4bc0af382dacb055c96a1c7a9179;hb=refs%2Fchanges%2F03%2F10803%2F1;hp=016014bf85cbc854c7c57ec885a8b70519158320;hpb=527dd0e6bbd809788f774092f1d688a6721998c7;p=osm%2FMON.git

diff --git a/osm_mon/collector/collector.py b/osm_mon/collector/collector.py
index 016014b..a69e651 100644
--- a/osm_mon/collector/collector.py
+++ b/osm_mon/collector/collector.py
@@ -21,88 +21,38 @@
 # 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.collector.collectors.vmware import VMwareCollector
-from osm_mon.core.common_db 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,
-    "vmware": VMwareCollector
-}
-METRIC_BACKENDS = [
-    PrometheusBackend
-]
+METRIC_BACKENDS = [PrometheusBackend]
 
 
 class Collector:
-    def __init__(self):
-        self.common_db = CommonDbClient()
-        self.plugins = []
-        self.database_manager = DatabaseManager()
-        self.database_manager.create_tables()
-        self.queue = multiprocessing.Queue()
-
-    def init_backends(self):
-        for backend in METRIC_BACKENDS:
-            self.plugins.append(backend())
+    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()
+        log.debug("collect_forever")
         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 _collect_vim_metrics(self, vnfr: dict, vim_account_id: str):
-        # TODO(diazb) Add support for vrops and aws
-        vim_type = self.database_manager.get_vim_type(vim_account_id)
-        if vim_type in VIM_COLLECTORS:
-            collector = VIM_COLLECTORS[vim_type](vim_account_id)
-            metrics = collector.collect(vnfr)
-            for metric in metrics:
-                self.queue.put(metric)
-        else:
-            log.debug("vimtype %s is not supported.", vim_type)
-
-    def _collect_vca_metrics(self, vnfr: dict):
-        log.debug('_collect_vca_metrics')
-        log.debug('vnfr: %s', vnfr)
-        vca_collector = VCACollector()
-        metrics = vca_collector.collect(vnfr)
-        for metric in metrics:
-            self.queue.put(metric)
-
     def collect_metrics(self):
-        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.common_db.get_vim_account_id(nsr_id, vnf_member_index)
-            p = multiprocessing.Process(target=self._collect_vim_metrics,
-                                        args=(vnfr, vim_account_id))
-            processes.append(p)
-            p.start()
-            p = multiprocessing.Process(target=self._collect_vca_metrics,
-                                        args=(vnfr,))
-            processes.append(p)
-            p.start()
-        for process in processes:
-            process.join()
-        metrics = []
-        while not self.queue.empty():
-            metrics.append(self.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())