From 20b603ee1a78e5ff64e778abb2cfa22d4ee758bb Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Mon, 13 Jul 2020 18:04:42 +0300 Subject: [PATCH] Alerting: New feature toggle for enabling standalone alerts (#25984) * Add feature toggle for standalone alerts * Add IsStandaloneAlertsEnabled exported func --- 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, 8 insertions(+), 1 deletion(-) diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md index d2d246d98a2..e525d89d3f1 100644 --- a/docs/sources/administration/configuration.md +++ b/docs/sources/administration/configuration.md @@ -1349,4 +1349,4 @@ 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` +Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`, `standaloneAlerts` diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts index 3b8474599ad..aec8303aa7b 100644 --- a/packages/grafana-data/src/types/config.ts +++ b/packages/grafana-data/src/types/config.ts @@ -41,6 +41,7 @@ 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 90bf837d516..674aa35c252 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/grafana-runtime/src/config.ts @@ -55,6 +55,7 @@ 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 e6df51b26da..81eeb9f07b0 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -309,6 +309,11 @@ 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"] +} + type CommandLineArgs struct { Config string HomePath string