From 505196bcd5043d57355e7134f89963c71b54d969 Mon Sep 17 00:00:00 2001 From: Adam Bannach <113929542+abannachGrafana@users.noreply.github.com> Date: Mon, 8 Jan 2024 08:25:11 -0600 Subject: [PATCH] Chore: Remove costManagementUi toggle (#80098) * chore: remove cost management ff; fallback to adding AM and LVE to apps drawer * chore: revert fallback app drawer placement --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 8 -------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/navtree/navtreeimpl/applinks.go | 9 ++------- 6 files changed, 2 insertions(+), 22 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 3e4da820a9d..bd4acc51f08 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -155,7 +155,6 @@ Experimental features might be changed or removed without prior notice. | `awsDatasourcesNewFormStyling` | Applies new form styling for configuration and query editors in AWS plugins | | `cachingOptimizeSerializationMemoryUsage` | If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses. | | `pluginsInstrumentationStatusSource` | Include a status source label for plugin request metrics and logs | -| `costManagementUi` | Toggles the display of the cost management ui plugin | | `managedPluginsInstall` | Install managed plugins directly from plugins catalog | | `prometheusPromQAIL` | Prometheus and AI/ML to assist users in creating a query | | `alertmanagerRemoteSecondary` | Enable Grafana to sync configuration and state with a remote Alertmanager. | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index ce299aebc26..bfe5b6a2dab 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -144,7 +144,6 @@ export interface FeatureToggles { cachingOptimizeSerializationMemoryUsage?: boolean; panelTitleSearchInV1?: boolean; pluginsInstrumentationStatusSource?: boolean; - costManagementUi?: boolean; managedPluginsInstall?: boolean; prometheusPromQAIL?: boolean; addFieldFromCalculationStatFunctions?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 063eef6043c..db622417ba2 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1069,14 +1069,6 @@ var ( Owner: grafanaPluginsPlatformSquad, Created: time.Date(2023, time.October, 17, 12, 0, 0, 0, time.UTC), }, - { - Name: "costManagementUi", - Description: "Toggles the display of the cost management ui plugin", - Stage: FeatureStageExperimental, - FrontendOnly: false, - Owner: grafanaDatabasesFrontend, - Created: time.Date(2023, time.October, 17, 12, 0, 0, 0, time.UTC), - }, { Name: "managedPluginsInstall", Description: "Install managed plugins directly from plugins catalog", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 18ca371774a..523dfcf2ee1 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -125,7 +125,6 @@ awsDatasourcesNewFormStyling,experimental,@grafana/aws-datasources,2023-10-12,fa cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,2023-10-12,false,false,false,false panelTitleSearchInV1,experimental,@grafana/backend-platform,2023-10-13,true,false,false,false pluginsInstrumentationStatusSource,experimental,@grafana/plugins-platform-backend,2023-10-17,false,false,false,false -costManagementUi,experimental,@grafana/databases-frontend,2023-10-17,false,false,false,false managedPluginsInstall,experimental,@grafana/plugins-platform-backend,2023-10-18,false,false,false,false prometheusPromQAIL,experimental,@grafana/observability-metrics,2023-10-19,false,false,false,true addFieldFromCalculationStatFunctions,preview,@grafana/grafana-bi-squad,2023-11-03,false,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index d2f4a55b859..94121367c71 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -511,10 +511,6 @@ const ( // Include a status source label for plugin request metrics and logs FlagPluginsInstrumentationStatusSource = "pluginsInstrumentationStatusSource" - // FlagCostManagementUi - // Toggles the display of the cost management ui plugin - FlagCostManagementUi = "costManagementUi" - // FlagManagedPluginsInstall // Install managed plugins directly from plugins catalog FlagManagedPluginsInstall = "managedPluginsInstall" diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go index 8d0f372c691..bd8d191e0cf 100644 --- a/pkg/services/navtree/navtreeimpl/applinks.go +++ b/pkg/services/navtree/navtreeimpl/applinks.go @@ -329,17 +329,12 @@ func (s *ServiceImpl) readNavigationSettings() { "grafana-ml-app": {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"}, "grafana-cloud-link-app": {SectionID: navtree.NavIDCfg}, "grafana-costmanagementui-app": {SectionID: navtree.NavIDCfg, Text: "Cost management"}, + "grafana-adaptive-metrics-app": {SectionID: navtree.NavIDCfg, Text: "Adaptive Metrics"}, + "grafana-logvolumeexplorer-app": {SectionID: navtree.NavIDCfg, Text: "Log Volume Explorer"}, "grafana-easystart-app": {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightApps + 1, Text: "Connections", Icon: "adjust-circle"}, "k6-app": k6Cfg, } - if s.features.IsEnabledGlobally(featuremgmt.FlagCostManagementUi) { - // if cost management is enabled we want to nest adaptive metrics and log volume explorer under that plugin - // in the admin section - s.navigationAppConfig["grafana-adaptive-metrics-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg} - s.navigationAppConfig["grafana-logvolumeexplorer-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg} - } - s.navigationAppPathConfig = map[string]NavigationAppConfig{ "/a/grafana-auth-app": {SectionID: navtree.NavIDCfg, SortWeight: 7}, }