From ae2e1aeee4c02fd213f3b25254c9fd8c237392df Mon Sep 17 00:00:00 2001 From: Alexander Weaver Date: Thu, 25 Jan 2024 16:46:22 -0600 Subject: [PATCH] Alerting: Upgrade feature toggle stages for jitterAlertRules and jitterAlertRulesWithinGroups (#81314) Upgrade jitter toggle stages --- .../setup-grafana/configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 4 ++-- pkg/services/featuremgmt/toggles_gen.csv | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 795c3d835be..1b2afe2355c 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -58,6 +58,7 @@ Some features are enabled by default. You can disable these feature by setting t | `displayAnonymousStats` | Enables anonymous stats to be shown in the UI for Grafana | Yes | | `lokiQueryHints` | Enables query hints for Loki | Yes | | `alertingQueryOptimization` | Optimizes eligible queries in order to reduce load on datasources | | +| `jitterAlertRules` | Distributes alert rule evaluations more evenly over time, by rule group | | ## Preview feature toggles @@ -172,7 +173,6 @@ Experimental features might be changed or removed without prior notice. | `kubernetesFeatureToggles` | Use the kubernetes API for feature toggle management in the frontend | | `enablePluginsTracingByDefault` | Enable plugin tracing for all external plugins | | `newFolderPicker` | Enables the nested folder picker without having nested folders enabled | -| `jitterAlertRules` | Distributes alert rule evaluations more evenly over time, by rule group | | `onPremToCloudMigrations` | In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud. | ## Development feature toggles diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 044b05ae577..896b7d53a0d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1296,7 +1296,7 @@ var ( Name: "jitterAlertRules", Description: "Distributes alert rule evaluations more evenly over time, by rule group", FrontendOnly: false, - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, Owner: grafanaAlertingSquad, AllowSelfServe: false, HideFromDocs: false, @@ -1308,7 +1308,7 @@ var ( Name: "jitterAlertRulesWithinGroups", Description: "Distributes alert rule evaluations more evenly over time, including spreading out rules within the same group", FrontendOnly: false, - Stage: FeatureStageExperimental, + Stage: FeatureStagePublicPreview, Owner: grafanaAlertingSquad, AllowSelfServe: false, HideFromDocs: true, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 392de9008c5..2b543058c1f 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -152,7 +152,7 @@ enablePluginsTracingByDefault,experimental,@grafana/plugins-platform-backend,202 cloudRBACRoles,experimental,@grafana/identity-access-team,2024-01-10,false,false,true,false alertingQueryOptimization,GA,@grafana/alerting-squad,2024-01-10,false,false,false,false newFolderPicker,experimental,@grafana/grafana-frontend-platform,2024-01-12,false,false,false,true -jitterAlertRules,experimental,@grafana/alerting-squad,2024-01-17,false,false,true,false -jitterAlertRulesWithinGroups,experimental,@grafana/alerting-squad,2024-01-17,false,false,true,false +jitterAlertRules,GA,@grafana/alerting-squad,2024-01-17,false,false,true,false +jitterAlertRulesWithinGroups,preview,@grafana/alerting-squad,2024-01-17,false,false,true,false onPremToCloudMigrations,experimental,@grafana/grafana-operator-experience-squad,2024-01-22,false,false,false,false alertingSaveStatePeriodic,privatePreview,@grafana/alerting-squad,2024-01-22,false,false,false,false