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 c36b1f5ba0b..fa1734778d7 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -92,6 +92,7 @@ Some features are enabled by default. You can disable these feature by setting t | `managedPluginsInstall` | Install managed plugins directly from plugins catalog | | `addFieldFromCalculationStatFunctions` | Add cumulative and window functions to the add field from calculation transformation | | `pdfTables` | Enables generating table data as PDF in reporting | +| `ssoSettingsApi` | Enables the SSO settings API and the OAuth configuration UIs in Grafana | | `canvasPanelPanZoom` | Allow pan and zoom in canvas panel | | `alertingSimplifiedRouting` | Enables users to easily configure alert notifications by specifying a contact point directly when editing or creating an alert rule | | `regressionTransformation` | Enables regression analysis transformation | @@ -166,7 +167,6 @@ Experimental features might be changed or removed without prior notice. | `dashboardSceneForViewers` | Enables dashboard rendering using Scenes for viewer roles | | `dashboardSceneSolo` | Enables rendering dashboards using scenes for solo panels | | `dashboardScene` | Enables dashboard rendering using scenes for all roles | -| `ssoSettingsApi` | Enables the SSO settings API | | `logsInfiniteScrolling` | Enables infinite scrolling for the Logs panel in Explore and Dashboards | | `flameGraphItemCollapsing` | Allow collapsing of flame graph items | | `pluginsSkipHostEnvVars` | Disables passing host environment variable to plugin processes | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 661c6eb26b8..98083ef9983 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1010,8 +1010,8 @@ var ( }, { Name: "ssoSettingsApi", - Description: "Enables the SSO settings API", - Stage: FeatureStageExperimental, + Description: "Enables the SSO settings API and the OAuth configuration UIs in Grafana", + Stage: FeatureStagePublicPreview, FrontendOnly: false, Owner: identityAccessTeam, }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 62d9d504af6..0656906e50f 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -135,7 +135,7 @@ dashboardSceneSolo,experimental,@grafana/dashboards-squad,false,false,true dashboardScene,experimental,@grafana/dashboards-squad,false,false,true panelFilterVariable,experimental,@grafana/dashboards-squad,false,false,true pdfTables,preview,@grafana/sharing-squad,false,false,false -ssoSettingsApi,experimental,@grafana/identity-access-team,false,false,false +ssoSettingsApi,preview,@grafana/identity-access-team,false,false,false canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true logsInfiniteScrolling,experimental,@grafana/observability-logs,false,false,true flameGraphItemCollapsing,experimental,@grafana/observability-traces-and-profiling,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 6b99d5640d3..573bb448e26 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -552,7 +552,7 @@ const ( FlagPdfTables = "pdfTables" // FlagSsoSettingsApi - // Enables the SSO settings API + // Enables the SSO settings API and the OAuth configuration UIs in Grafana FlagSsoSettingsApi = "ssoSettingsApi" // FlagCanvasPanelPanZoom diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 6219d312bc4..17efb7f3795 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1385,12 +1385,15 @@ { "metadata": { "name": "ssoSettingsApi", - "resourceVersion": "1707928895402", - "creationTimestamp": "2024-02-14T16:41:35Z" + "resourceVersion": "1707991575438", + "creationTimestamp": "2024-02-14T16:41:35Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-02-15 10:06:15.438523 +0000 UTC" + } }, "spec": { - "description": "Enables the SSO settings API", - "stage": "experimental", + "description": "Enables the SSO settings API and the OAuth configuration UIs in Grafana", + "stage": "preview", "codeowner": "@grafana/identity-access-team" } },