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
a1b5873d
Commit
a1b5873d
authored
1 year ago
by
Sam Roberts
Browse files
Options
Downloads
Patches
Plain Diff
a few tweaks from feedback
parent
6ed4be1b
No related branches found
No related tags found
1 merge request
!11
Feature/pol1 700 mws page
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
brian_dashboard_manager/grafana/provision.py
+3
-1
3 additions, 1 deletion
brian_dashboard_manager/grafana/provision.py
brian_dashboard_manager/templating/render.py
+1
-2
1 addition, 2 deletions
brian_dashboard_manager/templating/render.py
with
4 additions
and
3 deletions
brian_dashboard_manager/grafana/provision.py
+
3
−
1
View file @
a1b5873d
...
@@ -230,6 +230,8 @@ def provision_folder(token_request, folder_name, dash, services,
...
@@ -230,6 +230,8 @@ def provision_folder(token_request, folder_name, dash, services,
is_nren
=
folder_name
==
"
NREN Access
"
is_nren
=
folder_name
==
"
NREN Access
"
is_re_peer
=
folder_name
==
"
RE Peer
"
is_re_peer
=
folder_name
==
"
RE Peer
"
is_service
=
'
service_type
'
in
dash
is_service
=
'
service_type
'
in
dash
# todo: figure out a neater way to do this?
is_complex
=
is_nren
or
is_nren_beta
or
is_re_peer
or
is_service
if
is_nren
:
if
is_nren
:
data
=
get_nren_interface_data_old
(
interfaces
)
data
=
get_nren_interface_data_old
(
interfaces
)
...
@@ -257,7 +259,7 @@ def provision_folder(token_request, folder_name, dash, services,
...
@@ -257,7 +259,7 @@ def provision_folder(token_request, folder_name, dash, services,
with
ThreadPoolExecutor
(
max_workers
=
MAX_WORKERS
)
as
executor
:
with
ThreadPoolExecutor
(
max_workers
=
MAX_WORKERS
)
as
executor
:
for
dashboard
in
dash_data
:
for
dashboard
in
dash_data
:
if
is_
nren
or
is_nren_beta
or
is_re_peer
or
is_service
:
if
is_
complex
:
rendered
=
render_complex_dashboard
(
**
dashboard
)
rendered
=
render_complex_dashboard
(
**
dashboard
)
else
:
else
:
rendered
=
render_simple_dashboard
(
**
dashboard
)
rendered
=
render_simple_dashboard
(
**
dashboard
)
...
...
This diff is collapsed.
Click to expand it.
brian_dashboard_manager/templating/render.py
+
1
−
2
View file @
a1b5873d
...
@@ -276,8 +276,7 @@ def render_complex_dashboard(
...
@@ -276,8 +276,7 @@ def render_complex_dashboard(
):
):
assert
tag
or
tags
assert
tag
or
tags
panels
=
[
create_infobox
()]
panels
=
[
create_infobox
()]
if
len
(
aggregate_panels
)
>
0
:
panels
.
extend
(
aggregate_panels
)
panels
.
extend
(
aggregate_panels
)
for
group
in
dropdown_groups
:
for
group
in
dropdown_groups
:
panels
.
append
(
group
[
"
dropdown
"
])
panels
.
append
(
group
[
"
dropdown
"
])
panels
.
extend
(
group
[
"
panels
"
])
panels
.
extend
(
group
[
"
panels
"
])
...
...
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