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 0a6e16e697d..3dc9644a371 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -78,7 +78,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `grafanaAssistantInProfilesDrilldown` | Enables integration with Grafana Assistant in Profiles Drilldown | Yes | | `sharingDashboardImage` | Enables image sharing functionality for dashboards | Yes | | `tabularNumbers` | Use fixed-width numbers globally in the UI | | -| `adhocFiltersInTooltips` | Enable adhoc filter buttons in visualization tooltips | Yes | | `tempoSearchBackendMigration` | Run search queries through the tempo backend | | ## Public preview feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index eadc831370f..b33a998c59a 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -1127,11 +1127,6 @@ export interface FeatureToggles { */ restrictedPluginApis?: boolean; /** - * Enable adhoc filter buttons in visualization tooltips - * @default true - */ - adhocFiltersInTooltips?: boolean; - /** * Enable favorite datasources */ favoriteDatasources?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index fdfc6cfd7c6..56e5fd9c619 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1959,14 +1959,6 @@ var ( FrontendOnly: true, Expression: "false", }, - { - Name: "adhocFiltersInTooltips", - Description: "Enable adhoc filter buttons in visualization tooltips", - Stage: FeatureStageGeneralAvailability, - Owner: grafanaDataProSquad, - FrontendOnly: true, - Expression: "true", - }, { Name: "favoriteDatasources", Description: "Enable favorite datasources", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index dff17f73355..9fbdc051aee 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -252,7 +252,6 @@ unifiedStorageSearchDualReaderEnabled,experimental,@grafana/search-and-storage,f dashboardLevelTimeMacros,experimental,@grafana/dashboards-squad,false,false,true alertmanagerRemoteSecondaryWithRemoteState,experimental,@grafana/alerting-squad,false,false,false restrictedPluginApis,experimental,@grafana/plugins-platform-backend,false,false,true -adhocFiltersInTooltips,GA,@grafana/datapro,false,false,true favoriteDatasources,experimental,@grafana/plugins-platform-backend,false,false,true newLogContext,experimental,@grafana/observability-logs,false,false,true newClickhouseConfigPageDesign,privatePreview,@grafana/partner-datasources,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 574b0480bac..68961d1c35f 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -1018,10 +1018,6 @@ const ( // Enables sharing a list of APIs with a list of plugins FlagRestrictedPluginApis = "restrictedPluginApis" - // FlagAdhocFiltersInTooltips - // Enable adhoc filter buttons in visualization tooltips - FlagAdhocFiltersInTooltips = "adhocFiltersInTooltips" - // FlagFavoriteDatasources // Enable favorite datasources FlagFavoriteDatasources = "favoriteDatasources" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 67af5cd1dc1..9216cea723a 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -25,6 +25,7 @@ "name": "adhocFiltersInTooltips", "resourceVersion": "1756814786992", "creationTimestamp": "2025-07-29T17:53:43Z", + "deletionTimestamp": "2025-11-11T09:49:48Z", "annotations": { "grafana.app/updatedTimestamp": "2025-09-02 12:06:26.992384 +0000 UTC" } diff --git a/public/app/plugins/panel/barchart/BarChartPanel.tsx b/public/app/plugins/panel/barchart/BarChartPanel.tsx index 3d133a5b429..0f71503c158 100644 --- a/public/app/plugins/panel/barchart/BarChartPanel.tsx +++ b/public/app/plugins/panel/barchart/BarChartPanel.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react'; import { PanelProps, VizOrientation } from '@grafana/data'; -import { config, PanelDataErrorView } from '@grafana/runtime'; +import { PanelDataErrorView } from '@grafana/runtime'; import { AdHocFilterItem, TooltipDisplayMode, @@ -174,11 +174,7 @@ export const BarChartPanel = (props: PanelProps) => { // Fields may later be marked as not filterable. For example, fields created from Grafana Transforms that // are derived from a data source, but are not present in the data source. // We choose `xField` here because it contains the label-value pair, rather than `field` which is the numeric Value. - if ( - config.featureToggles.adhocFiltersInTooltips && - xField.config.filterable && - onAddAdHocFilter != null - ) { + if (xField.config.filterable && onAddAdHocFilter != null) { const adHocFilterItem: AdHocFilterItem = { key: xField.name, operator: FILTER_FOR_OPERATOR,