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

Storage/SQL: Support more filter by namespace/group/resource (#99249)

Browse Source
This commit is contained in:
Ryan McKinley
2025-01-21 12:15:08 +03:00
committed by GitHub
parent 680e6bc1f8
commit d91d729749
28 changed files with 150 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/data/resource_delete.sql
+7 -5
View File
@@ -1,7 +1,9 @@
DELETE FROM {{ .Ident "resource" }}
WHERE 1 = 1
AND {{ .Ident "namespace" }} = {{ .Arg .WriteEvent.Key.Namespace }}
AND {{ .Ident "group" }} = {{ .Arg .WriteEvent.Key.Group }}
AND {{ .Ident "resource" }} = {{ .Arg .WriteEvent.Key.Resource }}
AND {{ .Ident "name" }} = {{ .Arg .WriteEvent.Key.Name }}
WHERE 1 = 1
AND {{ .Ident "namespace" }} = {{ .Arg .WriteEvent.Key.Namespace }}
AND {{ .Ident "group" }} = {{ .Arg .WriteEvent.Key.Group }}
AND {{ .Ident "resource" }} = {{ .Arg .WriteEvent.Key.Resource }}
{{ if .WriteEvent.Key.Name }}
AND {{ .Ident "name" }} = {{ .Arg .WriteEvent.Key.Name }}
{{ end }}
;
pkg/storage/unified/sql/data/resource_history_delete.sql
+9 -1
View File
@@ -1,4 +1,12 @@
DELETE FROM {{ .Ident "resource_history" }}
WHERE 1 = 1
WHERE {{ .Ident "namespace" }} = {{ .Arg .Namespace }}
{{ if .GUID }}
AND {{ .Ident "guid" }} = {{ .Arg .GUID }}
{{ end }}
{{ if .Group }}
AND {{ .Ident "group" }} = {{ .Arg .Group }}
{{ end }}
{{ if .Resource }}
AND {{ .Ident "resource" }} = {{ .Arg .Resource }}
{{ end }}
pkg/storage/unified/sql/data/resource_history_insert.sql
+6 -2
View File
@@ -6,7 +6,9 @@ INSERT INTO {{ .Ident "resource_history" }}
{{ .Ident "namespace" }},
{{ .Ident "name" }},
{{ .Ident "folder" }},
{{ if gt .ResourceVersion 0 }}
{{ .Ident "resource_version" }},
{{ end }}
{{ .Ident "previous_resource_version"}},
{{ .Ident "value" }},
{{ .Ident "action" }}
@@ -19,7 +21,9 @@ INSERT INTO {{ .Ident "resource_history" }}
{{ .Arg .WriteEvent.Key.Namespace }},
{{ .Arg .WriteEvent.Key.Name }},
{{ .Arg .Folder }},
{{ if gt .ResourceVersion 0 }}
{{ .Arg .ResourceVersion }},
{{ end }}
{{ .Arg .WriteEvent.PreviousRV }},
{{ .Arg .WriteEvent.Value }},
{{ .Arg .WriteEvent.Type }}
pkg/storage/unified/sql/data/resource_stats.sql
+6
View File
@@ -9,6 +9,12 @@ WHERE 1 = 1
{{ if .Namespace }}
AND {{ .Ident "namespace" }} = {{ .Arg .Namespace }}
{{ end}}
{{ if .Group }}
AND {{ .Ident "group" }} = {{ .Arg .Group }}
{{ end}}
{{ if .Resource }}
AND {{ .Ident "resource" }} = {{ .Arg .Resource }}
{{ end}}
{{ if .Folder }}
AND {{ .Ident "folder" }} = {{ .Arg .Folder }}
{{ end}}
pkg/storage/unified/sql/migrations.go
+1
View File
@@ -119,6 +119,7 @@ func (b *backend) runStartupDataMigrations(ctx context.Context) error {
_, err = dbutil.Exec(ctx, tx, sqlResourceHistoryDelete, &sqlResourceHistoryDeleteRequest{
SQLTemplate: sqltemplate.New(b.dialect),
GUID: req.GUID,
Namespace: item.Marker.GetNamespace(),
})
if err != nil {
return err
pkg/storage/unified/sql/queries.go
+21 -2
View File
@@ -78,6 +78,9 @@ type sqlResourceRequest struct {
GUID string
WriteEvent resource.WriteEvent
Folder string
// Useful when batch writing
ResourceVersion int64
}
func (r sqlResourceRequest) Validate() error {
@@ -87,6 +90,8 @@ func (r sqlResourceRequest) Validate() error {
type sqlStatsRequest struct {
sqltemplate.SQLTemplate
Namespace string
Group string
Resource string
Folder string
MinCount int
}
@@ -206,11 +211,25 @@ func (r sqlResourceHistoryListRequest) Results() (*resource.ResourceWrapper, err
type sqlResourceHistoryDeleteRequest struct {
sqltemplate.SQLTemplate
GUID string
// TODO, add other constraints
Namespace string
Group string
Resource string
}
func (r *sqlResourceHistoryDeleteRequest) Validate() error {
return nil // TODO
if r.Namespace == "" {
return fmt.Errorf("missing namespace")
}
if r.GUID == "" {
if r.Group == "" {
return fmt.Errorf("missing group")
}
if r.Resource == "" {
return fmt.Errorf("missing resource")
}
}
return nil
}
type sqlGetHistoryRequest struct {
pkg/storage/unified/sql/queries_test.go
+22 -3
View File
@@ -284,14 +284,14 @@ func TestUnifiedStorageQueries(t *testing.T) {
sqlResourceStats: {
{
Name: "query",
Name: "global",
Data: &sqlStatsRequest{
SQLTemplate: mocks.NewTestingSQLTemplate(),
MinCount: 10, // Not yet used in query (only response filter)
},
},
{
Name: "query-namespace",
Name: "namespace",
Data: &sqlStatsRequest{
SQLTemplate: mocks.NewTestingSQLTemplate(),
Namespace: "default",
@@ -299,7 +299,7 @@ func TestUnifiedStorageQueries(t *testing.T) {
},
},
{
Name: "query-folder",
Name: "folder",
Data: &sqlStatsRequest{
SQLTemplate: mocks.NewTestingSQLTemplate(),
Namespace: "default",
@@ -307,6 +307,15 @@ func TestUnifiedStorageQueries(t *testing.T) {
MinCount: 10, // Not yet used in query (only response filter)
},
},
{
Name: "resource",
Data: &sqlStatsRequest{
SQLTemplate: mocks.NewTestingSQLTemplate(),
Namespace: "default",
Group: "dashboard.grafana.app",
Resource: "dashboards",
},
},
},
sqlResourceBlobInsert: {
{
@@ -363,6 +372,16 @@ func TestUnifiedStorageQueries(t *testing.T) {
Data: &sqlResourceHistoryDeleteRequest{
SQLTemplate: mocks.NewTestingSQLTemplate(),
GUID: `xxxx`,
Namespace: "ns",
},
},
{
Name: "wipe",
Data: &sqlResourceHistoryDeleteRequest{
SQLTemplate: mocks.NewTestingSQLTemplate(),
Namespace: "ns",
Group: "ggg",
Resource: "rrr",
},
},
},
pkg/storage/unified/sql/testdata/mysql--resource_delete-simple.sql
Vendored
+5 -5
View File
@@ -1,7 +1,7 @@
DELETE FROM `resource`
WHERE 1 = 1
AND `namespace` = 'nn'
AND `group` = 'gg'
AND `resource` = 'rr'
AND `name` = 'name'
WHERE 1 = 1
AND `namespace` = 'nn'
AND `group` = 'gg'
AND `resource` = 'rr'
AND `name` = 'name'
;
pkg/storage/unified/sql/testdata/mysql--resource_history_delete-guid.sql
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
DELETE FROM `resource_history`
WHERE 1 = 1
WHERE `namespace` = 'ns'
AND `guid` = 'xxxx'
pkg/storage/unified/sql/testdata/mysql--resource_history_delete-wipe.sql
Vendored Executable
+4
View File
@@ -0,0 +1,4 @@
DELETE FROM `resource_history`
WHERE `namespace` = 'ns'
AND `group` = 'ggg'
AND `resource` = 'rrr'
pkg/storage/unified/sql/testdata/mysql--resource_stats-query-folder.sql → pkg/storage/unified/sql/testdata/mysql--resource_stats-folder.sql
Vendored
View File
pkg/storage/unified/sql/testdata/mysql--resource_stats-query.sql → pkg/storage/unified/sql/testdata/mysql--resource_stats-global.sql
Vendored
View File
pkg/storage/unified/sql/testdata/mysql--resource_stats-query-namespace.sql → pkg/storage/unified/sql/testdata/mysql--resource_stats-namespace.sql
Vendored
View File
pkg/storage/unified/sql/testdata/mysql--resource_stats-resource.sql
Vendored Executable
+16
View File
@@ -0,0 +1,16 @@
SELECT
`namespace`,
`group`,
`resource`,
COUNT(*),
MAX(`resource_version`)
FROM `resource`
WHERE 1 = 1
AND `namespace` = 'default'
AND `group` = 'dashboard.grafana.app'
AND `resource` = 'dashboards'
GROUP BY
`namespace`,
`group`,
`resource`
;
pkg/storage/unified/sql/testdata/postgres--resource_delete-simple.sql
Vendored
+5 -5
View File
@@ -1,7 +1,7 @@
DELETE FROM "resource"
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "name" = 'name'
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "name" = 'name'
;
pkg/storage/unified/sql/testdata/postgres--resource_history_delete-guid.sql
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
DELETE FROM "resource_history"
WHERE 1 = 1
WHERE "namespace" = 'ns'
AND "guid" = 'xxxx'
pkg/storage/unified/sql/testdata/postgres--resource_history_delete-wipe.sql
Vendored Executable
+4
View File
@@ -0,0 +1,4 @@
DELETE FROM "resource_history"
WHERE "namespace" = 'ns'
AND "group" = 'ggg'
AND "resource" = 'rrr'
pkg/storage/unified/sql/testdata/postgres--resource_stats-query-folder.sql → pkg/storage/unified/sql/testdata/postgres--resource_stats-folder.sql
Vendored
View File
pkg/storage/unified/sql/testdata/postgres--resource_stats-query.sql → pkg/storage/unified/sql/testdata/postgres--resource_stats-global.sql
Vendored
View File
pkg/storage/unified/sql/testdata/postgres--resource_stats-query-namespace.sql → pkg/storage/unified/sql/testdata/postgres--resource_stats-namespace.sql
Vendored
View File
pkg/storage/unified/sql/testdata/postgres--resource_stats-resource.sql
Vendored Executable
+16
View File
@@ -0,0 +1,16 @@
SELECT
"namespace",
"group",
"resource",
COUNT(*),
MAX("resource_version")
FROM "resource"
WHERE 1 = 1
AND "namespace" = 'default'
AND "group" = 'dashboard.grafana.app'
AND "resource" = 'dashboards'
GROUP BY
"namespace",
"group",
"resource"
;
pkg/storage/unified/sql/testdata/sqlite--resource_delete-simple.sql
Vendored
+5 -5
View File
@@ -1,7 +1,7 @@
DELETE FROM "resource"
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "name" = 'name'
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "name" = 'name'
;
pkg/storage/unified/sql/testdata/sqlite--resource_history_delete-guid.sql
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
DELETE FROM "resource_history"
WHERE 1 = 1
WHERE "namespace" = 'ns'
AND "guid" = 'xxxx'
pkg/storage/unified/sql/testdata/sqlite--resource_history_delete-wipe.sql
Vendored Executable
+4
View File
@@ -0,0 +1,4 @@
DELETE FROM "resource_history"
WHERE "namespace" = 'ns'
AND "group" = 'ggg'
AND "resource" = 'rrr'
pkg/storage/unified/sql/testdata/sqlite--resource_stats-query-folder.sql → pkg/storage/unified/sql/testdata/sqlite--resource_stats-folder.sql
Vendored
View File
pkg/storage/unified/sql/testdata/sqlite--resource_stats-query.sql → pkg/storage/unified/sql/testdata/sqlite--resource_stats-global.sql
Vendored
View File
pkg/storage/unified/sql/testdata/sqlite--resource_stats-query-namespace.sql → pkg/storage/unified/sql/testdata/sqlite--resource_stats-namespace.sql
Vendored
View File
pkg/storage/unified/sql/testdata/sqlite--resource_stats-resource.sql
Vendored Executable
+16
View File
@@ -0,0 +1,16 @@
SELECT
"namespace",
"group",
"resource",
COUNT(*),
MAX("resource_version")
FROM "resource"
WHERE 1 = 1
AND "namespace" = 'default'
AND "group" = 'dashboard.grafana.app'
AND "resource" = 'dashboards'
GROUP BY
"namespace",
"group",
"resource"
;