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 49a04894201..93a541a3843 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -81,6 +81,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `lokiLabelNamesQueryApi` | Defaults to using the Loki `/labels` API instead of `/series` | Yes | | `grafanaManagedRecordingRulesDatasources` | Enables writing to data sources for Grafana-managed recording rules. | | | `alertingMigrationUI` | Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules | Yes | +| `alertingImportYAMLUI` | Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules | Yes | | `unifiedNavbars` | Enables unified navbars | | ## Public preview feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 0aae2fb6f1b..69175808369 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -162,6 +162,10 @@ export interface FeatureToggles { */ enableDatagridEditing?: boolean; /** + * Enables extra themes + */ + extraThemes?: boolean; + /** * Adds predefined query operations to Loki query editor */ lokiPredefinedOperations?: boolean; @@ -554,6 +558,10 @@ export interface FeatureToggles { */ disableNumericMetricsSortingInExpressions?: boolean; /** + * Enables Grafana-managed recording rules. + */ + grafanaManagedRecordingRules?: boolean; + /** * Enables Query Library feature in Explore */ queryLibrary?: boolean; @@ -932,6 +940,11 @@ export interface FeatureToggles { */ alertingMigrationUI?: boolean; /** + * Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules + * @default true + */ + alertingImportYAMLUI?: boolean; + /** * Enables the unified storage history pruner * @default true */ diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 7fe0ed23ef2..7437565e76d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -256,6 +256,13 @@ var ( Stage: FeatureStagePublicPreview, Owner: grafanaDatavizSquad, }, + { + Name: "extraThemes", + Description: "Enables extra themes", + FrontendOnly: true, + Stage: FeatureStageExperimental, + Owner: grafanaFrontendPlatformSquad, + }, { Name: "lokiPredefinedOperations", Description: "Adds predefined query operations to Loki query editor", @@ -944,6 +951,15 @@ var ( Owner: grafanaOSSBigTent, RequiresRestart: true, }, + { + Name: "grafanaManagedRecordingRules", + Description: "Enables Grafana-managed recording rules.", + Stage: FeatureStageExperimental, + Owner: grafanaAlertingSquad, + AllowSelfServe: false, + HideFromDocs: true, + HideFromAdminPage: true, + }, { Name: "queryLibrary", Description: "Enables Query Library feature in Explore", @@ -1593,6 +1609,14 @@ var ( Owner: grafanaAlertingSquad, Expression: "true", }, + { + Name: "alertingImportYAMLUI", + Description: "Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules", + FrontendOnly: true, + Stage: FeatureStageGeneralAvailability, + Owner: grafanaAlertingSquad, + Expression: "true", + }, { Name: "unifiedStorageHistoryPruner", Description: "Enables the unified storage history pruner", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 88d74f4eb64..5b5dd86153f 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -32,6 +32,7 @@ renderAuthJWT,preview,@grafana/sharing-squad,false,false,false refactorVariablesTimeRange,preview,@grafana/dashboards-squad,false,false,false faroDatasourceSelector,preview,@grafana/app-o11y,false,false,true enableDatagridEditing,preview,@grafana/dataviz-squad,false,false,true +extraThemes,experimental,@grafana/grafana-frontend-platform,false,false,true lokiPredefinedOperations,experimental,@grafana/observability-logs,false,false,true pluginsFrontendSandbox,privatePreview,@grafana/plugins-platform-backend,false,false,false pluginsDetailsRightPanel,GA,@grafana/plugins-platform-backend,false,false,true @@ -122,6 +123,7 @@ oauthRequireSubClaim,experimental,@grafana/identity-access-team,false,false,fals newDashboardWithFiltersAndGroupBy,experimental,@grafana/dashboards-squad,false,false,false cloudWatchNewLabelParsing,GA,@grafana/aws-datasources,false,false,false disableNumericMetricsSortingInExpressions,experimental,@grafana/oss-big-tent,false,true,false +grafanaManagedRecordingRules,experimental,@grafana/alerting-squad,false,false,false queryLibrary,experimental,@grafana/grafana-frontend-platform,false,false,false logsExploreTableDefaultVisualization,experimental,@grafana/observability-logs,false,false,true newDashboardSharingComponent,GA,@grafana/sharing-squad,false,false,true @@ -209,6 +211,7 @@ grafanaManagedRecordingRulesDatasources,GA,@grafana/alerting-squad,false,false,f infinityRunQueriesInParallel,privatePreview,@grafana/oss-big-tent,false,false,false inviteUserExperimental,experimental,@grafana/sharing-squad,false,false,true alertingMigrationUI,GA,@grafana/alerting-squad,false,false,true +alertingImportYAMLUI,GA,@grafana/alerting-squad,false,false,true unifiedStorageHistoryPruner,GA,@grafana/search-and-storage,false,false,false azureMonitorLogsBuilderEditor,preview,@grafana/partner-datasources,false,false,false localeFormatPreference,experimental,@grafana/grafana-frontend-platform,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 0c31832770b..7157f7fa236 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -139,6 +139,10 @@ const ( // Enables the edit functionality in the datagrid panel FlagEnableDatagridEditing = "enableDatagridEditing" + // FlagExtraThemes + // Enables extra themes + FlagExtraThemes = "extraThemes" + // FlagLokiPredefinedOperations // Adds predefined query operations to Loki query editor FlagLokiPredefinedOperations = "lokiPredefinedOperations" @@ -499,6 +503,10 @@ const ( // In server-side expressions, disable the sorting of numeric-kind metrics by their metric name or labels. FlagDisableNumericMetricsSortingInExpressions = "disableNumericMetricsSortingInExpressions" + // FlagGrafanaManagedRecordingRules + // Enables Grafana-managed recording rules. + FlagGrafanaManagedRecordingRules = "grafanaManagedRecordingRules" + // FlagQueryLibrary // Enables Query Library feature in Explore FlagQueryLibrary = "queryLibrary" @@ -847,6 +855,10 @@ const ( // Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules FlagAlertingMigrationUI = "alertingMigrationUI" + // FlagAlertingImportYAMLUI + // Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules + FlagAlertingImportYAMLUI = "alertingImportYAMLUI" + // FlagUnifiedStorageHistoryPruner // Enables the unified storage history pruner FlagUnifiedStorageHistoryPruner = "unifiedStorageHistoryPruner" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 23c5e9470b5..a99defd2459 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -155,6 +155,20 @@ "hideFromDocs": true } }, + { + "metadata": { + "name": "alertingImportYAMLUI", + "resourceVersion": "1747836716080", + "creationTimestamp": "2025-05-21T14:11:56Z" + }, + "spec": { + "description": "Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules", + "stage": "GA", + "codeowner": "@grafana/alerting-squad", + "frontend": true, + "expression": "true" + } + }, { "metadata": { "name": "alertingInsights",