feature(grafana): Grafana uses url, user and password from configuration, check mon.yml for more details
Change-Id: I223e07e599f87ec07fe09c73dd68cd89aecc73bf
Signed-off-by: bravof <fbravo@whitestack.com>
(cherry picked from commit 396648b6eab42dcabdec1cef131618971dc64fbe)
diff --git a/osm_mon/dashboarder/service.py b/osm_mon/dashboarder/service.py
index 8008f7d..9f184d2 100644
--- a/osm_mon/dashboarder/service.py
+++ b/osm_mon/dashboarder/service.py
@@ -24,7 +24,7 @@
from osm_mon.core.common_db import CommonDbClient
from osm_mon.core.config import Config
-import osm_mon.dashboarder.backends.grafana as grafana
+from osm_mon.dashboarder.backends.grafana import GrafanaBackend
from osm_mon import __path__ as mon_path
log = logging.getLogger(__name__)
@@ -34,11 +34,12 @@
def __init__(self, config: Config):
self.conf = config
self.common_db = CommonDbClient(self.conf)
+ self.grafana = GrafanaBackend(self.conf)
def create_dashboards(self):
# TODO lavado: migrate these methods to mongo change streams
# Lists all dashboards and OSM resources for later comparisons
- dashboard_uids = grafana.get_all_dashboard_uids()
+ dashboard_uids = self.grafana.get_all_dashboard_uids()
osm_resource_uids = []
# Reads existing project list and creates a dashboard for each
@@ -50,8 +51,8 @@
dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path[0])
if project_id not in dashboard_uids:
project_name = project['name']
- grafana.create_dashboard(project_id, project_name,
- dashboard_path)
+ self.grafana.create_dashboard(project_id, project_name,
+ dashboard_path)
log.debug('Created dashboard for Project: %s', project_id)
else:
log.debug('Dashboard already exists')
@@ -73,8 +74,8 @@
if 'monitoring-param' in vnfd:
if nsr_id not in dashboard_uids:
nsr_name = nsr['name']
- grafana.create_dashboard(nsr_id, nsr_name,
- dashboard_path)
+ self.grafana.create_dashboard(nsr_id, nsr_name,
+ dashboard_path)
log.debug('Created dashboard for NS: %s', nsr_id)
else:
log.debug('Dashboard already exists')
@@ -88,7 +89,7 @@
# Delete obsolete dashboards
for dashboard_uid in dashboard_uids:
if dashboard_uid not in osm_resource_uids:
- grafana.delete_dashboard(dashboard_uid)
+ self.grafana.delete_dashboard(dashboard_uid)
log.debug('Deleted obsolete dashboard: %s', dashboard_uid)
else:
log.debug('All dashboards in use')