from osm_mon.core.keystone import KeystoneConnection
from osm_mon.dashboarder.backends.grafana import GrafanaBackend
from osm_mon import __path__ as mon_path
-from osm_mon.dashboarder.utils import find_in_list
+from osm_mon.core.utils import find_in_list, create_filter_from_nsr
log = logging.getLogger(__name__)
dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path[0])
if project_id not in dashboard_uids:
project_name = project['name']
- self.grafana.create_grafana_folders(project_name)
+ if project_name != "admin":
+ # Create project folder in Grafana only if user is not admin.
+ # Admin user's dashboard will be created in default folder
+ self.grafana.create_grafana_folders(project_name)
self.grafana.create_dashboard(project_id, project_name,
dashboard_path)
log.debug('Created dashboard for Project: %s', project_id)
vnfds_profiles = nsr['nsd']["df"][0]['vnf-profile']
for vnf_profile in vnfds_profiles:
try:
- vnfd = self.common_db.get_vnfd_by_id(vnf_profile['vnfd-id'])
+ vnfd = self.common_db.get_vnfd_by_id(vnf_profile['vnfd-id'], create_filter_from_nsr(nsr))
# If there are metrics, create dashboard (if exists)
vdu_found = find_in_list(vnfd["vdu"], lambda a_vdu: "monitoring-parameter" in a_vdu)
if vdu_found:
if nsr_id not in dashboard_uids:
nsr_name = nsr['name']
project_id = nsr["_admin"]["projects_read"][0]
- project_details = self.common_db.get_project(project_id)
- project_name = project_details["name"]
+ try:
+ # Get project details from commondb
+ project_details = self.common_db.get_project(project_id)
+ project_name = project_details["name"]
+ except Exception as e:
+ # Project not found in commondb
+ if self.keystone:
+ # Serach project in keystone
+ for project in projects:
+ if project_id == project['_id']:
+ project_name = project["name"]
+ else:
+ log.info('Project %s not found', project_id)
+ log.debug('Exception %s' % e)
self.grafana.create_dashboard(nsr_id, nsr_name,
dashboard_path, project_name)
log.debug('Created dashboard for NS: %s', nsr_id)
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"]
+ try:
+ # Get user details from commondb
+ user = self.common_db.get_user_by_id(userid)
+ user_name = user["username"]
+ except Exception as e:
+ # User not found in commondb
+ if self.keystone:
+ # Serach user in keystone
+ user = self.keystone.getUserById(userid)
+ user_name = user.name
+ else:
+ log.info('User %s not found', userid)
+ log.debug('Exception %s' % e)
proj_list = []
for project in project_data:
proj_list.append(project["project"])