Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
brian-dashboard-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
geant-swd
brian
brian-dashboard-manager
Merge requests
!13
Feature/pol1 430 EAP NRENs
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Feature/pol1 430 EAP NRENs
feature/POL1-430-EAP-NRENs
into
develop
Overview
23
Commits
13
Pipelines
0
Changes
1
Merged
Sam Roberts
requested to merge
feature/POL1-430-EAP-NRENs
into
develop
10 months ago
Overview
16
Commits
13
Pipelines
0
Changes
1
Expand
adds support for NREN categories/regions
NRENs in a category/region are removed from the NREN dropdown list and must be accessed from a separate (manually created, at the moment) dashboard
0
0
Merge request reports
Viewing commit
803e3aec
Prev
Next
Show latest version
1 file
+
0
−
11
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
803e3aec
this should have not come back (???)
· 803e3aec
Sam Roberts
authored
9 months ago
brian_dashboard_manager/grafana/provision.py
+
0
−
11
Options
@@ -239,7+239,7 @@
customers
=
[]
region_lookup
=
{
region
[
'
nren
'
]:
region
[
'
region
'
]
for
region
in
regions
}
for
service
in
services
:
service_customers
=
service
.
get
(
'
customers
'
)
for
cust
in
service_customers
:
cust_region
=
region_lookup
.
get
(
cust
,
None
)
if
cust_region
==
region
:
@@ -449,7+449,7 @@
ifaces
=
AGG_DASHBOARDS
[
dash_name
][
'
interfaces
'
]
ifaces
.
append
(
iface
)
# aggregate dashboards based on dashboards_info
# there is no way for inventory provider to identify an interface as
# belonging to an EAP NREN at the level 'dashboards' is set
# (based on description and without access to service data)
# so we have to do this as an extra check on 'dashboards_info'
for
dashboard
in
iface
[
'
dashboards_info
'
]:
dash_name
=
dashboard
[
'
name
'
]
if
dash_name
in
AGG_DASHBOARDS
:
ifaces
=
AGG_DASHBOARDS
[
dash_name
][
'
interfaces
'
]
ifaces
.
append
(
iface
)
# provision dashboards and their folders
with
ThreadPoolExecutor
(
max_workers
=
MAX_WORKERS
)
as
executor
:
provisioned
=
[]
Loading