From c4c0c937e58836443737bff80e91a25de0e60082 Mon Sep 17 00:00:00 2001 From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com> Date: Thu, 16 May 2024 10:59:23 -0400 Subject: [PATCH] [v10.3.x] Update `nestedFolder` feature toggle description (#87181) * Updated nestedFolder description * Update generated files Signed-off-by: Jack Baldry * Empty commit --------- Signed-off-by: Jack Baldry Co-authored-by: Jack Baldry --- .../setup-grafana/configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 2 +- pkg/services/featuremgmt/toggles_gen.go | 2 +- 3 files changed, 3 insertions(+), 3 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 5f3363d433d..40c9a64d4aa 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -70,7 +70,7 @@ Some features are enabled by default. You can disable these feature by setting t | `disableAngular` | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. | | `grpcServer` | Run the GRPC server | | `accessControlOnCall` | Access control primitives for OnCall | -| `nestedFolders` | Enable folder nesting | +| `nestedFolders` | Enable folder nesting for dashboards and alerts. Note that managed alert rules aren't supported for nested folders. This feature is only supported for test and development environments. | | `alertingNoNormalState` | Stop maintaining state of alerts that are not firing | | `renderAuthJWT` | Uses JWT-based auth for rendering instead of relying on remote cache | | `refactorVariablesTimeRange` | Refactor time range variables flow to reduce number of API calls made when query variables are chained | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 726c117710b..3c724513be4 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -289,7 +289,7 @@ var ( }, { Name: "nestedFolders", - Description: "Enable folder nesting", + Description: "Enable folder nesting for dashboards and alerts. Note that managed alert rules aren't supported for nested folders. This feature is only supported for test and development environments.", Stage: FeatureStagePublicPreview, Owner: grafanaBackendPlatformSquad, Created: time.Date(2022, time.October, 22, 12, 0, 0, 0, time.UTC), diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index e532bb5ac0b..e815b377337 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -140,7 +140,7 @@ const ( FlagAccessControlOnCall = "accessControlOnCall" // FlagNestedFolders - // Enable folder nesting + // Enable folder nesting for dashboards and alerts. Note that managed alert rules aren't supported for nested folders. This feature is only supported for test and development environments. FlagNestedFolders = "nestedFolders" // FlagNestedFolderPicker