IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Remove back end logic for supporting KeepLastState (#34242)

Browse Source 
* Removed back end logic for supporting KeepLastState

* Map keep_state correctly in migrations
This commit is contained in:
David Parrott
2021-05-18 10:55:43 -07:00
committed by GitHub
parent 0683692509
commit bbb7bbf891
7 changed files with 22 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/sqlstore/migrations/ualert/alert_rule.go
View File

@@ -189,7 +189,7 @@ func transNoData(s string) (string, error) {
case "alerting":
return "Alerting", nil
case "keep_state":
return "KeepLastState", nil
return "Alerting", nil
}
return "", fmt.Errorf("unrecognized No Data setting %v", s)
}
@@ -198,8 +198,8 @@ func transExecErr(s string) (string, error) {
switch s {
case "", "alerting":
return "Alerting", nil
case "KeepLastState":
return "KeepLastState", nil
case "keep_state":
return "Alerting", nil
}
return "", fmt.Errorf("unrecognized Execution Error setting %v", s)
}