public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dashboards / Folders: delete related data (permissions, stars, tags, versions, annotations) when deleting a dashboard or a folder (#28826) (#28890)

Browse Source 
* Dashboard: delete related data when deleting a dashboard or a folder

* fix migrations order

* apply PR feedback

(cherry picked from commit f0421ed08e)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)
2020-11-06 09:58:58 +01:00
committed by GitHub
co-authored by Agnès Toulet
parent de19ba97cb
commit c03fbac5db
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrations/dashboard_acl.go
+3
View File
@@ -46,4 +46,7 @@ INSERT INTO dashboard_acl
`
mg.AddMigration("save default acl rules in dashboard_acl table", NewRawSqlMigration(rawSQL))
mg.AddMigration("delete acl rules for deleted dashboards and folders", NewRawSqlMigration(
"DELETE FROM dashboard_acl WHERE dashboard_id NOT IN (SELECT id FROM dashboard) AND dashboard_id != -1"))
}
pkg/services/sqlstore/migrations/dashboard_mig.go
+6
View File
@@ -219,4 +219,10 @@ func addDashboardMigration(mg *Migrator) {
Cols: []string{"title"},
Type: IndexType,
}))
mg.AddMigration("delete tags for deleted dashboards", NewRawSqlMigration(
"DELETE FROM dashboard_tag WHERE dashboard_id NOT IN (SELECT id FROM dashboard)"))
mg.AddMigration("delete stars for deleted dashboards", NewRawSqlMigration(
"DELETE FROM star WHERE dashboard_id NOT IN (SELECT id FROM dashboard)"))
}