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 5e11f8b5448..696a9458a9c 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -48,7 +48,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `angularDeprecationUI` | Display Angular warnings in dashboards and panels | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes | | `alertingInsights` | Show the new alerting insights landing page | Yes | -| `externalServiceAccounts` | Automatic service account and token setup for plugins | Yes | | `panelMonitoring` | Enables panel monitoring through logs and measurements | Yes | | `formatString` | Enable format string transformer | Yes | | `transformationsVariableSupport` | Allows using variables in transformations | Yes | @@ -101,6 +100,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `enableDatagridEditing` | Enables the edit functionality in the datagrid panel | | `sqlDatasourceDatabaseSelection` | Enables previous SQL data source dataset dropdown behavior | | `reportingRetries` | Enables rendering retries for the reporting feature | +| `externalServiceAccounts` | Automatic service account and token setup for plugins | | `cloudWatchBatchQueries` | Runs CloudWatch metrics queries as separate batches | | `teamHttpHeaders` | Enables LBAC for datasources to apply LogQL filtering of logs to the client requests for users in teams | | `pdfTables` | Enables generating table data as PDF in reporting | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e6827e35024..e8f6e5178ca 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -675,9 +675,8 @@ var ( Name: "externalServiceAccounts", Description: "Automatic service account and token setup for plugins", HideFromAdminPage: true, - Stage: FeatureStageGeneralAvailability, + Stage: FeatureStagePublicPreview, Owner: identityAccessTeam, - Expression: "true", // enabled by default }, { Name: "panelMonitoring", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 3abc3046a2a..40c180cbb5c 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -88,7 +88,7 @@ wargamesTesting,experimental,@grafana/hosted-grafana-team,false,false,false alertingInsights,GA,@grafana/alerting-squad,false,false,true externalCorePlugins,experimental,@grafana/plugins-platform-backend,false,false,false pluginsAPIMetrics,experimental,@grafana/plugins-platform-backend,false,false,true -externalServiceAccounts,GA,@grafana/identity-access-team,false,false,false +externalServiceAccounts,preview,@grafana/identity-access-team,false,false,false panelMonitoring,GA,@grafana/dataviz-squad,false,false,true enableNativeHTTPHistogram,experimental,@grafana/grafana-backend-services-squad,false,true,false disableClassicHTTPHistogram,experimental,@grafana/grafana-backend-services-squad,false,true,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index b9f8b76f90d..2c4aaacdd4b 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1234,18 +1234,14 @@ { "metadata": { "name": "externalServiceAccounts", - "resourceVersion": "1726562284896", - "creationTimestamp": "2023-09-28T07:26:37Z", - "annotations": { - "grafana.app/updatedTimestamp": "2024-09-17 08:38:04.896869045 +0000 UTC" - } + "resourceVersion": "1718727528075", + "creationTimestamp": "2023-09-28T07:26:37Z" }, "spec": { "description": "Automatic service account and token setup for plugins", - "stage": "GA", + "stage": "preview", "codeowner": "@grafana/identity-access-team", - "hideFromAdminPage": true, - "expression": "true" + "hideFromAdminPage": true } }, {