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 2ddbac32fc7..57b70a34f93 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -118,6 +118,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `ssoSettingsSAML` | Use the new SSO Settings API to configure the SAML connector | | `azureMonitorPrometheusExemplars` | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars | | `ssoSettingsLDAP` | Use the new SSO Settings API to configure LDAP | +| `improvedExternalSessionHandling` | Enable improved support for OAuth and SAML external sessions in Grafana | | `elasticsearchCrossClusterSearch` | Enables cross cluster search in the Elasticsearch datasource | ## Experimental feature toggles diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 939c6b1bc31..962cc9f32c2 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1487,12 +1487,10 @@ var ( FrontendOnly: true, }, { - Name: "improvedExternalSessionHandling", - Description: "Enable improved support for external sessions in Grafana", - Stage: FeatureStageExperimental, - Owner: identityAccessTeam, - HideFromDocs: true, - HideFromAdminPage: true, + Name: "improvedExternalSessionHandling", + Description: "Enable improved support for OAuth and SAML external sessions in Grafana", + Stage: FeatureStagePublicPreview, + Owner: identityAccessTeam, }, { Name: "useSessionStorageForRedirection", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 531546290ee..3cbc361006b 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -196,7 +196,7 @@ appPlatformGrpcClientAuth,experimental,@grafana/identity-access-team,false,false appSidecar,experimental,@grafana/grafana-frontend-platform,false,false,false groupAttributeSync,privatePreview,@grafana/identity-access-team,false,false,false alertingQueryAndExpressionsStepMode,experimental,@grafana/alerting-squad,false,false,true -improvedExternalSessionHandling,experimental,@grafana/identity-access-team,false,false,false +improvedExternalSessionHandling,preview,@grafana/identity-access-team,false,false,false useSessionStorageForRedirection,GA,@grafana/identity-access-team,false,false,false rolePickerDrawer,experimental,@grafana/identity-access-team,false,false,false unifiedStorageSearch,experimental,@grafana/search-and-storage,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index a35ee0e089f..9c634107e0e 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -796,7 +796,7 @@ const ( FlagAlertingQueryAndExpressionsStepMode = "alertingQueryAndExpressionsStepMode" // FlagImprovedExternalSessionHandling - // Enable improved support for external sessions in Grafana + // Enable improved support for OAuth and SAML external sessions in Grafana FlagImprovedExternalSessionHandling = "improvedExternalSessionHandling" // FlagUseSessionStorageForRedirection diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 930417cfba6..7614f4bbe49 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1799,15 +1799,16 @@ { "metadata": { "name": "improvedExternalSessionHandling", - "resourceVersion": "1726560214520", - "creationTimestamp": "2024-09-17T10:54:39Z" + "resourceVersion": "1736255708514", + "creationTimestamp": "2024-09-17T10:54:39Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-07 13:15:08.514525 +0000 UTC" + } }, "spec": { - "description": "Enable improved support for external sessions in Grafana", - "stage": "experimental", - "codeowner": "@grafana/identity-access-team", - "hideFromAdminPage": true, - "hideFromDocs": true + "description": "Enable improved support for OAuth and SAML external sessions in Grafana", + "stage": "preview", + "codeowner": "@grafana/identity-access-team" } }, {