diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index 8ccd3dbb81e..e8d2d256cc6 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -156,6 +156,9 @@ Experimental features might be changed or removed without prior notice. | `costManagementUi` | Toggles the display of the cost management ui plugin | | `managedPluginsInstall` | Install managed plugins directly from plugins catalog | | `prometheusPromQAIL` | Prometheus and AI/ML to assist users in creating a query | +| `alertmanagerRemoteSecondary` | Enable Grafana to sync configuration and state with a remote Alertmanager. | +| `alertmanagerRemotePrimary` | Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager. | +| `alertmanagerRemoteOnly` | Disable the internal Alertmanager and only use the external one defined. | ## Development feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 1290d6503bb..5930e99f6e7 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -150,4 +150,7 @@ export interface FeatureToggles { costManagementUi?: boolean; managedPluginsInstall?: boolean; prometheusPromQAIL?: boolean; + alertmanagerRemoteSecondary?: boolean; + alertmanagerRemotePrimary?: boolean; + alertmanagerRemoteOnly?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 9e4e7ae046a..bc208d5803c 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -927,5 +927,23 @@ var ( FrontendOnly: true, Owner: grafanaObservabilityMetricsSquad, }, + { + Name: "alertmanagerRemoteSecondary", + Description: "Enable Grafana to sync configuration and state with a remote Alertmanager.", + Stage: FeatureStageExperimental, + Owner: grafanaAlertingSquad, + }, + { + Name: "alertmanagerRemotePrimary", + Description: "Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager.", + Stage: FeatureStageExperimental, + Owner: grafanaAlertingSquad, + }, + { + Name: "alertmanagerRemoteOnly", + Description: "Disable the internal Alertmanager and only use the external one defined.", + Stage: FeatureStageExperimental, + Owner: grafanaAlertingSquad, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 00a269375c3..baefe3d59f7 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -131,3 +131,6 @@ pluginsInstrumentationStatusSource,experimental,@grafana/plugins-platform-backen costManagementUi,experimental,@grafana/databases-frontend,false,false,false,false managedPluginsInstall,experimental,@grafana/plugins-platform-backend,false,false,false,false prometheusPromQAIL,experimental,@grafana/observability-metrics,false,false,false,true +alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false,false +alertmanagerRemotePrimary,experimental,@grafana/alerting-squad,false,false,false,false +alertmanagerRemoteOnly,experimental,@grafana/alerting-squad,false,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 304b9a8dfe1..be75b703819 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -534,4 +534,16 @@ const ( // FlagPrometheusPromQAIL // Prometheus and AI/ML to assist users in creating a query FlagPrometheusPromQAIL = "prometheusPromQAIL" + + // FlagAlertmanagerRemoteSecondary + // Enable Grafana to sync configuration and state with a remote Alertmanager. + FlagAlertmanagerRemoteSecondary = "alertmanagerRemoteSecondary" + + // FlagAlertmanagerRemotePrimary + // Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager. + FlagAlertmanagerRemotePrimary = "alertmanagerRemotePrimary" + + // FlagAlertmanagerRemoteOnly + // Disable the internal Alertmanager and only use the external one defined. + FlagAlertmanagerRemoteOnly = "alertmanagerRemoteOnly" )