From caa95b2d9585c9969d6e8d075171a28e05cce217 Mon Sep 17 00:00:00 2001 From: Kristina Durivage Date: Wed, 10 Dec 2025 19:50:03 -0600 Subject: [PATCH] cleanup --- .../clients/rtkq/correlations/v0alpha1/index.ts | 1 - .../features/correlations/useCorrelationsK8s.ts | 13 ------------- scripts/grafana-server/custom.ini | 14 -------------- 3 files changed, 28 deletions(-) diff --git a/packages/grafana-api-clients/src/clients/rtkq/correlations/v0alpha1/index.ts b/packages/grafana-api-clients/src/clients/rtkq/correlations/v0alpha1/index.ts index b5b3b944bd6..d7922f7f8b0 100644 --- a/packages/grafana-api-clients/src/clients/rtkq/correlations/v0alpha1/index.ts +++ b/packages/grafana-api-clients/src/clients/rtkq/correlations/v0alpha1/index.ts @@ -22,6 +22,5 @@ export const generatedAPI = rawAPI.enhanceEndpoints({ return originalQuery(requestOptions); }; }, - // todo - do i add data massaging to list correlations here?? }, }); diff --git a/public/app/features/correlations/useCorrelationsK8s.ts b/public/app/features/correlations/useCorrelationsK8s.ts index 308401a56a5..7b354af06e1 100644 --- a/public/app/features/correlations/useCorrelationsK8s.ts +++ b/public/app/features/correlations/useCorrelationsK8s.ts @@ -6,19 +6,6 @@ import { CorrelationData, CorrelationExternal, CorrelationQuery } from '@grafana import { toEnrichedCorrelationData } from './useCorrelations'; -/* -the various todos in this function relate to some changes that were required for correlations to be added to app platform -we now must resolve those changes with the way correlations currently functions -the main one is around the various source/target references - current this just refers to datasources by UID, but I was -required to do a group/name combination - how do I resolve this? - -secondly, I was required to remove the provisioned flag. This provisioned flag locks the correlations record and makes it readonly -so people don't make edits that will be overwritten by provisioned correlations. Maybe this isn't relevant for app platform and hardcoding it to false is fine. - -With transformations, I just didn't convert because they should be straightforward, that can be ignored for now and I'll work on it - -also, maybe this should be closer to the app platform code, like in the client code? any other best practices? -*/ export const toEnrichedCorrelationDataK8s = (item: CorrelationK8s): CorrelationData | undefined => { if (item.metadata.name !== undefined) { const baseCor = { diff --git a/scripts/grafana-server/custom.ini b/scripts/grafana-server/custom.ini index 40b884190be..5ab4797bb48 100644 --- a/scripts/grafana-server/custom.ini +++ b/scripts/grafana-server/custom.ini @@ -42,17 +42,3 @@ developer_mode = true ; Enable developer mode to use in-memory implementations o [secrets_manager] run_secrets_db_migrations = true run_data_key_migration = true - -[grafana-apiserver] -; use unified storage for k8s apiserver -storage_type = unified - -# Dualwriter modes -# 0: disabled (default mode) -# 1: read from legacy, write to legacy, write to unified best-effort -# 2: read from legacy, write to both -# 3: read from unified, write to both -# 4: read from unified, write to unified -# 5: read from unified, write to unified, ignore background sync state -[unified_storage.correlations.correlation.grafana.app] -dualWriterMode = 5