From fd65b83a533abf1eb7afacd7f3fb2bf99300b762 Mon Sep 17 00:00:00 2001 From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com> Date: Mon, 5 May 2025 10:55:06 +0200 Subject: [PATCH] Alerting: Remove alertingInsights feature toggle (#104918) remove alertingInsights feature toggle --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 5 ----- pkg/services/featuremgmt/registry.go | 10 ---------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 3 ++- public/app/features/alerting/unified/home/Home.tsx | 3 +-- 7 files changed, 3 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 f340ab99a01..b4a87304e1f 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -41,7 +41,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled | Yes | | `angularDeprecationUI` | Display Angular warnings in dashboards and panels | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes | -| `alertingInsights` | Show the new alerting insights landing page | Yes | | `externalCorePlugins` | Allow core plugins to be loaded as external | Yes | | `panelMonitoring` | Enables panel monitoring through logs and measurements | Yes | | `formatString` | Enable format string transformer | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 513f38f4fdb..9e3522b32b6 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -273,11 +273,6 @@ export interface FeatureToggles { */ wargamesTesting?: boolean; /** - * Show the new alerting insights landing page - * @default true - */ - alertingInsights?: boolean; - /** * Allow core plugins to be loaded as external * @default true */ diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 0c70783efcf..d7da1d700b2 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -450,16 +450,6 @@ var ( FrontendOnly: false, Owner: hostedGrafanaTeam, }, - { - Name: "alertingInsights", - Description: "Show the new alerting insights landing page", - FrontendOnly: true, - Stage: FeatureStageGeneralAvailability, - Owner: grafanaAlertingSquad, - Expression: "true", // enabled by default - AllowSelfServe: false, - HideFromAdminPage: true, // This is moving away from being a feature toggle. - }, { Name: "externalCorePlugins", Description: "Allow core plugins to be loaded as external", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 9f6642437a7..b6cb09cc365 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -58,7 +58,6 @@ sseGroupByDatasource,experimental,@grafana/observability-metrics,false,false,fal libraryPanelRBAC,experimental,@grafana/dashboards-squad,false,true,false lokiRunQueriesInParallel,privatePreview,@grafana/observability-logs,false,false,false wargamesTesting,experimental,@grafana/hosted-grafana-team,false,false,false -alertingInsights,GA,@grafana/alerting-squad,false,false,true externalCorePlugins,GA,@grafana/plugins-platform-backend,false,false,false externalServiceAccounts,preview,@grafana/identity-access-team,false,false,false panelMonitoring,GA,@grafana/dataviz-squad,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 4d577a49a4c..ba2dd4d0781 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -243,10 +243,6 @@ const ( // Placeholder feature flag for internal testing FlagWargamesTesting = "wargamesTesting" - // FlagAlertingInsights - // Show the new alerting insights landing page - FlagAlertingInsights = "alertingInsights" - // FlagExternalCorePlugins // Allow core plugins to be loaded as external FlagExternalCorePlugins = "externalCorePlugins" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 82f7b6df36b..357a2e828e5 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -159,7 +159,8 @@ "metadata": { "name": "alertingInsights", "resourceVersion": "1745491786560", - "creationTimestamp": "2023-09-14T12:58:04Z" + "creationTimestamp": "2023-09-14T12:58:04Z", + "deletionTimestamp": "2025-05-05T08:01:40Z" }, "spec": { "description": "Show the new alerting insights landing page", diff --git a/public/app/features/alerting/unified/home/Home.tsx b/public/app/features/alerting/unified/home/Home.tsx index 20e785b470a..0f9e8baefb7 100644 --- a/public/app/features/alerting/unified/home/Home.tsx +++ b/public/app/features/alerting/unified/home/Home.tsx @@ -1,6 +1,5 @@ import { useState } from 'react'; -import { config } from '@grafana/runtime'; import { Box, Stack, Tab, TabContent, TabsBar } from '@grafana/ui'; import { t } from 'app/core/internationalization'; @@ -13,7 +12,7 @@ import { getInsightsScenes, insightsIsAvailable } from './Insights'; import { PluginIntegrations } from './PluginIntegrations'; function Home() { - const insightsEnabled = (insightsIsAvailable() || isLocalDevEnv()) && Boolean(config.featureToggles.alertingInsights); + const insightsEnabled = insightsIsAvailable() || isLocalDevEnv(); const [activeTab, setActiveTab] = useState<'insights' | 'overview'>(insightsEnabled ? 'insights' : 'overview'); const insightsScene = getInsightsScenes();