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

Explore: Promote exploreMixedDatasource to Stable & enable by default (#68300)

Browse Source
This commit is contained in:
Giordano Ricci 2023-05-12 09:19:21 +01:00 committed by GitHub
parent b7b13067a5
commit df33a1df32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/explore/_index.md
View File

@ -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" >}}).

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

@ -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 |
| `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 |
@ -48,7 +49,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 |

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

@ -87,8 +87,9 @@ var (
{
Name: "exploreMixedDatasource",
Description: "Enable mixed datasource in Explore",
State: FeatureStateBeta,
State: FeatureStateStable,
FrontendOnly: true,
Expression: "true", // turned on by default
Owner: grafanaExploreSquad,
},
{

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

@ -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
datasourceQueryMultiStatus,alpha,@grafana/plugins-platform-backend,false,false,false,false

1 Name State Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
11 featureHighlights stable @grafana/grafana-as-code false false false false
12 migrationLocking beta @grafana/backend-platform false false false false
13 storage alpha @grafana/grafana-app-platform-squad false false false false
14 exploreMixedDatasource beta stable @grafana/explore-squad false false false true
15 newTraceViewHeader alpha @grafana/observability-traces-and-profiling false false false true
16 correlations beta @grafana/explore-squad false false false false
17 datasourceQueryMultiStatus alpha @grafana/plugins-platform-backend false false false false