From 9dd68dbbcc47d7dda06080fb3340f46769ddd334 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Wed, 19 Nov 2025 12:43:59 +0100 Subject: [PATCH] Logs: Feature flag logRowsPopoverMenu removed (#113583) * logRowsPopoverMenu: remove feature flag * Remove import * Remove feature flag --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 5 ++--- pkg/services/featuremgmt/registry.go | 11 +++++------ pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.go | 6 +++--- pkg/services/featuremgmt/toggles_gen.json | 3 ++- public/app/features/logs/components/LogRows.test.tsx | 7 ------- public/app/features/logs/components/LogRows.tsx | 3 +-- .../features/logs/components/panel/LogList.test.tsx | 7 ------- .../features/logs/components/panel/usePopoverMenu.ts | 4 +--- 10 files changed, 15 insertions(+), 34 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 317b60971b3..549a638118e 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -44,7 +44,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `dashboardSceneSolo` | Enables rendering dashboards using scenes for solo panels | Yes | | `dashboardScene` | Enables dashboard rendering using scenes for all roles | Yes | | `logsInfiniteScrolling` | Enables infinite scrolling for the Logs panel in Explore and Dashboards | Yes | -| `logRowsPopoverMenu` | Enable filtering menu displayed when text of a log line is selected | Yes | | `alertingQueryOptimization` | Optimizes eligible queries in order to reduce load on datasources | | | `onPremToCloudMigrations` | Enable the Grafana Migration Assistant, which helps you easily migrate various on-prem resources to your Grafana Cloud stack. | Yes | | `newPDFRendering` | New implementation for the dashboard-to-PDF rendering | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 3aaaa4aba42..36a79ab5dd3 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -396,10 +396,9 @@ export interface FeatureToggles { */ logsInfiniteScrolling?: boolean; /** - * Enable filtering menu displayed when text of a log line is selected - * @default true + * Disables passing host environment variable to plugin processes */ - logRowsPopoverMenu?: boolean; + pluginsSkipHostEnvVars?: boolean; /** * Enables shared crosshair in table panel */ diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 69893cb94eb..950dd5f2030 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -664,12 +664,11 @@ var ( Owner: grafanaObservabilityLogsSquad, }, { - Name: "logRowsPopoverMenu", - Description: "Enable filtering menu displayed when text of a log line is selected", - Stage: FeatureStageGeneralAvailability, - FrontendOnly: true, - Expression: "true", - Owner: grafanaObservabilityLogsSquad, + Name: "pluginsSkipHostEnvVars", + Description: "Disables passing host environment variable to plugin processes", + Stage: FeatureStageExperimental, + FrontendOnly: false, + Owner: grafanaPluginsPlatformSquad, }, { Name: "tableSharedCrosshair", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index a6f6bb4a480..aabf5ef3b41 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -88,7 +88,7 @@ pdfTables,preview,@grafana/grafana-operator-experience-squad,false,false,false canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true timeComparison,experimental,@grafana/dataviz-squad,false,false,true logsInfiniteScrolling,GA,@grafana/observability-logs,false,false,true -logRowsPopoverMenu,GA,@grafana/observability-logs,false,false,true +pluginsSkipHostEnvVars,experimental,@grafana/plugins-platform-backend,false,false,false tableSharedCrosshair,experimental,@grafana/dataviz-squad,false,false,true kubernetesFeatureToggles,experimental,@grafana/grafana-operator-experience-squad,false,false,true cloudRBACRoles,preview,@grafana/identity-access-team,false,true,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index ba6d0d3a415..56ed10d0813 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -363,9 +363,9 @@ const ( // Enables infinite scrolling for the Logs panel in Explore and Dashboards FlagLogsInfiniteScrolling = "logsInfiniteScrolling" - // FlagLogRowsPopoverMenu - // Enable filtering menu displayed when text of a log line is selected - FlagLogRowsPopoverMenu = "logRowsPopoverMenu" + // FlagPluginsSkipHostEnvVars + // Disables passing host environment variable to plugin processes + FlagPluginsSkipHostEnvVars = "pluginsSkipHostEnvVars" // FlagTableSharedCrosshair // Enables shared crosshair in table panel diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 9fc363536d4..ce4f02a2135 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2517,7 +2517,8 @@ "metadata": { "name": "logRowsPopoverMenu", "resourceVersion": "1753448760331", - "creationTimestamp": "2023-11-16T09:48:10Z" + "creationTimestamp": "2023-11-16T09:48:10Z", + "deletionTimestamp": "2025-11-07T10:57:27Z" }, "spec": { "description": "Enable filtering menu displayed when text of a log line is selected", diff --git a/public/app/features/logs/components/LogRows.test.tsx b/public/app/features/logs/components/LogRows.test.tsx index ac38cea7c3f..1796c918baf 100644 --- a/public/app/features/logs/components/LogRows.test.tsx +++ b/public/app/features/logs/components/LogRows.test.tsx @@ -18,13 +18,6 @@ jest.mock('../utils', () => ({ jest.mock('@grafana/runtime', () => ({ ...jest.requireActual('@grafana/runtime'), - config: { - ...jest.requireActual('@grafana/runtime').config, - featureToggles: { - ...jest.requireActual('@grafana/runtime').config.featureToggles, - logRowsPopoverMenu: true, - }, - }, usePluginLinks: jest.fn().mockReturnValue({ links: [] }), })); diff --git a/public/app/features/logs/components/LogRows.tsx b/public/app/features/logs/components/LogRows.tsx index 3c564f5c538..e1556290167 100644 --- a/public/app/features/logs/components/LogRows.tsx +++ b/public/app/features/logs/components/LogRows.tsx @@ -12,7 +12,6 @@ import { TimeRange, } from '@grafana/data'; import { Trans, t } from '@grafana/i18n'; -import { config } from '@grafana/runtime'; import { DataQuery } from '@grafana/schema'; import { ConfirmModal, Icon, PopoverContent, useTheme2 } from '@grafana/ui'; import { GetFieldLinksFn } from 'app/plugins/panel/logs/types'; @@ -169,7 +168,7 @@ export const LogRows = memo( ); const popoverMenuSupported = useCallback(() => { - if (!config.featureToggles.logRowsPopoverMenu || isPopoverMenuDisabled()) { + if (isPopoverMenuDisabled()) { return false; } return Boolean(onClickFilterOutString || onClickFilterString); diff --git a/public/app/features/logs/components/panel/LogList.test.tsx b/public/app/features/logs/components/panel/LogList.test.tsx index 38080a00657..6d0ad667527 100644 --- a/public/app/features/logs/components/panel/LogList.test.tsx +++ b/public/app/features/logs/components/panel/LogList.test.tsx @@ -33,13 +33,6 @@ jest.mock('@grafana/runtime', () => { ...jest.requireActual('@grafana/runtime'), usePluginLinks: jest.fn().mockReturnValue({ links: [] }), reportInteraction: jest.fn(), - config: { - ...jest.requireActual('@grafana/runtime').config, - featureToggles: { - ...jest.requireActual('@grafana/runtime').config.featureToggles, - logRowsPopoverMenu: true, - }, - }, }; }); diff --git a/public/app/features/logs/components/panel/usePopoverMenu.ts b/public/app/features/logs/components/panel/usePopoverMenu.ts index df3ba12ae98..09cf3503214 100644 --- a/public/app/features/logs/components/panel/usePopoverMenu.ts +++ b/public/app/features/logs/components/panel/usePopoverMenu.ts @@ -1,7 +1,5 @@ import { useCallback, useRef, useState, MouseEvent } from 'react'; -import { config } from '@grafana/runtime'; - import { disablePopoverMenu, enablePopoverMenu, isPopoverMenuDisabled, targetIsElement } from '../../utils'; import { PopoverStateType } from '../LogRows'; @@ -19,7 +17,7 @@ export const usePopoverMenu = (containerElement: HTMLDivElement | null) => { const { onClickFilterOutString, onClickFilterString } = useLogListContext(); const popoverMenuSupported = useCallback(() => { - if (!config.featureToggles.logRowsPopoverMenu || isPopoverMenuDisabled()) { + if (isPopoverMenuDisabled()) { return false; } return Boolean(onClickFilterOutString || onClickFilterString);