From 5beaae8561cdb7edc8c6bf34a2c844adc1738868 Mon Sep 17 00:00:00 2001 From: Joey <90795735+joey-grafana@users.noreply.github.com> Date: Mon, 15 Jul 2024 13:45:41 +0100 Subject: [PATCH] FlameGraph: Remove flameGraphItemCollapsing feature toggle (#90190) Remove feature toggle --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 7 ------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 3 ++- .../explore/FlameGraph/FlameGraphExploreContainer.tsx | 1 - public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx | 1 - 8 files changed, 2 insertions(+), 17 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 6025f8ec300..b383ff508ff 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -165,7 +165,6 @@ Experimental features might be changed or removed without prior notice. | `dashboardSceneForViewers` | Enables dashboard rendering using Scenes for viewer roles | | `dashboardSceneSolo` | Enables rendering dashboards using scenes for solo panels | | `dashboardScene` | Enables dashboard rendering using scenes for all roles | -| `flameGraphItemCollapsing` | Allow collapsing of flame graph items | | `pluginsSkipHostEnvVars` | Disables passing host environment variable to plugin processes | | `tableSharedCrosshair` | Enables shared crosshair in table panel | | `kubernetesFeatureToggles` | Use the kubernetes API for feature toggle management in the frontend | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index f4c1aeeeafb..a887315d14a 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -142,7 +142,6 @@ export interface FeatureToggles { ssoSettingsApi?: boolean; canvasPanelPanZoom?: boolean; logsInfiniteScrolling?: boolean; - flameGraphItemCollapsing?: boolean; exploreMetrics?: boolean; alertingSimplifiedRouting?: boolean; logRowsPopoverMenu?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index fba8484d44c..bae0589e6ba 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -929,13 +929,6 @@ var ( FrontendOnly: true, Owner: grafanaObservabilityLogsSquad, }, - { - Name: "flameGraphItemCollapsing", - Description: "Allow collapsing of flame graph items", - Stage: FeatureStageExperimental, - FrontendOnly: true, - Owner: grafanaObservabilityTracesAndProfilingSquad, - }, { Name: "exploreMetrics", Description: "Enables the new Explore Metrics core app", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 77f56ff125a..76fa046f92d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -123,7 +123,6 @@ pdfTables,preview,@grafana/sharing-squad,false,false,false ssoSettingsApi,GA,@grafana/identity-access-team,false,false,false canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true logsInfiniteScrolling,GA,@grafana/observability-logs,false,false,true -flameGraphItemCollapsing,experimental,@grafana/observability-traces-and-profiling,false,false,true exploreMetrics,GA,@grafana/dashboards-squad,false,false,true alertingSimplifiedRouting,GA,@grafana/alerting-squad,false,false,false logRowsPopoverMenu,GA,@grafana/observability-logs,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index a1076aa11d4..9d826afe0ac 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -503,10 +503,6 @@ const ( // Enables infinite scrolling for the Logs panel in Explore and Dashboards FlagLogsInfiniteScrolling = "logsInfiniteScrolling" - // FlagFlameGraphItemCollapsing - // Allow collapsing of flame graph items - FlagFlameGraphItemCollapsing = "flameGraphItemCollapsing" - // FlagExploreMetrics // Enables the new Explore Metrics core app FlagExploreMetrics = "exploreMetrics" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 694d802779a..e421255b419 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1126,7 +1126,8 @@ "metadata": { "name": "flameGraphItemCollapsing", "resourceVersion": "1718727528075", - "creationTimestamp": "2023-11-09T14:31:07Z" + "creationTimestamp": "2023-11-09T14:31:07Z", + "deletionTimestamp": "2024-07-08T14:17:01Z" }, "spec": { "description": "Allow collapsing of flame graph items", diff --git a/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx b/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx index 7e2b5198c9a..253f9df9390 100644 --- a/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx +++ b/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx @@ -30,7 +30,6 @@ export const FlameGraphExploreContainer = (props: Props) => { onViewSelected={(view: string) => interaction('view_selected', { view })} onTextAlignSelected={(align: string) => interaction('text_align_selected', { align })} onTableSort={(sort: string) => interaction('table_sort_selected', { sort })} - disableCollapsing={!config.featureToggles.flameGraphItemCollapsing} /> ); diff --git a/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx b/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx index de45d52375f..e9e8d9c8368 100644 --- a/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx +++ b/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx @@ -28,7 +28,6 @@ export const FlameGraphPanel = (props: PanelProps) => { onViewSelected={(view: string) => interaction('view_selected', { view })} onTextAlignSelected={(align: string) => interaction('text_align_selected', { align })} onTableSort={(sort: string) => interaction('table_sort_selected', { sort })} - disableCollapsing={!config.featureToggles.flameGraphItemCollapsing} /> ); };