From 8feeaab99630efa5b359a383bd0e3e561a718e9f Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Mon, 10 May 2021 10:46:01 -0400
Subject: [PATCH] Alerting: Disable dash alerting if NG enabled (#33794)

---
 pkg/services/alerting/engine.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index 133273333bd1..520186fe4353 100644
--- a/pkg/services/alerting/engine.go
+++ b/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.