Alerting: Disable dash alerting if NG enabled (#33794)

pull/33803/head
Kyle Brandt 4 years ago committed by GitHub
parent 1b36656455
commit 8feeaab996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      pkg/services/alerting/engine.go

@ -28,6 +28,7 @@ type AlertEngine struct {
Bus bus.Bus `inject:""`
RequestValidator models.PluginRequestValidator `inject:""`
DataService plugins.DataRequestHandler `inject:""`
Cfg *setting.Cfg `inject:""`
execQueue chan *Job
ticker *Ticker
@ -44,7 +45,7 @@ func init() {
// IsDisabled returns true if the alerting service is disable for this instance.
func (e *AlertEngine) IsDisabled() bool {
return !setting.AlertingEnabled || !setting.ExecuteAlerts
return !setting.AlertingEnabled || !setting.ExecuteAlerts || e.Cfg.IsNgAlertEnabled()
}
// Init initializes the AlertingService.

Loading…
Cancel
Save