From c47fc53eee76f93e58d64be11e234e202d92234b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20Sencer=20=C3=96zcan?= <32759850+mustafasencer@users.noreply.github.com> Date: Thu, 26 Jun 2025 18:08:30 +0200 Subject: [PATCH] fix: set withHistory flag to true for non-interactive mode (#107263) --- .../datamigrations/to_unified_storage.go | 1 + .../dashboard/legacy/query_dashboards.sql | 53 ++++++++++++------- .../mysql--query_dashboards-dashboard.sql | 25 ++++++--- ...--query_dashboards-dashboard_next_page.sql | 27 ++++++---- ...--query_dashboards-export_with_history.sql | 23 +++++--- .../mysql--query_dashboards-folders.sql | 25 ++++++--- .../mysql--query_dashboards-history_uid.sql | 27 ++++++---- ...uery_dashboards-history_uid_at_version.sql | 23 +++++--- ...ery_dashboards-history_uid_second_page.sql | 27 ++++++---- .../postgres--query_dashboards-dashboard.sql | 25 ++++++--- ...--query_dashboards-dashboard_next_page.sql | 27 ++++++---- ...--query_dashboards-export_with_history.sql | 23 +++++--- .../postgres--query_dashboards-folders.sql | 25 ++++++--- ...postgres--query_dashboards-history_uid.sql | 27 ++++++---- ...uery_dashboards-history_uid_at_version.sql | 23 +++++--- ...ery_dashboards-history_uid_second_page.sql | 27 ++++++---- .../sqlite--query_dashboards-dashboard.sql | 25 ++++++--- ...--query_dashboards-dashboard_next_page.sql | 27 ++++++---- ...--query_dashboards-export_with_history.sql | 23 +++++--- .../sqlite--query_dashboards-folders.sql | 25 ++++++--- .../sqlite--query_dashboards-history_uid.sql | 27 ++++++---- ...uery_dashboards-history_uid_at_version.sql | 23 +++++--- ...ery_dashboards-history_uid_second_page.sql | 27 ++++++---- 23 files changed, 394 insertions(+), 191 deletions(-) diff --git a/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go b/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go index b499b2a8ec9..8b4176e9e09 100644 --- a/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go +++ b/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go @@ -85,6 +85,7 @@ func ToUnifiedStorage(c utils.CommandLine, cfg *setting.Cfg, sqlStore db.DB) err if c.Bool("non-interactive") { opts.Store = client opts.BlobStore = client + opts.WithHistory = true // always include history in non-interactive mode rsp, err := migrator.Migrate(ctx, opts) if exitErr := handleMigrationError(err, rsp); exitErr != nil { return exitErr diff --git a/pkg/registry/apis/dashboard/legacy/query_dashboards.sql b/pkg/registry/apis/dashboard/legacy/query_dashboards.sql index cd58e2d2571..d328be4e805 100644 --- a/pkg/registry/apis/dashboard/legacy/query_dashboards.sql +++ b/pkg/registry/apis/dashboard/legacy/query_dashboards.sql @@ -1,20 +1,33 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, {{ if .Query.UseHistoryTable }} - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version {{ else }} - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version {{ end }} FROM {{ .Ident .DashboardTable }} as dashboard {{ if .Query.UseHistoryTable }} @@ -39,15 +52,15 @@ WHERE dashboard.is_folder = {{ .Arg .Query.GetFolders }} dashboard_version.version {{ .Query.Order }}, dashboard.uid ASC {{ else }} - {{ if .Query.UID }} - AND dashboard.uid = {{ .Arg .Query.UID }} - {{ else if .Query.LastID }} - AND dashboard.id < {{ .Arg .Query.LastID }} - {{ end }} - {{ if .Query.GetTrash }} - AND dashboard.deleted IS NOT NULL - {{ else }} - AND dashboard.deleted IS NULL - {{ end }} + {{ if .Query.UID }} + AND dashboard.uid = {{ .Arg .Query.UID }} + {{ else if .Query.LastID }} + AND dashboard.id < {{ .Arg .Query.LastID }} + {{ end }} + {{ if .Query.GetTrash }} + AND dashboard.deleted IS NOT NULL + {{ else }} + AND dashboard.deleted IS NULL + {{ end }} ORDER BY dashboard.id DESC {{ end }} diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard.sql index 315c1cc7575..e3a945a53db 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard.sql @@ -1,20 +1,29 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.deleted IS NULL + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard_next_page.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard_next_page.sql index 19df9969f9e..862725168b0 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard_next_page.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard_next_page.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.id < 22 - AND dashboard.deleted IS NULL + AND dashboard.id < 22 + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-export_with_history.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-export_with_history.sql index 4a4d51f8763..e425f56c9c7 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-export_with_history.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-export_with_history.sql @@ -1,15 +1,24 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_version` as dashboard_version ON dashboard.id = dashboard_version.dashboard_id LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-folders.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-folders.sql index 8662d13cf60..5935eb3422c 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-folders.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-folders.sql @@ -1,20 +1,29 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = TRUE AND dashboard.org_id = 2 - AND dashboard.deleted IS NULL + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid.sql index cac5d5286dd..ec0a40a5934 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.uid = 'UUU' - AND dashboard.deleted IS NULL + AND dashboard.uid = 'UUU' + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_at_version.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_at_version.sql index f5ee5592cae..e0c9df4fae1 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_at_version.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_at_version.sql @@ -1,15 +1,24 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_version` as dashboard_version ON dashboard.id = dashboard_version.dashboard_id LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_second_page.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_second_page.sql index cac5d5286dd..ec0a40a5934 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_second_page.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_second_page.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM `grafana`.`dashboard` as dashboard LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.uid = 'UUU' - AND dashboard.deleted IS NULL + AND dashboard.uid = 'UUU' + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard.sql index 18a8bff7b36..552a486f8cd 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard.sql @@ -1,20 +1,29 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.deleted IS NULL + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard_next_page.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard_next_page.sql index eb545ec677d..fb09d57d08d 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard_next_page.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard_next_page.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.id < 22 - AND dashboard.deleted IS NULL + AND dashboard.id < 22 + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-export_with_history.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-export_with_history.sql index a6de5980952..16ddeda410f 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-export_with_history.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-export_with_history.sql @@ -1,15 +1,24 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-folders.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-folders.sql index 0b0ffffc00b..b994d617708 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-folders.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-folders.sql @@ -1,20 +1,29 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = TRUE AND dashboard.org_id = 2 - AND dashboard.deleted IS NULL + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid.sql index a6b8ed5b40a..9bcbb168149 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.uid = 'UUU' - AND dashboard.deleted IS NULL + AND dashboard.uid = 'UUU' + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_at_version.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_at_version.sql index a4be51a0737..07702d215a4 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_at_version.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_at_version.sql @@ -1,15 +1,24 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_second_page.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_second_page.sql index a6b8ed5b40a..9bcbb168149 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_second_page.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_second_page.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.uid = 'UUU' - AND dashboard.deleted IS NULL + AND dashboard.uid = 'UUU' + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard.sql index 18a8bff7b36..552a486f8cd 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard.sql @@ -1,20 +1,29 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.deleted IS NULL + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard_next_page.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard_next_page.sql index eb545ec677d..fb09d57d08d 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard_next_page.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard_next_page.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.id < 22 - AND dashboard.deleted IS NULL + AND dashboard.id < 22 + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-export_with_history.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-export_with_history.sql index a6de5980952..16ddeda410f 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-export_with_history.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-export_with_history.sql @@ -1,15 +1,24 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-folders.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-folders.sql index 0b0ffffc00b..b994d617708 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-folders.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-folders.sql @@ -1,20 +1,29 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = TRUE AND dashboard.org_id = 2 - AND dashboard.deleted IS NULL + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid.sql index a6b8ed5b40a..9bcbb168149 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.uid = 'UUU' - AND dashboard.deleted IS NULL + AND dashboard.uid = 'UUU' + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_at_version.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_at_version.sql index a4be51a0737..07702d215a4 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_at_version.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_at_version.sql @@ -1,15 +1,24 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id, - dashboard_version.version, dashboard_version.message, - dashboard_version.data, dashboard_version.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard_version.created, + updated_user.uid as updated_by, + updated_user.id as created_by_id, + dashboard_version.version, + dashboard_version.message, + dashboard_version.data, + dashboard_version.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_second_page.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_second_page.sql index a6b8ed5b40a..9bcbb168149 100755 --- a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_second_page.sql +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_second_page.sql @@ -1,21 +1,30 @@ SELECT - dashboard.org_id, dashboard.id, - dashboard.uid, dashboard.folder_uid, - dashboard.deleted, plugin_id, + dashboard.org_id, + dashboard.id, + dashboard.uid, + dashboard.folder_uid, + dashboard.deleted, + plugin_id, provisioning.name as repo_name, provisioning.external_id as repo_path, provisioning.check_sum as repo_hash, provisioning.updated as repo_ts, - dashboard.created, created_user.uid as created_by, dashboard.created_by as created_by_id, - dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by as updated_by_id, - dashboard.version, '' as message, - dashboard.data, dashboard.api_version + dashboard.created, + created_user.uid as created_by, + dashboard.created_by as created_by_id, + dashboard.updated, + updated_user.uid as updated_by, + dashboard.updated_by as updated_by_id, + dashboard.version, + '' as message, + dashboard.data, + dashboard.api_version FROM "grafana"."dashboard" as dashboard LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id WHERE dashboard.is_folder = FALSE AND dashboard.org_id = 2 - AND dashboard.uid = 'UUU' - AND dashboard.deleted IS NULL + AND dashboard.uid = 'UUU' + AND dashboard.deleted IS NULL ORDER BY dashboard.id DESC