InfluxDB: Remove influxdbSqlSupport feature toggle (#86518)

Remove influxdbSqlSupport feature toggle

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

@@ -43,7 +43,6 @@ Some features are enabled by default. You can disable these feature by setting t
 | `traceQLStreaming`                   | Enables response streaming of TraceQL queries of the Tempo data source                                                                                                                                                       |                    |
 | `awsAsyncQueryCaching`               | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled                                                                                           | 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                |
 | `alertingNoDataErrorExecution`       | Changes how Alerting state manager handles execution of NoData/Error                                                                                                                                                         | Yes                |
 | `angularDeprecationUI`               | Display Angular warnings in dashboards and panels                                                                                                                                                                            | Yes                |
 | `dashgpt`                            | Enable AI powered features in dashboards                                                                                                                                                                                     | Yes                |

packages/grafana-data/src/types/featureToggles.gen.ts

@@ -101,7 +101,6 @@ export interface FeatureToggles {
   permissionsFilterRemoveSubquery?: boolean;
   prometheusConfigOverhaulAuth?: boolean;
   configurableSchedulerTick?: boolean;
-  influxdbSqlSupport?: boolean;
   alertingNoDataErrorExecution?: boolean;
   angularDeprecationUI?: boolean;
   dashgpt?: boolean;

pkg/services/featuremgmt/registry.go

@@ -620,16 +620,6 @@ var (
 			RequiresRestart: true,
 			HideFromDocs:    true,
 		},
-		{
-			Name:            "influxdbSqlSupport",
-			Description:     "Enable InfluxDB SQL query language support with new querying UI",
-			Stage:           FeatureStageGeneralAvailability,
-			FrontendOnly:    false,
-			Owner:           grafanaObservabilityMetricsSquad,
-			RequiresRestart: true,
-			AllowSelfServe:  true,
-			Expression:      "true", // enabled by default
-		},
 		{
 			Name:            "alertingNoDataErrorExecution",
 			Description:     "Changes how Alerting state manager handles execution of NoData/Error",

pkg/services/featuremgmt/toggles_gen.csv

@@ -82,7 +82,6 @@ awsAsyncQueryCaching,GA,@grafana/aws-datasources,false,false,false
 permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,false,false,false
 prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,false,false,false
 configurableSchedulerTick,experimental,@grafana/alerting-squad,false,true,false
-influxdbSqlSupport,GA,@grafana/observability-metrics,false,true,false
 alertingNoDataErrorExecution,GA,@grafana/alerting-squad,false,true,false
 angularDeprecationUI,GA,@grafana/plugins-platform-backend,false,false,true
 dashgpt,GA,@grafana/dashboards-squad,false,false,true

pkg/services/featuremgmt/toggles_gen.go

@@ -339,10 +339,6 @@ const (
 	// Enable changing the scheduler base interval via configuration option unified_alerting.scheduler_tick_interval
 	FlagConfigurableSchedulerTick = "configurableSchedulerTick"
 
-	// FlagInfluxdbSqlSupport
-	// Enable InfluxDB SQL query language support with new querying UI
-	FlagInfluxdbSqlSupport = "influxdbSqlSupport"
-
 	// FlagAlertingNoDataErrorExecution
 	// Changes how Alerting state manager handles execution of NoData/Error
 	FlagAlertingNoDataErrorExecution = "alertingNoDataErrorExecution"

pkg/services/featuremgmt/toggles_gen.json

@@ -977,7 +977,8 @@
       "metadata": {
         "name": "influxdbSqlSupport",
         "resourceVersion": "1712639261786",
-        "creationTimestamp": "2024-04-09T05:07:41Z"
+        "creationTimestamp": "2024-04-09T05:07:41Z",
+        "deletionTimestamp": "2024-04-18T12:35:02Z"
       },
       "spec": {
         "description": "Enable InfluxDB SQL query language support with new querying UI",

public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx

@@ -6,9 +6,9 @@ import {
   DataSourceSettings,
   SelectableValue,
   updateDatasourcePluginJsonDataOption,
-} from '@grafana/data/src';
-import { Alert, DataSourceHttpSettings, InlineField, Select, Field, Input, FieldSet } from '@grafana/ui/src';
-import { config } from 'app/core/config';
+} from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Alert, DataSourceHttpSettings, InlineField, Select, Field, Input, FieldSet } from '@grafana/ui';
 
 import { BROWSER_MODE_DISABLED_MESSAGE } from '../../../constants';
 import { InfluxOptions, InfluxOptionsV1, InfluxVersion } from '../../../types';
@@ -36,11 +36,6 @@ const versionMap: Record<InfluxVersion, SelectableValue<InfluxVersion>> = {
 };
 
 const versions: Array<SelectableValue<InfluxVersion>> = [
-  versionMap[InfluxVersion.InfluxQL],
-  versionMap[InfluxVersion.Flux],
-];
-
-const versionsWithSQL: Array<SelectableValue<InfluxVersion>> = [
   versionMap[InfluxVersion.InfluxQL],
   versionMap[InfluxVersion.SQL],
   versionMap[InfluxVersion.Flux],
@@ -119,7 +114,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
               aria-label="Query language"
               className="width-30"
               value={versionMap[options.jsonData.version ?? InfluxVersion.InfluxQL]}
-              options={config.featureToggles.influxdbSqlSupport ? versionsWithSQL : versions}
+              options={versions}
               defaultValue={versionMap[InfluxVersion.InfluxQL]}
               onChange={this.onVersionChanged}
             />