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
9de19fb9
Commit
9de19fb9
authored
3 years ago
by
Bjarke Madsen
Browse files
Options
Downloads
Patches
Plain Diff
Delete left-over or unmanaged folders.
parent
228d0f9b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
brian_dashboard_manager/grafana/folder.py
+1
-1
1 addition, 1 deletion
brian_dashboard_manager/grafana/folder.py
brian_dashboard_manager/grafana/provision.py
+14
-1
14 additions, 1 deletion
brian_dashboard_manager/grafana/provision.py
with
15 additions
and
2 deletions
brian_dashboard_manager/grafana/folder.py
+
1
−
1
View file @
9de19fb9
...
...
@@ -6,7 +6,7 @@ from brian_dashboard_manager.grafana.utils.request import TokenRequest
logger
=
logging
.
getLogger
(
__name__
)
def
delete_folder
(
request
:
TokenRequest
,
title
,
uid
=
None
):
def
delete_folder
(
request
:
TokenRequest
,
title
=
None
,
uid
=
None
):
if
uid
:
r
=
request
.
delete
(
f
'
api/folders/
{
uid
}
'
)
return
r
is
not
None
...
...
This diff is collapsed.
Click to expand it.
brian_dashboard_manager/grafana/provision.py
+
14
−
1
View file @
9de19fb9
...
...
@@ -22,7 +22,7 @@ from brian_dashboard_manager.grafana.dashboard import find_dashboard, \
from
brian_dashboard_manager.grafana.datasource
import
\
check_provisioned
,
create_datasource
from
brian_dashboard_manager.grafana.folder
import
find_folder
,
\
delete_folder
delete_folder
,
get_folders
from
brian_dashboard_manager.inventory_provider.interfaces
import
\
get_gws_direct
,
get_gws_indirect
,
get_interfaces
...
...
@@ -308,6 +308,11 @@ def provision(config):
updated
=
find_dashboard
(
token_request
)
or
[]
updated
=
reduce
(
get_uid
,
updated
,
{})
# General is a base folder present in Grafana
folders_to_keep
=
[
'
General
'
,
'
Aggregates
'
]
folders_to_keep
.
extend
([
dash
[
'
folder_name
'
]
for
dash
in
dashboards
.
values
()])
def
update_dash_list
(
dashboards
):
for
dashboard
in
dashboards
:
if
isinstance
(
dashboard
,
Future
):
...
...
@@ -451,6 +456,7 @@ def provision(config):
# get dashboard UIDs from ignored folders
# and make sure we don't touch them
for
name
in
ignored_folders
:
folders_to_keep
.
append
(
name
)
logger
.
info
(
f
'
Ignoring dashboards under the folder
{
org
[
"
name
"
]
}
/
{
name
}
'
)
folder
=
find_folder
(
token_request
,
name
,
create
=
False
)
...
...
@@ -470,6 +476,13 @@ def provision(config):
logger
.
info
(
f
'
Deleting stale dashboard with UID
{
dash
}
'
)
delete_dashboard
(
token_request
,
{
'
uid
'
:
dash
})
all_folders
=
get_folders
(
token_request
)
folders_to_keep
=
set
(
folders_to_keep
)
for
folder
in
all_folders
:
if
folder
[
'
title
'
]
not
in
folders_to_keep
:
delete_folder
(
token_request
,
uid
=
folder
[
'
uid
'
])
logger
.
info
(
f
'
Time to complete:
{
time
.
time
()
-
start
}
'
)
for
org_id
,
token
in
tokens
:
delete_api_token
(
request
,
org_id
,
token
)
...
...
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