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 e74905e110b..5384028fe64 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 @@ For more information about feature release stages, refer to [Release life cycle | `regressionTransformation` | Enables regression analysis transformation | | `groupToNestedTableTransformation` | Enables the group to nested table transformation | | `newPDFRendering` | New implementation for the dashboard-to-PDF rendering | +| `ssoSettingsSAML` | Use the new SSO Settings API to configure the SAML connector | ## Experimental feature toggles diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 7a78c21a9ac..b37ed35124f 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1177,12 +1177,11 @@ var ( HideFromAdminPage: true, }, { - Name: "ssoSettingsSAML", - Description: "Use the new SSO Settings API to configure the SAML connector", - Stage: FeatureStageExperimental, - Owner: identityAccessTeam, - HideFromDocs: true, - HideFromAdminPage: true, + Name: "ssoSettingsSAML", + Description: "Use the new SSO Settings API to configure the SAML connector", + Stage: FeatureStagePublicPreview, + Owner: identityAccessTeam, + AllowSelfServe: true, }, { Name: "oauthRequireSubClaim", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index eab9d2405ae..92a8b6ab65f 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -157,7 +157,7 @@ groupByVariable,experimental,@grafana/dashboards-squad,false,false,false betterPageScrolling,GA,@grafana/grafana-frontend-platform,false,false,true authAPIAccessTokenAuth,experimental,@grafana/identity-access-team,false,false,false scopeFilters,experimental,@grafana/dashboards-squad,false,false,false -ssoSettingsSAML,experimental,@grafana/identity-access-team,false,false,false +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 diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index bb5e849b531..e0d53927e66 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -109,15 +109,17 @@ { "metadata": { "name": "ssoSettingsSAML", - "resourceVersion": "1713545444177", - "creationTimestamp": "2024-04-19T16:50:44Z" + "resourceVersion": "1715255671680", + "creationTimestamp": "2024-04-19T16:50:44Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-05-09 11:54:31.680389 +0000 UTC" + } }, "spec": { "description": "Use the new SSO Settings API to configure the SAML connector", - "stage": "experimental", + "stage": "preview", "codeowner": "@grafana/identity-access-team", - "hideFromAdminPage": true, - "hideFromDocs": true + "allowSelfServe": true } }, { @@ -2222,4 +2224,4 @@ } } ] -} +} \ No newline at end of file