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
22360dae
Commit
22360dae
authored
10 months ago
by
geant-release-service
Browse files
Options
Downloads
Plain Diff
Finished release 0.60.
parents
eb499517
c243c771
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
brian_dashboard_manager/templating/helpers.py
+14
-20
14 additions, 20 deletions
brian_dashboard_manager/templating/helpers.py
changelog.md
+3
-0
3 additions, 0 deletions
changelog.md
setup.py
+1
-1
1 addition, 1 deletion
setup.py
with
18 additions
and
21 deletions
brian_dashboard_manager/templating/helpers.py
+
14
−
20
View file @
22360dae
...
...
@@ -212,7 +212,7 @@ def get_nren_interface_data(services, interfaces, excluded_dashboards):
if_name
=
_interfaces
[
0
].
get
(
'
port
'
)
router
=
_interfaces
[
0
].
get
(
'
equipment
'
)
router
=
router
.
replace
(
'
.geant.net
'
,
''
)
title
=
f
'
{
router
}
-
{
if_name
}
-
{
name
}
(
{
sid
}
)
'
title
=
f
'
{
router
}
-
{{}} -
{
if_name
}
-
{
name
}
(
{
sid
}
)
'
if
lag_service
:
if
len
(
_interfaces
)
>
1
:
...
...
@@ -495,7 +495,7 @@ def get_panel_fields(panel, panel_type, datasource):
})
def
default_interface_panel_generator
(
gridPos
,
ipv6_only
=
Fals
e
):
def
default_interface_panel_generator
(
gridPos
,
use_all_traffic
=
True
,
use_ipv6
=
Tru
e
):
"""
Helper for generating panel definitions for dashboards.
...
...
@@ -503,7 +503,8 @@ def default_interface_panel_generator(gridPos, ipv6_only=False):
panel data and panel type.
:param gridPos: generator for grid positions
:param ipv6_only: whether to use IPv6 traffic exclusively or not
:param use_all_traffic: include ipv4 + other traffic interfaces
:param use_ipv6: include ipv6 interfaces
:return: function that generates panel definitions
"""
...
...
@@ -518,36 +519,29 @@ def default_interface_panel_generator(gridPos, ipv6_only=False):
:param panels: panel data
:param datasource: datasource to use for the panel
:param errors: whether
or not
to include an error panel
:param errors: whether to include an error panel
:return: list of panel definitions
"""
result
=
[]
for
panel
in
panels
:
if
ipv6_only
:
if
panel
.
get
(
'
has_v6
'
,
False
):
result
.
append
(
get_panel_fields
({
**
panel
,
**
next
(
gridPos
)
},
'
IPv6
'
,
datasource
))
else
:
continue
else
:
if
use_all_traffic
:
result
.
append
(
get_panel_fields
({
**
panel
,
**
next
(
gridPos
)
},
'
traffic
'
,
datasource
))
if
use_ipv6
:
if
panel
.
get
(
'
has_v6
'
,
False
):
result
.
append
(
get_panel_fields
({
**
panel
,
**
next
(
gridPos
)
},
'
IPv6
'
,
datasource
))
if
errors
:
result
.
append
(
get_panel_fields
({
**
panel
,
**
next
(
gridPos
)
},
'
errors
'
,
datasource
))
if
errors
:
result
.
append
(
get_panel_fields
({
**
panel
,
**
next
(
gridPos
)
},
'
errors
'
,
datasource
))
return
result
...
...
@@ -583,8 +577,8 @@ def get_nren_dashboard_data_single(data, datasource, tag):
gridPos
=
gridPos_generator
(
id_gen
)
agg_panels
=
[]
panel_gen
=
default_interface_panel_generator
(
gridPos
)
panel_ipv6_gen
=
default_interface_panel_generator
(
gridPos
,
ipv6_only
=
True
)
panel_gen
=
default_interface_panel_generator
(
gridPos
,
use_all_traffic
=
True
,
use_ipv6
=
False
)
panel_ipv6_gen
=
default_interface_panel_generator
(
gridPos
,
use_all_traffic
=
False
,
use_ipv6
=
True
)
services_dropdown
=
create_dropdown_panel
(
'
Services
'
,
**
next
(
gridPos
))
...
...
This diff is collapsed.
Click to expand it.
changelog.md
+
3
−
0
View file @
22360dae
...
...
@@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
## [0.60] - 2024-04-24
-
POL1-809: hide ipv6 only interfaces from service panel showing interfaces with all traffic
## [0.59] - 2024-04-24
-
Add exception logging when provisioning to aid in debugging
-
Fix inventory-provider schema to be less strict to support new values in the future
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
1
View file @
22360dae
...
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup
(
name
=
'
brian-dashboard-manager
'
,
version
=
"
0.
59
"
,
version
=
"
0.
60
"
,
author
=
'
GEANT
'
,
author_email
=
'
swd@geant.org
'
,
description
=
''
,
...
...
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