From d69c5b7fd7a64f771d7044cb8fb6708d8ec14dd8 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 17 Nov 2025 18:56:36 +0000 Subject: [PATCH] chore(feature-toggles): Deprecate feature_toggles.enable configuration Co-authored-by: dave.henderson --- conf/defaults.ini | 13 ++++++------- conf/sample.ini | 12 ++++++------ .../setup-grafana/configure-grafana/_index.md | 14 +++++++++----- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 363ca39d0c4..3a3282eeec5 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -2066,13 +2066,8 @@ grpc_port = license_path = [feature_toggles] -# there are currently two ways to enable feature toggles in the `grafana.ini`. -# you can either pass an array of feature you want to enable to the `enable` field or -# configure each toggle by setting the name of the toggle to true/false. Toggles set to true/false -# will take precedence over toggles in the `enable` list. - -# enable = feature1,feature2 -enable = +# Feature toggles are configured in this section, each toggle is a key-value +# pair with the toggle name as the key and the value as true/false. # Some features are enabled by default, see: # https://grafana.com/docs/grafana/next/setup-grafana/configure-grafana/feature-toggles/ @@ -2082,6 +2077,10 @@ enable = # feature1 = true # feature2 = false +# The `enable` entry is deprecated and will be removed in a future major +# release. Use individual entries as shown above instead. +# enable = feature1,feature2 + [feature_toggles.openfeature] # This is EXPERIMENTAL. Please, do not use this section enable_api = true diff --git a/conf/sample.ini b/conf/sample.ini index 530b14c87ac..800e0ac57e2 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -1989,16 +1989,16 @@ default_datasource_uid = ;license_path = [feature_toggles] -# there are currently two ways to enable feature toggles in the `grafana.ini`. -# you can either pass an array of feature you want to enable to the `enable` field or -# configure each toggle by setting the name of the toggle to true/false. Toggles set to true/false -# will take presidence over toggles in the `enable` list. - -;enable = feature1,feature2 +# Feature toggles are configured in this section, each toggle is a key-value +# pair with the toggle name as the key and the value as true/false. ;feature1 = true ;feature2 = false +# The `enable` entry is deprecated and will be removed in a future major +# release. Use individual entries as shown above instead. +;enable = feature1,feature2 + [date_formats] # For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/ diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md index 67c361b2bdc..070b8de6713 100644 --- a/docs/sources/setup-grafana/configure-grafana/_index.md +++ b/docs/sources/setup-grafana/configure-grafana/_index.md @@ -100,7 +100,7 @@ client_secret = 0ldS3cretKey rendering_ignore_https_errors = true [feature_toggles] -enable = newNavigation +newNavigation = true ``` You can override variables on Linux machines with: @@ -2832,13 +2832,17 @@ For more information about Grafana Enterprise, refer to [Grafana Enterprise](../ ### `[feature_toggles]` +#### `feature_name = true|false` + +Set each feature toggle to `true` to enable it or `false` to disable it. Some feature toggles are on by default, so set the toggle to `false` to disable that default behavior, for example, `exploreMixedDatasource = false`. + #### `enable` -Keys of features to enable, separated by space. +{{< admonition type="note" >}} +This option is deprecated and will be removed in a future major release. Use individual toggle entries instead. +{{< /admonition >}} -#### `FEATURE_TOGGLE_NAME = false` - -Some feature toggles for stable features are on by default. Use this setting to disable an on-by-default feature toggle with the name FEATURE_TOGGLE_NAME, for example, `exploreMixedDatasource = false`. +Keys of features to enable, separated by spaces.