From 1ebdbaa87d1d15b19131fd380072f32a1f67bcc1 Mon Sep 17 00:00:00 2001 From: Ihor Yeromin Date: Tue, 15 Oct 2024 13:35:33 +0200 Subject: [PATCH] fix feature toggle conflict --- .../configure-grafana/feature-toggles/index.md | 3 +-- packages/grafana-data/src/types/featureToggles.gen.ts | 3 +-- pkg/services/featuremgmt/toggles_gen.csv | 3 +-- pkg/services/featuremgmt/toggles_gen.go | 9 +++------ 4 files changed, 6 insertions(+), 12 deletions(-) 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 b2bcb0f414d..dc6cc430089 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -196,9 +196,8 @@ Experimental features might be changed or removed without prior notice. | `failWrongDSUID` | Throws an error if a datasource has an invalid UIDs | | `alertingApiServer` | Register Alerting APIs with the K8s API server | | `dataplaneAggregator` | Enable grafana dataplane aggregator | -| `adhocFilterOneOf` | Exposes a new 'one of' operator for ad-hoc filters. This operator allows users to filter by multiple values in a single filter. | -| `tableNG` | Allows access to the new react-data-grid based table component. | | `newFiltersUI` | Enables new combobox style UI for the Ad hoc filters variable in scenes architecture | +| `tableNG` | Allows access to the new react-data-grid based table component. | | `lokiSendDashboardPanelNames` | Send dashboard and panel names to Loki when querying | | `alertingPrometheusRulesPrimary` | Uses Prometheus rules as the primary source of truth for ruler-enabled data sources | | `singleTopNav` | Unifies the top search bar and breadcrumb bar into one | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 5bcaa14c56d..f3d52ba60ba 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -203,9 +203,8 @@ export interface FeatureToggles { prometheusAzureOverrideAudience?: boolean; alertingFilterV2?: boolean; dataplaneAggregator?: boolean; - adhocFilterOneOf?: boolean; - tableNG?: boolean; newFiltersUI?: boolean; + tableNG?: boolean; lokiSendDashboardPanelNames?: boolean; alertingPrometheusRulesPrimary?: boolean; singleTopNav?: boolean; diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index c8e463d7482..45736748c5d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -184,9 +184,8 @@ cloudwatchMetricInsightsCrossAccount,preview,@grafana/aws-datasources,false,fals prometheusAzureOverrideAudience,deprecated,@grafana/partner-datasources,false,false,false alertingFilterV2,experimental,@grafana/alerting-squad,false,false,false dataplaneAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false -adhocFilterOneOf,experimental,@grafana/dashboards-squad,false,false,false -tableNG,experimental,@grafana/mesa-verde,false,false,false newFiltersUI,experimental,@grafana/dashboards-squad,false,false,false +tableNG,experimental,@grafana/mesa-verde,false,false,false lokiSendDashboardPanelNames,experimental,@grafana/observability-logs,false,false,false alertingPrometheusRulesPrimary,experimental,@grafana/alerting-squad,false,false,true singleTopNav,experimental,@grafana/grafana-frontend-platform,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 7cef55baafe..00df6c5eaf4 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -747,16 +747,13 @@ const ( // Enable grafana dataplane aggregator FlagDataplaneAggregator = "dataplaneAggregator" - // FlagAdhocFilterOneOf - // Exposes a new 'one of' operator for ad-hoc filters. This operator allows users to filter by multiple values in a single filter. - FlagAdhocFilterOneOf = "adhocFilterOneOf" + // FlagNewFiltersUI + // Enables new combobox style UI for the Ad hoc filters variable in scenes architecture + FlagNewFiltersUI = "newFiltersUI" // FlagTableNG // Allows access to the new react-data-grid based table component. FlagTableNG = "tableNG" - // FlagNewFiltersUI - // Enables new combobox style UI for the Ad hoc filters variable in scenes architecture - FlagNewFiltersUI = "newFiltersUI" // FlagLokiSendDashboardPanelNames // Send dashboard and panel names to Loki when querying