From 90ddd922ad29165d886ee9d8e42792b857cf43ba Mon Sep 17 00:00:00 2001 From: Paul Marbach Date: Fri, 7 Nov 2025 14:04:42 -0500 Subject: [PATCH] Chore: Cleanup panelMonitoring feature flag (#113530) --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 5 ----- pkg/services/featuremgmt/registry.go | 8 -------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 3 ++- .../app/features/dashboard/dashgrid/PanelStateWrapper.tsx | 7 +++---- 7 files changed, 5 insertions(+), 24 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 b9d830495c5..45ddf656223 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -40,7 +40,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `transformationsRedesign` | Enables the transformations redesign | Yes | | `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes | -| `panelMonitoring` | Enables panel monitoring through logs and measurements | Yes | | `formatString` | Enable format string transformer | Yes | | `kubernetesDashboards` | Use the kubernetes API in the frontend for dashboards | Yes | | `addFieldFromCalculationStatFunctions` | Add cumulative and window functions to the add field from calculation transformation | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 8ac393b412c..8a50becd224 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -248,11 +248,6 @@ export interface FeatureToggles { */ externalServiceAccounts?: boolean; /** - * Enables panel monitoring through logs and measurements - * @default true - */ - panelMonitoring?: boolean; - /** * Enables native HTTP Histograms */ enableNativeHTTPHistogram?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 008ed41d566..27a978a6c27 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -405,14 +405,6 @@ var ( Stage: FeatureStagePublicPreview, Owner: identityAccessTeam, }, - { - Name: "panelMonitoring", - Description: "Enables panel monitoring through logs and measurements", - Stage: FeatureStageGeneralAvailability, - Expression: "true", // enabled by default - Owner: grafanaDatavizSquad, - FrontendOnly: true, - }, { Name: "enableNativeHTTPHistogram", Description: "Enables native HTTP Histograms", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index d2108887cb9..71f681c0171 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -52,7 +52,6 @@ reportingRetries,preview,@grafana/grafana-operator-experience-squad,false,true,f sseGroupByDatasource,experimental,@grafana/observability-metrics,false,false,false lokiRunQueriesInParallel,privatePreview,@grafana/observability-logs,false,false,false externalServiceAccounts,preview,@grafana/identity-access-team,false,false,false -panelMonitoring,GA,@grafana/dataviz-squad,false,false,true enableNativeHTTPHistogram,experimental,@grafana/grafana-backend-services-squad,false,true,false disableClassicHTTPHistogram,experimental,@grafana/grafana-backend-services-squad,false,true,false formatString,GA,@grafana/dataviz-squad,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index f4701c6fb19..443fb196228 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -219,10 +219,6 @@ const ( // Automatic service account and token setup for plugins FlagExternalServiceAccounts = "externalServiceAccounts" - // FlagPanelMonitoring - // Enables panel monitoring through logs and measurements - FlagPanelMonitoring = "panelMonitoring" - // FlagEnableNativeHTTPHistogram // Enables native HTTP Histograms FlagEnableNativeHTTPHistogram = "enableNativeHTTPHistogram" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index e8c5715fe73..48155d54721 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2905,7 +2905,8 @@ "metadata": { "name": "panelMonitoring", "resourceVersion": "1753448760331", - "creationTimestamp": "2023-10-09T05:19:08Z" + "creationTimestamp": "2023-10-09T05:19:08Z", + "deletionTimestamp": "2025-11-06T15:46:51Z" }, "spec": { "description": "Enables panel monitoring through logs and measurements", diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx index 5d1558fa7f5..645cc75f811 100644 --- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx +++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx @@ -33,7 +33,6 @@ import { AdHocFilterItem, } from '@grafana/ui'; import appEvents from 'app/core/app_events'; -import config from 'app/core/config'; import { profiler } from 'app/core/profiler'; import { annotationServer } from 'app/features/annotations/api'; import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel'; @@ -121,7 +120,7 @@ export class PanelStateWrapper extends PureComponent { data: this.getInitialPanelDataState(), }; - if (config.featureToggles.panelMonitoring && this.getPanelContextApp() === CoreApp.PanelEditor) { + if (this.getPanelContextApp() === CoreApp.PanelEditor) { const panelInfo = { panelId: String(props.panel.id), panelType: props.panel.type, @@ -395,7 +394,7 @@ export class PanelStateWrapper extends PureComponent { } onPanelError = (error: Error) => { - if (config.featureToggles.panelMonitoring && this.getPanelContextApp() === CoreApp.PanelEditor) { + if (this.getPanelContextApp() === CoreApp.PanelEditor) { this.logPanelChangesOnError(); } @@ -543,7 +542,7 @@ export class PanelStateWrapper extends PureComponent { onChangeTimeRange={this.onChangeTimeRange} eventBus={dashboard.events} /> - {config.featureToggles.panelMonitoring && this.state.errorMessage === undefined && ( + {this.state.errorMessage === undefined && ( )}