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 85771c3b30b..679de6b828a 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -44,6 +44,7 @@ Some stable features are enabled by default. You can disable a stable feature by | `panelTitleSearch` | Search for dashboards using panel title | | `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint | | `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 | @@ -68,7 +69,6 @@ Alpha features might be changed or removed without prior notice. | `publicDashboardsEmailSharing` | Enables public dashboard sharing to be restricted to only allowed emails | | `lokiLive` | Support WebSocket streaming for loki (early prototype) | | `storage` | Configurable storage for dashboards, datasources, and resources | -| `exploreMixedDatasource` | Enable mixed datasource in Explore | | `newTraceView` | Shows the new trace view design | | `datasourceQueryMultiStatus` | Introduce HTTP 207 Multi Status for api/ds/query | | `traceToMetrics` | Enable trace to metrics links | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index add101533a4..1153e39c680 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -100,7 +100,7 @@ var ( { Name: "exploreMixedDatasource", Description: "Enable mixed datasource in Explore", - State: FeatureStateAlpha, + State: FeatureStateBeta, FrontendOnly: true, Owner: grafanaExploreSquad, }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 9bc4f460056..1f5bd22a36e 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -13,7 +13,7 @@ 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 k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false -exploreMixedDatasource,alpha,@grafana/explore-squad,false,false,false,true +exploreMixedDatasource,beta,@grafana/explore-squad,false,false,false,true newTraceView,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