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 193ef5f77f0..5f07d936e32 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -144,7 +144,8 @@ Experimental features might be changed or removed without prior notice. The following toggles require explicitly setting Grafana's [app mode]({{< relref "../_index.md#app_mode" >}}) to 'development' before you can enable this feature toggle. These features tend to be experimental. -| Feature toggle name | Description | -| --------------------- | -------------------------------------------------------------- | -| `entityStore` | SQL-based entity store (requires storage flag also) | -| `externalServiceAuth` | Starts an OAuth2 authentication provider for external services | +| Feature toggle name | Description | +| --------------------- | -------------------------------------------------------------------------------------------- | +| `entityStore` | SQL-based entity store (requires storage flag also) | +| `externalServiceAuth` | Starts an OAuth2 authentication provider for external services | +| `idForwarding` | Generate signed id token for identity that can be forwarded to plugins and external services | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 9142cca7933..60010f98d53 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -130,4 +130,5 @@ export interface FeatureToggles { externalCorePlugins?: boolean; pluginsAPIMetrics?: boolean; httpSLOLevels?: boolean; + idForwarding?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index a0d9724c10c..db0c2db14e0 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -780,5 +780,12 @@ var ( Owner: hostedGrafanaTeam, RequiresRestart: true, }, + { + Name: "idForwarding", + Description: "Generate signed id token for identity that can be forwarded to plugins and external services", + Stage: FeatureStageExperimental, + Owner: grafanaAuthnzSquad, + RequiresDevMode: true, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index c1fdd64001a..f7451337c19 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -111,3 +111,4 @@ alertingInsights,experimental,@grafana/alerting-squad,false,false,false,true externalCorePlugins,experimental,@grafana/plugins-platform-backend,false,false,false,false pluginsAPIMetrics,experimental,@grafana/plugins-platform-backend,false,false,false,true httpSLOLevels,experimental,@grafana/hosted-grafana-team,false,false,true,false +idForwarding,experimental,@grafana/grafana-authnz-team,true,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 14462a49dd7..3ad75499352 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -454,4 +454,8 @@ const ( // FlagHttpSLOLevels // Adds SLO level to http request metrics FlagHttpSLOLevels = "httpSLOLevels" + + // FlagIdForwarding + // Generate signed id token for identity that can be forwarded to plugins and external services + FlagIdForwarding = "idForwarding" )