From c1e8c3b2c4ce57c3562ef2f2007c2add3f71388d Mon Sep 17 00:00:00 2001 From: Giordano Ricci Date: Fri, 12 May 2023 12:44:57 +0100 Subject: [PATCH] [v10.0.x] Explore: Promote exploreMixedDatasource to Stable & enable by default (#68353) --- docs/sources/explore/_index.md | 2 +- .../setup-grafana/configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/sources/explore/_index.md b/docs/sources/explore/_index.md index 5cf8d1ee52a..8eae604c974 100644 --- a/docs/sources/explore/_index.md +++ b/docs/sources/explore/_index.md @@ -75,6 +75,6 @@ The Share shortened link capability allows you to create smaller and simpler URL ### exploreMixedDatasource -Disabled by default, allows users in Explore to have different data sources for different queries. If compatible, results will be combined. +Enabled by default, allows users in Explore to have different data sources for different queries. If compatible, results will be combined. Learn more about how to use [Mixed data source]({{< relref "../datasources/#special-data-sources" >}}). 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 684d65cd00a..e58e37cdd79 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -23,6 +23,7 @@ Some stable features are enabled by default. You can disable a stable feature by | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | | `disableEnvelopeEncryption` | Disable envelope encryption (emergency only) | | | `featureHighlights` | Highlight Grafana Enterprise features | | +| `exploreMixedDatasource` | Enable mixed datasource in Explore | Yes | | `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 | @@ -49,7 +50,6 @@ Some stable features are enabled by default. You can disable a stable feature by | `publicDashboards` | Enables public access to dashboards | | `publicDashboardsEmailSharing` | Enables public dashboard sharing to be restricted to only allowed emails | | `migrationLocking` | Lock database during migrations | -| `exploreMixedDatasource` | Enable mixed datasource in Explore | | `correlations` | Correlations page | | `newDBLibrary` | Use jmoiron/sqlx rather than xorm for a few backend services | | `validateDashboardsOnSave` | Validate dashboard JSON POSTed to api/dashboards/db | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 17b61ca5c0d..a17be209107 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -87,8 +87,9 @@ var ( { Name: "exploreMixedDatasource", Description: "Enable mixed datasource in Explore", - State: FeatureStateBeta, + State: FeatureStateStable, FrontendOnly: true, + Expression: "true", // enabled by default Owner: grafanaExploreSquad, }, { diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 93a86b00648..95290a8ca28 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -11,7 +11,7 @@ lokiLive,alpha,@grafana/observability-logs,false,false,false,false featureHighlights,stable,@grafana/grafana-as-code,false,false,false,false migrationLocking,beta,@grafana/backend-platform,false,false,false,false storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false -exploreMixedDatasource,beta,@grafana/explore-squad,false,false,false,true +exploreMixedDatasource,stable,@grafana/explore-squad,false,false,false,true newTraceViewHeader,alpha,@grafana/observability-traces-and-profiling,false,false,false,true correlations,beta,@grafana/explore-squad,false,false,false,false cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false