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
Commits
0275deff
Commit
0275deff
authored
2 years ago
by
Bjarke Madsen
Browse files
Options
Downloads
Patches
Plain Diff
Add a bunch of comments referencing JIRA ticket
parent
4552ba19
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
brian_dashboard_manager/grafana/provision.py
+7
-2
7 additions, 2 deletions
brian_dashboard_manager/grafana/provision.py
with
7 additions
and
2 deletions
brian_dashboard_manager/grafana/provision.py
+
7
−
2
View file @
0275deff
...
...
@@ -46,7 +46,7 @@ logger = logging.getLogger(__name__)
MAX_WORKERS
=
4
DASHBOARDS
=
{
'
NRENBETA
'
:
{
'
NRENBETA
'
:
{
# needed for POL1-642 BETA
'
tag
'
:
[
'
customersbeta
'
],
'
folder_name
'
:
'
NREN Access BETA
'
,
'
interfaces
'
:
[]
...
...
@@ -194,12 +194,15 @@ def provision_folder(token_request, folder_name, dash,
# dashboard should include error panels
errors
=
dash
.
get
(
'
errors
'
,
False
)
is_nren
=
folder_name
==
'
NREN Access
'
# needed for POL1-642 BETA
is_nren_beta
=
folder_name
==
'
NREN Access BETA
'
is_nren
=
folder_name
==
'
NREN Access
'
if
is_nren
:
data
=
get_nren_interface_data_old
(
interfaces
)
dash_data
=
get_nren_dashboard_data
(
data
,
ds_name
,
tag
)
elif
is_nren_beta
:
# needed for POL1-642 BETA
services
=
fetch_services
(
config
[
'
reporting_provider
'
])
data
=
get_nren_interface_data
(
services
,
interfaces
,
excluded_dashboards
)
...
...
@@ -277,6 +280,8 @@ def is_excluded_folder(org_config, folder_name):
def
excluded_folder_dashboards
(
org_config
,
folder_name
):
excluded_folders
=
org_config
.
get
(
'
excluded_folders
'
,
{})
excluded
=
excluded_folders
.
get
(
folder_name
,
[])
# in is needed for POL1-642 BETA ('NREN Access BETA' folder)
# revert to == 'NREN Access' when beta is over
if
'
NREN Access
'
in
folder_name
:
excluded_nrens
=
org_config
.
get
(
'
excluded_nrens
'
,
[])
excluded
=
list
(
set
(
excluded
).
union
(
set
(
excluded_nrens
)))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment