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

tech: avoid alias for importing models in alerting (#17041)

Browse Source 
ref #14679
This commit is contained in:
Carl Bergquist
2019-05-14 08:15:05 +02:00
committed by GitHub
parent a87a763d83
commit 13f137a17d
47 changed files with 261 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/result_handler.go
+5 -4
View File
@@ -7,7 +7,8 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/annotations"
"github.com/grafana/grafana/pkg/services/rendering"
)
@@ -47,7 +48,7 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
if evalContext.ShouldUpdateAlertState() {
handler.log.Info("New state change", "alertId", evalContext.Rule.Id, "newState", evalContext.Rule.State, "prev state", evalContext.PrevAlertState)
cmd := &m.SetAlertStateCommand{
cmd := &models.SetAlertStateCommand{
AlertId: evalContext.Rule.Id,
OrgId: evalContext.Rule.OrgId,
State: evalContext.Rule.State,
@@ -56,12 +57,12 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
}
if err := bus.Dispatch(cmd); err != nil {
if err == m.ErrCannotChangeStateOnPausedAlert {
if err == models.ErrCannotChangeStateOnPausedAlert {
handler.log.Error("Cannot change state on alert that's paused", "error", err)
return err
}
if err == m.ErrRequiresNewState {
if err == models.ErrRequiresNewState {
handler.log.Info("Alert already updated")
return nil
}