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 cbbd960971a..9c33e536834 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -50,6 +50,7 @@ Some features are enabled by default. You can disable these feature by setting t | `transformationsRedesign` | Enables the transformations redesign | Yes | | `splitScopes` | Support faster dashboard and folder search by splitting permission scopes into parts | Yes | | `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes | +| `influxdbSqlSupport` | Enable InfluxDB SQL query language support with new querying UI | Yes | | `alertingInsights` | Show the new alerting insights landing page | Yes | | `cloudWatchWildCardDimensionValues` | Fetches dimension values from CloudWatch to correctly label wildcard dimensions | Yes | | `displayAnonymousStats` | Enables anonymous stats to be shown in the UI for Grafana | Yes | @@ -131,7 +132,6 @@ Experimental features might be changed or removed without prior notice. | `traceToProfiles` | Enables linking between traces and profiles | | `tracesEmbeddedFlameGraph` | Enables embedding a flame graph in traces | | `permissionsFilterRemoveSubquery` | Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder | -| `influxdbSqlSupport` | Enable InfluxDB SQL query language support with new querying UI | | `angularDeprecationUI` | Display new Angular deprecation-related UI features | | `sseGroupByDatasource` | Send query to the same datasource in a single request when using server side expressions | | `requestInstrumentationStatusSource` | Include a status source label for request metrics and logs | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 2796130d52e..59375c34f2f 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -812,10 +812,12 @@ var ( { Name: "influxdbSqlSupport", Description: "Enable InfluxDB SQL query language support with new querying UI", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, FrontendOnly: false, Owner: grafanaObservabilityMetricsSquad, - RequiresRestart: false, + RequiresRestart: true, + AllowSelfServe: true, + Expression: "true", // enabled by default Created: time.Date(2023, time.August, 2, 12, 0, 0, 0, time.UTC), }, { diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index f9d710e6ef9..b9889b917bc 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -94,7 +94,7 @@ tracesEmbeddedFlameGraph,experimental,@grafana/observability-traces-and-profilin permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,2023-08-02,false,false,false,false prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,2023-07-21,false,false,false,false configurableSchedulerTick,experimental,@grafana/alerting-squad,2023-07-26,false,false,true,false -influxdbSqlSupport,experimental,@grafana/observability-metrics,2023-08-02,false,false,false,false +influxdbSqlSupport,GA,@grafana/observability-metrics,2023-08-02,false,false,true,false alertingNoDataErrorExecution,privatePreview,@grafana/alerting-squad,2023-08-15,false,false,true,false angularDeprecationUI,experimental,@grafana/plugins-platform-backend,2023-08-29,false,false,false,true dashgpt,preview,@grafana/dashboards-squad,2023-11-17,false,false,false,true diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx index 568a0a7c353..ab16fdccbb0 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import React, { PureComponent } from 'react'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { Alert, InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@grafana/ui/src'; +import { InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@grafana/ui/src'; import { SQLQuery } from '../../../../../../../features/plugins/sql'; import { SqlQueryEditor } from '../../../../../../../features/plugins/sql/components/QueryEditor'; @@ -91,9 +91,6 @@ class UnthemedSQLQueryEditor extends PureComponent { return ( <> - - InfluxDB SQL support is currently in alpha state. It does not have all the features. -