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 be7a2e0d582..d76bb3845ec 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -101,6 +101,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `onPremToCloudMigrations` | Enable the Grafana Migration Assistant, which helps you easily migrate on-prem dashboards, folders, and data source configurations to your Grafana Cloud stack. | | `newPDFRendering` | New implementation for the dashboard-to-PDF rendering | | `ssoSettingsSAML` | Use the new SSO Settings API to configure the SAML connector | +| `accessActionSets` | Introduces action sets for resource permissions. Also ensures that all folder editors and admins can create subfolders without needing any additional permissions. | | `azureMonitorPrometheusExemplars` | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars | | `openSearchBackendFlowEnabled` | Enables the backend query flow for Open Search datasource plugin | | `cloudwatchMetricInsightsCrossAccount` | Enables cross account observability for Cloudwatch Metric Insights query builder | @@ -178,7 +179,6 @@ Experimental features might be changed or removed without prior notice. | `nodeGraphDotLayout` | Changed the layout algorithm for the node graph | | `kubernetesAggregator` | Enable grafana's embedded kube-aggregator | | `expressionParser` | Enable new expression parser | -| `accessActionSets` | Introduces action sets for resource permissions | | `disableNumericMetricsSortingInExpressions` | In server-side expressions, disable the sorting of numeric-kind metrics by their metric name or labels. | | `queryLibrary` | Enables Query Library feature in Explore | | `logsExploreTableDefaultVisualization` | Sets the logs table as default visualisation in logs explore | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e0f9dcc0d75..d240573d451 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1171,8 +1171,8 @@ var ( }, { Name: "accessActionSets", - Description: "Introduces action sets for resource permissions", - Stage: FeatureStageExperimental, + Description: "Introduces action sets for resource permissions. Also ensures that all folder editors and admins can create subfolders without needing any additional permissions.", + Stage: FeatureStagePublicPreview, Owner: identityAccessTeam, }, { diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 63d448a2b73..b4e658c3b06 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -153,7 +153,7 @@ ssoSettingsSAML,preview,@grafana/identity-access-team,false,false,false oauthRequireSubClaim,experimental,@grafana/identity-access-team,false,false,false newDashboardWithFiltersAndGroupBy,experimental,@grafana/dashboards-squad,false,false,false cloudWatchNewLabelParsing,GA,@grafana/aws-datasources,false,false,false -accessActionSets,experimental,@grafana/identity-access-team,false,false,false +accessActionSets,preview,@grafana/identity-access-team,false,false,false disableNumericMetricsSortingInExpressions,experimental,@grafana/observability-metrics,false,true,false grafanaManagedRecordingRules,experimental,@grafana/alerting-squad,false,false,false queryLibrary,experimental,@grafana/explore-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index f18393e4f93..bd81612d795 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -624,7 +624,7 @@ const ( FlagCloudWatchNewLabelParsing = "cloudWatchNewLabelParsing" // FlagAccessActionSets - // Introduces action sets for resource permissions + // Introduces action sets for resource permissions. Also ensures that all folder editors and admins can create subfolders without needing any additional permissions. FlagAccessActionSets = "accessActionSets" // FlagDisableNumericMetricsSortingInExpressions diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 556ed216cbf..bbee7f72edc 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -6,12 +6,15 @@ { "metadata": { "name": "accessActionSets", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-04-12T16:19:25Z" + "resourceVersion": "1723737724157", + "creationTimestamp": "2024-04-12T16:19:25Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-15 16:02:04.157828 +0000 UTC" + } }, "spec": { - "description": "Introduces action sets for resource permissions", - "stage": "experimental", + "description": "Introduces action sets for resource permissions. Also ensures that all folder editors and admins can create subfolders without needing any additional permissions.", + "stage": "preview", "codeowner": "@grafana/identity-access-team" } },