opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 01:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kyle Brandt
2021-05-10 10:46:01 -04:00
committed by GitHub
parent 1b36656455
commit 8feeaab996
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/alerting/engine.go
View File

@ -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.