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

[v10.1.x] Alerting: Fix deleting rules in a folder with matching UID in another organization (#79007)

Browse Source 
* Alerting: Fix deleting rules in a folder with matching UID in another organization (#78258)

* Remove usage of obsolete function for deleting alert rules under folder

* Apply suggestion from code review

* Update tests

(cherry picked from commit 6d4625ad52)

* fixup
This commit is contained in:
Sofia Papagiannaki
2023-12-05 13:30:17 +02:00
committed by GitHub
parent 7a0ee7044b
commit 5bed94f873
11 changed files with 80 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/model.go
+1
View File
@@ -16,6 +16,7 @@ var ErrDatabaseError = errutil.NewBase(errutil.StatusInternal, "folder.database-
var ErrInternal = errutil.NewBase(errutil.StatusInternal, "folder.internal")
var ErrCircularReference = errutil.NewBase(errutil.StatusBadRequest, "folder.circular-reference", errutil.WithPublicMessage("Circular reference detected"))
var ErrTargetRegistrySrvConflict = errutil.NewBase(errutil.StatusInternal, "folder.target-registry-srv-conflict")
var ErrFolderNotEmpty = errutil.NewBase(errutil.StatusBadRequest, "folder.not-empty", errutil.WithPublicMessage("Folder cannot be deleted: folder is not empty"))
const (
GeneralFolderUID = "general"