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
This commit is contained in:
Adam Bannach 2024-01-08 08:25:11 -06:00 committed by GitHub
parent 21e9c01fc1
commit 505196bcd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 22 deletions

View File

@ -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. |

View File

@ -144,7 +144,6 @@ export interface FeatureToggles {
cachingOptimizeSerializationMemoryUsage?: boolean;
panelTitleSearchInV1?: boolean;
pluginsInstrumentationStatusSource?: boolean;
costManagementUi?: boolean;
managedPluginsInstall?: boolean;
prometheusPromQAIL?: boolean;
addFieldFromCalculationStatFunctions?: boolean;

View File

@ -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",

View File

@ -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

1 Name Stage Owner Created requiresDevMode RequiresLicense RequiresRestart FrontendOnly
125 cachingOptimizeSerializationMemoryUsage experimental @grafana/grafana-operator-experience-squad 2023-10-12 false false false false
126 panelTitleSearchInV1 experimental @grafana/backend-platform 2023-10-13 true false false false
127 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
128 managedPluginsInstall experimental @grafana/plugins-platform-backend 2023-10-18 false false false false
129 prometheusPromQAIL experimental @grafana/observability-metrics 2023-10-19 false false false true
130 addFieldFromCalculationStatFunctions preview @grafana/grafana-bi-squad 2023-11-03 false false false true

View File

@ -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"

View File

@ -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},
}