From a82f1028783a3dd0c50c7c460eb3f307f9aa987a Mon Sep 17 00:00:00 2001 From: Mihai Doarna Date: Fri, 4 Oct 2024 14:59:42 +0300 Subject: [PATCH] Auth: Promote `ssoSettingsLDAP` flag to public preview (#94242) * promote ssoSettingsLDAP flag to public preview * add generated file --- .../configure-grafana/feature-toggles/index.md | 1 + pkg/services/featuremgmt/registry.go | 12 ++++++------ pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 15 +++++++++------ 4 files changed, 17 insertions(+), 13 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 65e636dfa77..27333e0979c 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -111,6 +111,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `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 | +| `ssoSettingsLDAP` | Use the new SSO Settings API to configure LDAP | | `cloudwatchMetricInsightsCrossAccount` | Enables cross account observability for Cloudwatch Metric Insights query builder | | `useSessionStorageForRedirection` | Use session storage for handling the redirection after login | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 60e78e82db3..cadc10ab7d2 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1324,12 +1324,12 @@ var ( Expression: "true", }, { - Name: "ssoSettingsLDAP", - Description: "Use the new SSO Settings API to configure LDAP", - Stage: FeatureStageExperimental, - Owner: identityAccessTeam, - HideFromDocs: true, - HideFromAdminPage: true, + Name: "ssoSettingsLDAP", + Description: "Use the new SSO Settings API to configure LDAP", + Stage: FeatureStagePublicPreview, + Owner: identityAccessTeam, + AllowSelfServe: true, + RequiresRestart: true, }, { Name: "failWrongDSUID", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 800f41a8e6f..54e538d5207 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -173,7 +173,7 @@ azureMonitorPrometheusExemplars,preview,@grafana/partner-datasources,false,false pinNavItems,GA,@grafana/grafana-frontend-platform,false,false,false authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false openSearchBackendFlowEnabled,GA,@grafana/aws-datasources,false,false,false -ssoSettingsLDAP,experimental,@grafana/identity-access-team,false,false,false +ssoSettingsLDAP,preview,@grafana/identity-access-team,false,true,false failWrongDSUID,experimental,@grafana/plugins-platform-backend,false,false,false zanzana,experimental,@grafana/identity-access-team,false,false,false passScopeToDashboardApi,experimental,@grafana/dashboards-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index eff0b8b4b6f..0b1c37e9e21 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2842,15 +2842,18 @@ { "metadata": { "name": "ssoSettingsLDAP", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-06-18T11:31:27Z" + "resourceVersion": "1728034012257", + "creationTimestamp": "2024-06-18T11:31:27Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-10-04 09:26:52.257203 +0000 UTC" + } }, "spec": { "description": "Use the new SSO Settings API to configure LDAP", - "stage": "experimental", + "stage": "preview", "codeowner": "@grafana/identity-access-team", - "hideFromAdminPage": true, - "hideFromDocs": true + "requiresRestart": true, + "allowSelfServe": true } }, { @@ -3116,4 +3119,4 @@ } } ] -} \ No newline at end of file +}