public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dashboards): add ttl based caching for datasources (#113999)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2025-11-17 09:48:17 +01:00
committed by GitHub
parent 64c61c6916
commit 9dd8c85448
3 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/pkg/migration/conversion/conversion.go
+5
View File
@@ -12,6 +12,11 @@ import (
)
func RegisterConversions(s *runtime.Scheme, dsIndexProvider schemaversion.DataSourceIndexProvider) error {
// Wrap the provider once with 10s caching for all conversions.
// This prevents repeated DB queries across multiple conversion calls while allowing
// the cache to refresh periodically, making it suitable for long-lived singleton usage.
dsIndexProvider = schemaversion.WrapIndexProviderWithCache(dsIndexProvider)
// v0 conversions
if err := s.AddConversionFunc((*dashv0.Dashboard)(nil), (*dashv1.Dashboard)(nil),
withConversionMetrics(dashv0.APIVERSION, dashv1.APIVERSION, func(a, b interface{}, scope conversion.Scope) error {
apps/dashboard/pkg/migration/conversion/v1beta1_to_v2alpha1.go
+3 -8
View File
@@ -85,21 +85,16 @@ func ConvertDashboard_V1beta1_to_V2alpha1(in *dashv1.Dashboard, out *dashv2alpha
out.APIVersion = dashv2alpha1.APIVERSION
out.Kind = in.Kind
// Wrap the provider to ensure Index() is called only once during this conversion.
// This prevents multiple DB queries and index builds when the provider is used in multiple places
// (e.g., getDefaultDatasourceType, getDatasourceTypeByUID, panel datasource conversions, etc.)
dsIndexProviderWrapped := schemaversion.WrapIndexProviderWithOnce(dsIndexProvider)
// Prepare context with namespace and service identity
// The datasource provider is passed as a parameter (captured in closure when conversions are registered)
ctx, _, err := prepareV1beta1ConversionContext(in, dsIndexProviderWrapped)
// The datasource provider is already wrapped with caching at registration time
ctx, _, err := prepareV1beta1ConversionContext(in, dsIndexProvider)
if err != nil {
// If context preparation fails, return error to be handled by wrapper
// The wrapper will set status and handle gracefully
return fmt.Errorf("failed to prepare conversion context: %w", err)
}
return convertDashboardSpec_V1beta1_to_V2alpha1(&in.Spec, &out.Spec, scope, ctx, dsIndexProviderWrapped)
return convertDashboardSpec_V1beta1_to_V2alpha1(&in.Spec, &out.Spec, scope, ctx, dsIndexProvider)
}
func convertDashboardSpec_V1beta1_to_V2alpha1(in *dashv1.DashboardSpec, out *dashv2alpha1.DashboardSpec, scope conversion.Scope, ctx context.Context, dsIndexProvider schemaversion.DataSourceIndexProvider) error {