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

Annotations: Fix composite store read (#94158)

Browse Source 
* Annotations: Fix composite store read

* Add test

* check error
This commit is contained in:
Alexander Zobnin
2024-10-03 09:14:06 +02:00
committed by GitHub
parent 4c4f7a3331
commit bd1741653d
10 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/annotations/annotationsimpl/loki/historian_store.go
+3 -3
View File
@@ -80,7 +80,7 @@ func (r *LokiHistorianStore) Type() string {
return "loki"
}
func (r *LokiHistorianStore) Get(ctx context.Context, query *annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
func (r *LokiHistorianStore) Get(ctx context.Context, query annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
if query.Type == "annotation" {
return make([]*annotations.ItemDTO, 0), nil
}
@@ -104,7 +104,7 @@ func (r *LokiHistorianStore) Get(ctx context.Context, query *annotations.ItemQue
}
// No folders in the filter because it filter by Dashboard UID, and the request is already authorized.
logQL, err := historian.BuildLogQuery(buildHistoryQuery(query, accessResources.Dashboards, rule.UID), nil, r.client.MaxQuerySize())
logQL, err := historian.BuildLogQuery(buildHistoryQuery(&query, accessResources.Dashboards, rule.UID), nil, r.client.MaxQuerySize())
if err != nil {
grafanaErr := errutil.Error{}
if errors.As(err, &grafanaErr) {
@@ -192,7 +192,7 @@ func (r *LokiHistorianStore) annotationsFromStream(stream historian.Stream, ac a
return items
}
func (r *LokiHistorianStore) GetTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error) {
func (r *LokiHistorianStore) GetTags(ctx context.Context, query annotations.TagsQuery) (annotations.FindTagsResult, error) {
return annotations.FindTagsResult{Tags: []*annotations.TagsDTO{}}, nil
}
pkg/services/annotations/annotationsimpl/loki/historian_store_test.go
+8 -8
View File
@@ -96,7 +96,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -126,7 +126,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
_, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -151,7 +151,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -175,7 +175,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -201,7 +201,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -231,7 +231,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -260,7 +260,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,
@@ -294,7 +294,7 @@ func TestIntegrationAlertStateHistoryStore(t *testing.T) {
}
res, err := store.Get(
context.Background(),
&query,
query,
&annotation_ac.AccessResources{
Dashboards: map[string]int64{
dashboard1.UID: dashboard1.ID,