Auth: Enable ssoSettingsLDAP by default (#106310)

pull/106313/head
Misi 3 weeks ago committed by GitHub
parent a2b0e20a8e
commit f34d372bd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
  2. 1
      packages/grafana-data/src/types/featureToggles.gen.ts
  3. 3
      pkg/services/featuremgmt/registry.go
  4. 2
      pkg/services/featuremgmt/toggles_gen.csv
  5. 12
      pkg/services/featuremgmt/toggles_gen.json

@ -66,6 +66,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
| `pluginProxyPreserveTrailingSlash` | Preserve plugin proxy trailing slash. | |
| `azureMonitorPrometheusExemplars` | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars | Yes |
| `pinNavItems` | Enables pinning of nav items | Yes |
| `ssoSettingsLDAP` | Use the new SSO Settings API to configure LDAP | Yes |
| `failWrongDSUID` | Throws an error if a data source has an invalid UIDs | Yes |
| `cloudWatchRoundUpEndTime` | Round up end time for metric queries to the next minute to avoid missing data | Yes |
| `newFiltersUI` | Enables new combobox style UI for the Ad hoc filters variable in scenes architecture | Yes |
@ -102,7 +103,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
| `canvasPanelPanZoom` | Allow pan and zoom in canvas panel |
| `regressionTransformation` | Enables regression analysis transformation |
| `alertingSaveStateCompressed` | Enables the compressed protobuf-based alert state storage |
| `ssoSettingsLDAP` | Use the new SSO Settings API to configure LDAP |
| `tableNextGen` | Allows access to the new react-data-grid based table component. |
| `improvedExternalSessionHandling` | Enables improved support for OAuth external sessions. After enabling this feature, users might need to re-authenticate themselves. |
| `elasticsearchCrossClusterSearch` | Enables cross cluster search in the Elasticsearch datasource |

@ -611,6 +611,7 @@ export interface FeatureToggles {
authZGRPCServer?: boolean;
/**
* Use the new SSO Settings API to configure LDAP
* @default true
*/
ssoSettingsLDAP?: boolean;
/**

@ -1046,10 +1046,11 @@ var (
{
Name: "ssoSettingsLDAP",
Description: "Use the new SSO Settings API to configure LDAP",
Stage: FeatureStagePublicPreview,
Stage: FeatureStageGeneralAvailability,
Owner: identityAccessTeam,
AllowSelfServe: true,
RequiresRestart: true,
Expression: "true", // enabled by default
},
{
Name: "failWrongDSUID",

@ -135,7 +135,7 @@ pluginProxyPreserveTrailingSlash,GA,@grafana/plugins-platform-backend,false,fals
azureMonitorPrometheusExemplars,GA,@grafana/partner-datasources,false,false,false
pinNavItems,GA,@grafana/grafana-frontend-platform,false,false,false
authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false
ssoSettingsLDAP,preview,@grafana/identity-access-team,false,true,false
ssoSettingsLDAP,GA,@grafana/identity-access-team,false,true,false
failWrongDSUID,GA,@grafana/plugins-platform-backend,false,false,false
zanzana,experimental,@grafana/identity-access-team,false,false,false
reloadDashboardsOnParamsChange,experimental,@grafana/dashboards-squad,false,false,false

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
135 azureMonitorPrometheusExemplars GA @grafana/partner-datasources false false false
136 pinNavItems GA @grafana/grafana-frontend-platform false false false
137 authZGRPCServer experimental @grafana/identity-access-team false false false
138 ssoSettingsLDAP preview GA @grafana/identity-access-team false true false
139 failWrongDSUID GA @grafana/plugins-platform-backend false false false
140 zanzana experimental @grafana/identity-access-team false false false
141 reloadDashboardsOnParamsChange experimental @grafana/dashboards-squad false false false

@ -3081,15 +3081,19 @@
{
"metadata": {
"name": "ssoSettingsLDAP",
"resourceVersion": "1743693517832",
"creationTimestamp": "2024-06-18T11:31:27Z"
"resourceVersion": "1749024523226",
"creationTimestamp": "2024-06-18T11:31:27Z",
"annotations": {
"grafana.app/updatedTimestamp": "2025-06-04 08:08:43.226801 +0000 UTC"
}
},
"spec": {
"description": "Use the new SSO Settings API to configure LDAP",
"stage": "preview",
"stage": "GA",
"codeowner": "@grafana/identity-access-team",
"requiresRestart": true,
"allowSelfServe": true
"allowSelfServe": true,
"expression": "true"
}
},
{

Loading…
Cancel
Save