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

feat(unified-storage): return guid, group and resource on read/list (#104121)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2025-04-17 12:58:58 +02:00
committed by GitHub
parent a02ff218df
commit 3380ea441a
34 changed files with 106 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/data/resource_history_get.sql
+3
View File
@@ -1,6 +1,9 @@
SELECT
{{ .Ident "guid" }},
{{ .Ident "resource_version" }},
{{ .Ident "namespace" }},
{{ .Ident "group" }},
{{ .Ident "resource" }},
{{ .Ident "name" }},
{{ .Ident "folder" }},
{{ .Ident "value" }}
pkg/storage/unified/sql/data/resource_history_list.sql
+6 -3
View File
@@ -1,10 +1,13 @@
SELECT
kv.{{ .Ident "guid" }},
kv.{{ .Ident "resource_version" }},
kv.{{ .Ident "namespace" }},
kv.{{ .Ident "group" }},
kv.{{ .Ident "resource" }},
kv.{{ .Ident "name" }},
kv.{{ .Ident "folder" }},
kv.{{ .Ident "value" }}
FROM {{ .Ident "resource_history" }} as kv
FROM {{ .Ident "resource_history" }} as kv
INNER JOIN (
SELECT {{ .Ident "namespace" }}, {{ .Ident "group" }}, {{ .Ident "resource" }}, {{ .Ident "name" }}, max({{ .Ident "resource_version" }}) AS {{ .Ident "resource_version" }}
FROM {{ .Ident "resource_history" }} AS mkv
@@ -24,7 +27,7 @@ SELECT
AND {{ .Ident "name" }} = {{ .Arg .Request.Options.Key.Name }}
{{ end }}
{{ end }}
GROUP BY mkv.{{ .Ident "namespace" }}, mkv.{{ .Ident "group" }}, mkv.{{ .Ident "resource" }}, mkv.{{ .Ident "name" }}
GROUP BY mkv.{{ .Ident "namespace" }}, mkv.{{ .Ident "group" }}, mkv.{{ .Ident "resource" }}, mkv.{{ .Ident "name" }}
) AS maxkv
ON
maxkv.{{ .Ident "resource_version" }} = kv.{{ .Ident "resource_version" }}
@@ -32,7 +35,7 @@ SELECT
AND maxkv.{{ .Ident "group" }} = kv.{{ .Ident "group" }}
AND maxkv.{{ .Ident "resource" }} = kv.{{ .Ident "resource" }}
AND maxkv.{{ .Ident "name" }} = kv.{{ .Ident "name" }}
WHERE kv.{{ .Ident "action" }} != 3
WHERE kv.{{ .Ident "action" }} != 3
{{ if and .Request.Options .Request.Options.Key }}
{{ if .Request.Options.Key.Namespace }}
AND kv.{{ .Ident "namespace" }} = {{ .Arg .Request.Options.Key.Namespace }}
pkg/storage/unified/sql/data/resource_history_poll.sql
+1
View File
@@ -1,4 +1,5 @@
SELECT
{{ .Ident "guid" | .Into .Response.GUID }},
{{ .Ident "resource_version" | .Into .Response.ResourceVersion }},
{{ .Ident "namespace" | .Into .Response.Key.Namespace }},
{{ .Ident "group" | .Into .Response.Key.Group }},
pkg/storage/unified/sql/data/resource_history_read.sql
+1
View File
@@ -1,4 +1,5 @@
SELECT
{{ .Ident "guid" | .Into .Response.GUID }},
{{ .Ident "namespace" | .Into .Response.Key.Namespace }},
{{ .Ident "group" | .Into .Response.Key.Group }},
{{ .Ident "resource" | .Into .Response.Key.Resource }},
pkg/storage/unified/sql/data/resource_list.sql
+3
View File
@@ -1,6 +1,9 @@
SELECT
{{ .Ident "guid" }},
{{ .Ident "resource_version" }},
{{ .Ident "namespace" }},
{{ .Ident "group" }},
{{ .Ident "resource" }},
{{ .Ident "name" }},
{{ .Ident "folder" }},
{{ .Ident "value" }}
pkg/storage/unified/sql/data/resource_read.sql
+1
View File
@@ -1,4 +1,5 @@
SELECT
{{ .Ident "guid" | .Into .Response.GUID }},
{{ .Ident "namespace" | .Into .Response.Key.Namespace }},
{{ .Ident "group" | .Into .Response.Key.Group }},
{{ .Ident "resource" | .Into .Response.Key.Resource }},