From 924224eefbfb55622d52a0687a098f43b202a8c0 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <papagian@users.noreply.github.com>
Date: Fri, 11 Sep 2020 13:57:46 +0300
Subject: [PATCH] Revert "Alerting: New feature toggle for enabling standalone
 alerts (#25984)" (#27531)

This reverts commit 20b603ee1a78e5ff64e778abb2cfa22d4ee758bb.
---
 docs/sources/administration/configuration.md | 2 +-
 packages/grafana-data/src/types/config.ts    | 1 -
 packages/grafana-runtime/src/config.ts       | 1 -
 pkg/setting/setting.go                       | 5 -----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md
index 3f6decd3806..f7b978726d7 100644
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -1391,7 +1391,7 @@ For more information about Grafana Enterprise, refer to [Grafana Enterprise]({{<
 
 ### enable
 
-Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`, `standaloneAlerts`
+Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`
 
 ## [date_formats]
 
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index e676f1c0312..0d85fcc581a 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -42,7 +42,6 @@ export interface FeatureToggles {
   meta: boolean;
   datasourceInsights: boolean;
   reportGrid: boolean;
-  standaloneAlerts: boolean;
 }
 
 /**
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 42cf20ed0b6..7136cbd740a 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -56,7 +56,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
     meta: false,
     datasourceInsights: false,
     reportGrid: false,
-    standaloneAlerts: false,
   };
   licenseInfo: LicenseInfo = {} as LicenseInfo;
   rendererAvailable = false;
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index dff911a4be9..4b76871202c 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -315,11 +315,6 @@ func (c Cfg) IsExpressionsEnabled() bool {
 	return c.FeatureToggles["expressions"]
 }
 
-// IsStandaloneAlertsEnabled returns whether the standalone alerts feature is enabled.
-func (c Cfg) IsStandaloneAlertsEnabled() bool {
-	return c.FeatureToggles["standaloneAlerts"]
-}
-
 // IsLiveEnabled returns if grafana live should be enabled
 func (c Cfg) IsLiveEnabled() bool {
 	return c.FeatureToggles["live"]