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 dfbb468eacb..ecfb3fd670b 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -27,6 +27,7 @@ Some stable features are enabled by default. You can disable a stable feature by | `cloudWatchDynamicLabels` | Use dynamic labels instead of alias patterns in CloudWatch datasource | Yes | | `dataConnectionsConsole` | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | Yes | | `internationalization` | Enables internationalization | Yes | +| `topnav` | Enables new top navigation and page layouts | Yes | | `cloudWatchCrossAccountQuerying` | Enables cross-account querying in CloudWatch datasources | Yes | | `accessTokenExpirationCheck` | Enable OAuth access_token expiration check and token refresh using the refresh_token | | | `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling | | @@ -44,7 +45,6 @@ Some stable features are enabled by default. You can disable a stable feature by | `validateDashboardsOnSave` | Validate dashboard JSON POSTed to api/dashboards/db | | `autoMigrateOldPanels` | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc) | | `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. | -| `topnav` | Displays new top nav and page layouts | | `accessControlOnCall` | Access control primitives for OnCall | | `alertingNoNormalState` | Stop maintaining state of alerts that are not firing | | `disableElasticsearchBackendExploreQuery` | Disable executing of Elasticsearch Explore queries trough backend | diff --git a/e2e/dashboards-suite/dashboard-search.spec.ts b/e2e/dashboards-suite/dashboard-browse.spec.ts similarity index 91% rename from e2e/dashboards-suite/dashboard-search.spec.ts rename to e2e/dashboards-suite/dashboard-browse.spec.ts index f2ec3136c6e..2c14f9cbc18 100644 --- a/e2e/dashboards-suite/dashboard-search.spec.ts +++ b/e2e/dashboards-suite/dashboard-browse.spec.ts @@ -3,7 +3,7 @@ import { e2e } from '@grafana/e2e'; import testDashboard from '../dashboards/TestDashboard.json'; e2e.scenario({ - describeName: 'Dashboard search', + describeName: 'Dashboard browse', itName: 'Basic folder view test', addScenarioDataSource: false, addScenarioDashBoard: false, @@ -11,7 +11,7 @@ e2e.scenario({ scenario: () => { e2e.flows.importDashboard(testDashboard, 1000, true); - e2e.pages.Search.FolderView.visit(); + e2e.pages.Dashboards.visit(); // folder view is collapsed - verify its content does not exist e2e.components.Search.folderContent('General').should('not.exist'); diff --git a/e2e/shared/smokeTestScenario.ts b/e2e/shared/smokeTestScenario.ts index b5c0a4bb28e..cd2888b055b 100644 --- a/e2e/shared/smokeTestScenario.ts +++ b/e2e/shared/smokeTestScenario.ts @@ -8,7 +8,8 @@ export const smokeTestScenario = { skipScenario: false, loginViaApi: false, scenario: () => { - e2e.flows.openDashboard(); + // wait for time to be set to account for any layout shift + e2e().contains('2020-01-01 00:00:00 to 2020-01-01 06:00:00').should('be.visible'); e2e.components.PageToolbar.item('Add panel').click(); e2e.pages.AddDashboard.addNewPanel().click(); diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 47109985ba7..2c20670ee49 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -231,8 +231,9 @@ var ( }, { Name: "topnav", - Description: "Displays new top nav and page layouts", - State: FeatureStateBeta, + Description: "Enables new top navigation and page layouts", + State: FeatureStateStable, + Expression: "true", // enabled by default Owner: grafanaUserEssentialsSquad, }, { diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 926e97f184f..eec788ad843 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -33,7 +33,7 @@ disableSecretsCompatibility,alpha,@grafana/hosted-grafana-team,false,false,true, logRequestsInstrumentedAsUnknown,alpha,@grafana/hosted-grafana-team,false,false,false,false dataConnectionsConsole,stable,@grafana/plugins-platform-backend,false,false,false,false internationalization,stable,@grafana/user-essentials,false,false,false,false -topnav,beta,@grafana/user-essentials,false,false,false,false +topnav,stable,@grafana/user-essentials,false,false,false,false grpcServer,alpha,@grafana/grafana-app-platform-squad,true,false,false,false entityStore,alpha,@grafana/grafana-app-platform-squad,true,false,false,false cloudWatchCrossAccountQuerying,stable,@grafana/aws-plugins,false,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 1dec03e028f..622461fb3e9 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -144,7 +144,7 @@ const ( FlagInternationalization = "internationalization" // FlagTopnav - // Displays new top nav and page layouts + // Enables new top navigation and page layouts FlagTopnav = "topnav" // FlagGrpcServer