Alerting: Remove ngalert feature toggle and introduce two new settings for enabling Grafana 8 alerts and disabling them for specific organisations (#38746)
* Remove `ngalert` feature toggle * Update frontend Remove all references of ngalert feature toggle * Update docs * Disable unified alerting for specific orgs * Add backend tests * Apply suggestions from code review Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Disabled unified alerting by default * Ensure backward compatibility with old ngalert feature toggle * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com>
This commit is contained in:
co-authored by
achatterjee-grafana
gotjosh
parent
2dedbcd3c3
commit
012d4f0905
+20
-20
@@ -44,38 +44,38 @@ type GlobalQuotaDTO struct {
|
||||
}
|
||||
|
||||
type GetOrgQuotaByTargetQuery struct {
|
||||
Target string
|
||||
OrgId int64
|
||||
Default int64
|
||||
IsNgAlertEnabled bool
|
||||
Result *OrgQuotaDTO
|
||||
Target string
|
||||
OrgId int64
|
||||
Default int64
|
||||
UnifiedAlertingEnabled bool
|
||||
Result *OrgQuotaDTO
|
||||
}
|
||||
|
||||
type GetOrgQuotasQuery struct {
|
||||
OrgId int64
|
||||
IsNgAlertEnabled bool
|
||||
Result []*OrgQuotaDTO
|
||||
OrgId int64
|
||||
UnifiedAlertingEnabled bool
|
||||
Result []*OrgQuotaDTO
|
||||
}
|
||||
|
||||
type GetUserQuotaByTargetQuery struct {
|
||||
Target string
|
||||
UserId int64
|
||||
Default int64
|
||||
IsNgAlertEnabled bool
|
||||
Result *UserQuotaDTO
|
||||
Target string
|
||||
UserId int64
|
||||
Default int64
|
||||
UnifiedAlertingEnabled bool
|
||||
Result *UserQuotaDTO
|
||||
}
|
||||
|
||||
type GetUserQuotasQuery struct {
|
||||
UserId int64
|
||||
IsNgAlertEnabled bool
|
||||
Result []*UserQuotaDTO
|
||||
UserId int64
|
||||
UnifiedAlertingEnabled bool
|
||||
Result []*UserQuotaDTO
|
||||
}
|
||||
|
||||
type GetGlobalQuotaByTargetQuery struct {
|
||||
Target string
|
||||
Default int64
|
||||
IsNgAlertEnabled bool
|
||||
Result *GlobalQuotaDTO
|
||||
Target string
|
||||
Default int64
|
||||
UnifiedAlertingEnabled bool
|
||||
Result *GlobalQuotaDTO
|
||||
}
|
||||
|
||||
type UpdateOrgQuotaCmd struct {
|
||||
|
||||
Reference in New Issue
Block a user