Skip to content

Commit

Permalink
alerting: delete alerts when parent folder is deleted
Browse files Browse the repository at this point in the history
  • Loading branch information
bergquist committed Nov 5, 2018
1 parent 0df14f3 commit 423331d
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions pkg/services/sqlstore/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -327,20 +327,34 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
if dashboard.IsFolder {
deletes = append(deletes, "DELETE FROM dashboard_provisioning WHERE dashboard_id in (select id from dashboard where folder_id = ?)")
deletes = append(deletes, "DELETE FROM dashboard WHERE folder_id = ?")
}

for _, sql := range deletes {
_, err := sess.Exec(sql, dashboard.Id)

dashIds := []struct {
Id int64
}{}
err := sess.SQL("select id from dashboard where folder_id = ?", dashboard.Id).Find(&dashIds)
if err != nil {
return err
}

for _, id := range dashIds {
if err := deleteAlertDefinition(id.Id, sess); err != nil {
return nil
}
}
}

if err := deleteAlertDefinition(dashboard.Id, sess); err != nil {
return nil
}

for _, sql := range deletes {
_, err := sess.Exec(sql, dashboard.Id)

if err != nil {
return err
}
}

return nil
})
}
Expand Down

0 comments on commit 423331d

Please sign in to comment.