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

Chore: Remove result field from alert commands and queries (#62714)

Browse Source 
* remove result field from alert notification commands and queries

* fix a few more tests

* ok, linter

* remove alert result fields

* fix api calls

* et tu, linter
This commit is contained in:
Serge Zaitsev
2023-02-02 09:41:05 +01:00
committed by GitHub
parent d9fd807375
commit b1c98f7119
21 changed files with 412 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/reader.go
+3 -2
View File
@@ -31,13 +31,14 @@ func newRuleReader(sqlStore AlertStore) *defaultRuleReader {
func (arr *defaultRuleReader) fetch(ctx context.Context) []*Rule {
cmd := &models.GetAllAlertsQuery{}
if err := arr.sqlStore.GetAllAlertQueryHandler(ctx, cmd); err != nil {
alerts, err := arr.sqlStore.GetAllAlertQueryHandler(ctx, cmd)
if err != nil {
arr.log.Error("Could not load alerts", "error", err)
return []*Rule{}
}
res := make([]*Rule, 0)
for _, ruleDef := range cmd.Result {
for _, ruleDef := range alerts {
if model, err := NewRuleFromDBAlert(ctx, arr.sqlStore, ruleDef, false); err != nil {
arr.log.Error("Could not build alert model for rule", "ruleId", ruleDef.Id, "error", err)
} else {