root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 169 Packages Projects Releases Wiki Activity

Include library elements on counts endpoint (#98246)

This commit is contained in:
Leonor Oliveira 2024-12-19 12:38:08 +01:00 committed by GitHub
parent 989ee681f8
commit c1e078b3a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/storage/unified/federated/stats.go
View File

@ -63,6 +63,12 @@ func (s *LegacyStatsGetter) GetStats(ctx context.Context, in *resource.ResourceS
if err != nil { if err != nil {
return err return err
} }
// Legacy library_elements table
err = fn("library_element", "org_id=? AND folder_uid=?", group, "library_elements")
if err != nil {
return err
}
return nil return nil
}) })

8
pkg/storage/unified/federated/stats_test.go
View File

@ -133,6 +133,10 @@ func TestDirectSQLStats(t *testing.T) {
"group": "sql-fallback", "group": "sql-fallback",
"resource": "folders", "resource": "folders",
"count": 1 "count": 1
},
{
"group": "sql-fallback",
"resource": "library_elements"
} }
]`, string(jj)) ]`, string(jj))
}) })
@ -161,6 +165,10 @@ func TestDirectSQLStats(t *testing.T) {
{ {
"group": "sql-fallback", "group": "sql-fallback",
"resource": "folders" "resource": "folders"
},
{
"group": "sql-fallback",
"resource": "library_elements"
} }
]`, string(jj)) ]`, string(jj))
}) })