Chore: Remove bus from the alerting service (#44496)
* propagate notificationservice down to the notifiers * replace dispatch in result handler * remove dispatch from the rule reader * remove dispatch from eval context * remove dispatch from alerting usage * remove dispatch from alerting usage * remove dispatch from notifier * attempt to fix tests in alerting * hello linter, my old friend; also disable some tests for now * use mocks to fix the tests * resolving wire providers * make linter happy * remove yet another bus.dispatch * fix tests using store mock
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/grafana/grafana/pkg/bus"
|
||||
"github.com/grafana/grafana/pkg/infra/log"
|
||||
"github.com/grafana/grafana/pkg/infra/metrics"
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
@@ -16,12 +15,14 @@ type ruleReader interface {
|
||||
|
||||
type defaultRuleReader struct {
|
||||
sync.RWMutex
|
||||
log log.Logger
|
||||
sqlStore AlertStore
|
||||
log log.Logger
|
||||
}
|
||||
|
||||
func newRuleReader() *defaultRuleReader {
|
||||
func newRuleReader(sqlStore AlertStore) *defaultRuleReader {
|
||||
ruleReader := &defaultRuleReader{
|
||||
log: log.New("alerting.ruleReader"),
|
||||
sqlStore: sqlStore,
|
||||
log: log.New("alerting.ruleReader"),
|
||||
}
|
||||
|
||||
return ruleReader
|
||||
@@ -30,7 +31,7 @@ func newRuleReader() *defaultRuleReader {
|
||||
func (arr *defaultRuleReader) fetch(ctx context.Context) []*Rule {
|
||||
cmd := &models.GetAllAlertsQuery{}
|
||||
|
||||
if err := bus.Dispatch(ctx, cmd); err != nil {
|
||||
if err := arr.sqlStore.GetAllAlertQueryHandler(ctx, cmd); err != nil {
|
||||
arr.log.Error("Could not load alerts", "error", err)
|
||||
return []*Rule{}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user