root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 21 Packages Projects Releases Wiki Activity

InfluxDB: Remove influxdbSqlSupport feature toggle (#86518) 

Remove influxdbSqlSupport feature toggle
This commit is contained in:
ismail simsek 2024-04-18 16:29:27 +02:00 committed by GitHub
parent 99f34cb1ed
commit 28a683cf28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 | | | `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 | | `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 | | `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 | | `alertingNoDataErrorExecution` | Changes how Alerting state manager handles execution of NoData/Error | Yes |
| `angularDeprecationUI` | Display Angular warnings in dashboards and panels | Yes | | `angularDeprecationUI` | Display Angular warnings in dashboards and panels | Yes |
| `dashgpt` | Enable AI powered features in dashboards | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes |

1
packages/grafana-data/src/types/featureToggles.gen.ts
View File

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

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

@ -620,16 +620,6 @@ var (
RequiresRestart: true, RequiresRestart: true,
HideFromDocs: 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", Name: "alertingNoDataErrorExecution",
Description: "Changes how Alerting state manager handles execution of NoData/Error", Description: "Changes how Alerting state manager handles execution of NoData/Error",

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

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

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
82 permissionsFilterRemoveSubquery experimental @grafana/backend-platform false false false
83 prometheusConfigOverhaulAuth GA @grafana/observability-metrics false false false
84 configurableSchedulerTick experimental @grafana/alerting-squad false true false
influxdbSqlSupport GA @grafana/observability-metrics false true false
85 alertingNoDataErrorExecution GA @grafana/alerting-squad false true false
86 angularDeprecationUI GA @grafana/plugins-platform-backend false false true
87 dashgpt GA @grafana/dashboards-squad false false true

4
pkg/services/featuremgmt/toggles_gen.go
View File

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

3
pkg/services/featuremgmt/toggles_gen.json
View File

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

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

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