From a97941770060089f690b08487cc907df83f24dc7 Mon Sep 17 00:00:00 2001 From: Mihai Doarna Date: Thu, 2 May 2024 16:00:52 +0300 Subject: [PATCH] SSO: Update `ssoSettingsApi` flag to general availability (#87216) * update ssoSettingsApi flag to general availability * generate files --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 11 +++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) 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 9c71a50e4d3..4355d81c5c8 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -54,6 +54,7 @@ Some features are enabled by default. You can disable these feature by setting t | `lokiStructuredMetadata` | Enables the loki data source to request structured metadata from the Loki server | Yes | | `managedPluginsInstall` | Install managed plugins directly from plugins catalog | Yes | | `annotationPermissionUpdate` | Change the way annotation permissions work by scoping them to folders and dashboards. | Yes | +| `ssoSettingsApi` | Enables the SSO settings API and the OAuth configuration UIs in Grafana | Yes | | `exploreMetrics` | Enables the new Explore Metrics core app | Yes | | `alertingSimplifiedRouting` | Enables users to easily configure alert notifications by specifying a contact point directly when editing or creating an alert rule | Yes | | `logRowsPopoverMenu` | Enable filtering menu displayed when text of a log line is selected | Yes | @@ -92,7 +93,6 @@ Some features are enabled by default. You can disable these feature by setting t | `awsDatasourcesNewFormStyling` | Applies new form styling for configuration and query editors in AWS plugins | | `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 | | `regressionTransformation` | Enables regression analysis transformation | | `groupToNestedTableTransformation` | Enables the group to nested table transformation | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 8f9af951279..894b1a79238 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -935,7 +935,8 @@ var ( { Name: "ssoSettingsApi", Description: "Enables the SSO settings API and the OAuth configuration UIs in Grafana", - Stage: FeatureStagePublicPreview, + Stage: FeatureStageGeneralAvailability, + Expression: "true", AllowSelfServe: true, FrontendOnly: false, Owner: identityAccessTeam, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index fe1848088b8..f7cf6c559d9 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -125,7 +125,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,preview,@grafana/identity-access-team,false,false,false +ssoSettingsApi,GA,@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.json b/pkg/services/featuremgmt/toggles_gen.json index d72a6888c07..45b3960078e 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1217,12 +1217,15 @@ { "metadata": { "name": "ssoSettingsApi", - "resourceVersion": "1713545444177", - "creationTimestamp": "2024-04-19T16:50:44Z" + "resourceVersion": "1714649014456", + "creationTimestamp": "2024-04-19T16:50:44Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-05-02 11:23:34.456131 +0000 UTC" + } }, "spec": { "description": "Enables the SSO settings API and the OAuth configuration UIs in Grafana", - "stage": "preview", + "stage": "GA", "codeowner": "@grafana/identity-access-team", "allowSelfServe": true } @@ -2105,4 +2108,4 @@ } } ] -} +} \ No newline at end of file