IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Enable nestedFolders by default (#84631)

Browse Source 
* Enable nestedFolders by default

* Make nestedFolders GA

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>

* regenerate files

* also update docs

* skip failing test

---------

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
This commit is contained in:
Serge Zaitsev 2024-03-22 14:13:43 +01:00 committed by GitHub
parent b765c21d4c
commit df2d0574c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
View File

@ -27,6 +27,7 @@ Some features are enabled by default. You can disable these feature by setting t
| `correlations` | Correlations page | |
| `exploreContentOutline` | Content outline sidebar | Yes |
| `cloudWatchCrossAccountQuerying` | Enables cross-account querying in CloudWatch datasources | Yes |
| `nestedFolders` | Enable folder nesting | Yes |
| `nestedFolderPicker` | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle | Yes |
| `logsContextDatasourceUi` | Allow datasource to provide custom UI for context view | Yes |
| `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals | Yes |
@ -76,7 +77,6 @@ Some features are enabled by default. You can disable these feature by setting t
| `returnToPrevious` | Enables the return to previous context functionality |
| `grpcServer` | Run the GRPC server |
| `accessControlOnCall` | Access control primitives for OnCall |
| `nestedFolders` | Enable folder nesting |
| `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 |

2
e2e/various-suite/select-focus.spec.ts
View File

@ -5,7 +5,7 @@ describe('Select focus/unfocus tests', () => {
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
});
it('Tests select focus/unfocus scenarios', () => {
it.skip('Tests select focus/unfocus scenarios', () => {
e2e.flows.openDashboard({ uid: '5SdHCadmz' });
e2e.components.PageToolbar.item('Dashboard settings').click();

3
pkg/services/featuremgmt/registry.go
View File

@ -257,8 +257,9 @@ var (
{
Name: "nestedFolders",
Description: "Enable folder nesting",
Stage: FeatureStagePublicPreview,
Stage: FeatureStageGeneralAvailability,
Owner: grafanaBackendPlatformSquad,
Expression: "true", // enabled by default
},
{
Name: "nestedFolderPicker",

2
pkg/services/featuremgmt/toggles_gen.csv
View File

@ -32,7 +32,7 @@ cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false
showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false
mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false
accessControlOnCall,preview,@grafana/identity-access-team,false,false,false
nestedFolders,preview,@grafana/backend-platform,false,false,false
nestedFolders,GA,@grafana/backend-platform,false,false,false
nestedFolderPicker,GA,@grafana/grafana-frontend-platform,false,false,true
alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false
editPanelCSVDragAndDrop,experimental,@grafana/dataviz-squad,false,false,true

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
32 showDashboardValidationWarnings experimental @grafana/dashboards-squad false false false
33 mysqlAnsiQuotes experimental @grafana/backend-platform false false false
34 accessControlOnCall preview @grafana/identity-access-team false false false
35 nestedFolders preview GA @grafana/backend-platform false false false
36 nestedFolderPicker GA @grafana/grafana-frontend-platform false false true
37 alertingBacktesting experimental @grafana/alerting-squad false false false
38 editPanelCSVDragAndDrop experimental @grafana/dataviz-squad false false true

9
pkg/services/featuremgmt/toggles_gen.json
View File

@ -1094,12 +1094,15 @@
{
"metadata": {
"name": "nestedFolders",
"resourceVersion": "1709648236447",
"creationTimestamp": "2024-03-05T14:17:16Z"
"resourceVersion": "1710942166805",
"creationTimestamp": "2024-03-05T14:17:16Z",
"annotations": {
"grafana.app/updatedTimestamp": "2024-03-20 13:42:46.805804 +0000 UTC"
}
},
"spec": {
"description": "Enable folder nesting",
"stage": "preview",
"stage": "GA",
"codeowner": "@grafana/backend-platform"
}
},