X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fdashboarder%2Fservice.py;h=2abd6bebb7e0c29e4d038adf93a17ee43c328549;hb=85a9185db3248f1e3f20c8edad95ab77b8ee989c;hp=74812b518152fec8c3186456f16d0d98c430124a;hpb=1d71df519a27b90cf88c11b1b14227928db2db1f;p=osm%2FMON.git

diff --git a/osm_mon/dashboarder/service.py b/osm_mon/dashboarder/service.py
index 74812b5..2abd6be 100644
--- a/osm_mon/dashboarder/service.py
+++ b/osm_mon/dashboarder/service.py
@@ -24,7 +24,7 @@ import logging
 
 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 @@ class DashboarderService:
     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
@@ -47,11 +48,11 @@ class DashboarderService:
             project_id = project['_id']
             # Collect Project IDs for periodical dashboard clean-up
             osm_resource_uids.append(project_id)
-            dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path)
+            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')
@@ -61,7 +62,7 @@ class DashboarderService:
         nsrs = self.common_db.get_nsrs()
         for nsr in nsrs:
             nsr_id = nsr['_id']
-            dashboard_path = '{}/dashboarder/templates/ns_scoped.json'.format(mon_path)
+            dashboard_path = '{}/dashboarder/templates/ns_scoped.json'.format(mon_path[0])
             # Collect NS IDs for periodical dashboard clean-up
             osm_resource_uids.append(nsr_id)
             # Check if the NSR's VNFDs contain metrics
@@ -70,11 +71,14 @@ class DashboarderService:
                 try:
                     vnfd = self.common_db.get_vnfd_by_name(constituent_vnfd['vnfd-id-ref'])
                     # If there are metrics, create dashboard (if exists)
-                    if 'monitoring-param' in vnfd:
+                    if vnfd and 'monitoring-param' in vnfd:
                         if nsr_id not in dashboard_uids:
                             nsr_name = nsr['name']
-                            grafana.create_dashboard(nsr_id, nsr_name,
-                                                     dashboard_path)
+                            project_id = nsr["_admin"]["projects_read"][0]
+                            project_details = self.common_db.get_project(project_id)
+                            project_name = project_details["name"]
+                            self.grafana.create_dashboard(nsr_id, nsr_name,
+                                                          dashboard_path, project_name)
                             log.debug('Created dashboard for NS: %s', nsr_id)
                         else:
                             log.debug('Dashboard already exists')
@@ -88,7 +92,33 @@ class DashboarderService:
         # 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')
+
+    def create_grafana_user(self, user):
+        self.grafana.create_grafana_users(user)
+
+    def create_grafana_team_member(self, project_data, userid):
+        user = self.common_db.get_user_by_id(userid)
+        user_name = user["username"]
+        proj_list = []
+        for project in project_data:
+            proj_list.append(project["project"])
+        for proj in project_data:
+            role_obj = self.common_db.get_role_by_name(proj["role"])
+            is_admin = role_obj["permissions"].get("admin")
+            self.grafana.create_grafana_teams_members(proj["project"], user_name, is_admin, proj_list)
+
+    def create_grafana_team(self, team_name):
+        self.grafana.create_grafana_teams(team_name)
+
+    def delete_grafana_user(self, user_name):
+        self.grafana.delete_grafana_users(user_name)
+
+    def delete_grafana_team(self, project_name):
+        self.grafana.delete_grafana_team(project_name)
+
+    def update_grafana_team(self, project_new_name, project_old_name):
+        self.grafana.update_grafana_teams(project_new_name, project_old_name)