diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go index b3ab964b17b..08f3c256fe2 100644 --- a/pkg/services/ngalert/ngalert.go +++ b/pkg/services/ngalert/ngalert.go @@ -435,9 +435,6 @@ func configureHistorianBackend(ctx context.Context, cfg setting.UnifiedAlertingS } return backend, nil } - if backend == historian.BackendTypeSQL { - return historian.NewSqlBackend(), nil - } return nil, fmt.Errorf("unrecognized state history backend: %s", backend) } diff --git a/pkg/services/ngalert/ngalert_test.go b/pkg/services/ngalert/ngalert_test.go index a1499e2f2e5..d054b2c8d9c 100644 --- a/pkg/services/ngalert/ngalert_test.go +++ b/pkg/services/ngalert/ngalert_test.go @@ -95,7 +95,7 @@ func TestConfigureHistorianBackend(t *testing.T) { Enabled: true, Backend: "multiple", MultiPrimary: "annotations", - MultiSecondaries: []string{"sql", "invalid-backend"}, + MultiSecondaries: []string{"annotations", "invalid-backend"}, } _, err := configureHistorianBackend(context.Background(), cfg, nil, nil, nil, met, logger) diff --git a/pkg/services/ngalert/state/historian/backend.go b/pkg/services/ngalert/state/historian/backend.go index 3525bd9f460..6f75d1ff180 100644 --- a/pkg/services/ngalert/state/historian/backend.go +++ b/pkg/services/ngalert/state/historian/backend.go @@ -18,7 +18,6 @@ const ( BackendTypeLoki BackendType = "loki" BackendTypeMultiple BackendType = "multiple" BackendTypeNoop BackendType = "noop" - BackendTypeSQL BackendType = "sql" ) func ParseBackendType(s string) (BackendType, error) { @@ -29,7 +28,6 @@ func ParseBackendType(s string) (BackendType, error) { BackendTypeLoki: {}, BackendTypeMultiple: {}, BackendTypeNoop: {}, - BackendTypeSQL: {}, } p := BackendType(norm) if _, ok := types[p]; !ok { diff --git a/pkg/services/ngalert/state/historian/sql.go b/pkg/services/ngalert/state/historian/sql.go deleted file mode 100644 index fbe3c440728..00000000000 --- a/pkg/services/ngalert/state/historian/sql.go +++ /dev/null @@ -1,32 +0,0 @@ -package historian - -import ( - "context" - - "github.com/grafana/grafana-plugin-sdk-go/data" - - "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/services/ngalert/models" - "github.com/grafana/grafana/pkg/services/ngalert/state" - history_model "github.com/grafana/grafana/pkg/services/ngalert/state/historian/model" -) - -type SqlBackend struct { - log log.Logger -} - -func NewSqlBackend() *SqlBackend { - return &SqlBackend{ - log: log.New("ngalert.state.historian"), - } -} - -func (h *SqlBackend) Record(ctx context.Context, _ history_model.RuleMeta, _ []state.StateTransition) <-chan error { - errCh := make(chan error) - close(errCh) - return errCh -} - -func (h *SqlBackend) Query(ctx context.Context, query models.HistoryQuery) (*data.Frame, error) { - return data.NewFrame("states"), nil -}