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

fix: handle dashboards without version entries in unified storage migration (#108139)

Browse Source 
* fix: handle dashboards without version entries in migration

Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com>

* fix: adds AllowFallback flag to enable COALESCE logic explicitly during migrations

Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com>

* fix: update dependencies

Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com>

* fix: maintain original behavior when not using AllowFallback option

Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com>

---------

Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com>
This commit is contained in:
Bruno Abrantes
2025-07-21 15:32:24 +02:00
committed by GitHub
parent 73c09efd03
commit be79eb0ace
18 changed files with 386 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/dashboard/legacy/query_dashboards.sql
+22 -3
View File
@@ -13,14 +13,24 @@ SELECT
created_user.uid as created_by,
dashboard.created_by as created_by_id,
{{ if .Query.UseHistoryTable }}
dashboard_version.created,
{{ if and .Query.GetHistory (not .Query.AllowFallback) }}
dashboard_version.created as updated,
updated_user.uid as updated_by,
updated_user.id as created_by_id,
dashboard_version.created_by as updated_by_id,
dashboard_version.version,
dashboard_version.message,
dashboard_version.data,
dashboard_version.api_version
{{ else }}
COALESCE(dashboard_version.created, dashboard.updated) as updated,
updated_user.uid as updated_by,
COALESCE(dashboard_version.created_by, dashboard.updated_by) as updated_by_id,
COALESCE(dashboard_version.version, dashboard.version) as version,
COALESCE(dashboard_version.message, '') as message,
COALESCE(dashboard_version.data, dashboard.data) as data,
COALESCE(dashboard_version.api_version, dashboard.api_version) as api_version
{{ end }}
{{ else }}
dashboard.updated,
updated_user.uid as updated_by,
dashboard.updated_by as updated_by_id,
@@ -35,7 +45,7 @@ LEFT OUTER JOIN {{ .Ident .VersionTable }} as dashboard_version ON dashboard.id
{{ end }}
LEFT OUTER JOIN {{ .Ident .ProvisioningTable }} as provisioning ON dashboard.id = provisioning.dashboard_id
LEFT OUTER JOIN {{ .Ident .UserTable }} as created_user ON dashboard.created_by = created_user.id
LEFT OUTER JOIN {{ .Ident .UserTable }} as updated_user ON {{ if .Query.UseHistoryTable }}dashboard_version.created_by = updated_user.id{{ else }}dashboard.updated_by = updated_user.id{{ end }}
LEFT OUTER JOIN {{ .Ident .UserTable }} as updated_user ON {{ if .Query.UseHistoryTable }}{{ if and .Query.GetHistory (not .Query.AllowFallback) }}dashboard_version.created_by = updated_user.id{{ else }}COALESCE(dashboard_version.created_by, dashboard.updated_by) = updated_user.id{{ end }}{{ else }}dashboard.updated_by = updated_user.id{{ end }}
WHERE dashboard.is_folder = {{ .Arg .Query.GetFolders }}
AND dashboard.org_id = {{ .Arg .Query.OrgID }}
{{ if .Query.UseHistoryTable }}
@@ -45,11 +55,20 @@ WHERE dashboard.is_folder = {{ .Arg .Query.GetFolders }}
{{ if .Query.Version }}
AND dashboard_version.version = {{ .Arg .Query.Version }}
{{ else if .Query.LastID }}
{{ if and .Query.GetHistory (not .Query.AllowFallback) }}
AND dashboard_version.version < {{ .Arg .Query.LastID }}
{{ else }}
AND COALESCE(dashboard_version.version, dashboard.version) < {{ .Arg .Query.LastID }}
{{ end }}
{{ end }}
ORDER BY
{{ if and .Query.GetHistory (not .Query.AllowFallback) }}
dashboard_version.created {{ .Query.Order }},
dashboard_version.version {{ .Query.Order }},
{{ else }}
COALESCE(dashboard_version.created, dashboard.updated) {{ .Query.Order }},
COALESCE(dashboard_version.version, dashboard.version) {{ .Query.Order }},
{{ end }}
dashboard.uid ASC
{{ else }}
{{ if .Query.UID }}