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

fix(querier): use most specific timerange available (#90540)

Browse Source 
* fix(querier): use most specific timerange available

* return zero values
This commit is contained in:
Jean-Philippe Quéméner
2024-07-17 20:22:45 +04:00
committed by GitHub
parent 9b7e9d992b
commit 283280f329
2 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/query/parser_test.go
+53 -2
View File
@@ -45,7 +45,7 @@ func TestQuerySplitting(t *testing.T) {
require.Empty(t, split.Requests)
})
t.Run("applies default time range", func(t *testing.T) {
t.Run("applies zero time range if time range is missing", func(t *testing.T) {
split, err := parser.parseRequest(ctx, &query.QueryDataRequest{
QueryDataRequest: data.QueryDataRequest{
TimeRange: data.TimeRange{}, // missing
@@ -62,10 +62,61 @@ func TestQuerySplitting(t *testing.T) {
})
require.NoError(t, err)
require.Len(t, split.Requests, 1)
require.Equal(t, "now-6h", split.Requests[0].Request.From)
require.Equal(t, "0", split.Requests[0].Request.From)
require.Equal(t, "0", split.Requests[0].Request.To)
})
t.Run("applies query time range if present", func(t *testing.T) {
split, err := parser.parseRequest(ctx, &query.QueryDataRequest{
QueryDataRequest: data.QueryDataRequest{
TimeRange: data.TimeRange{}, // missing
Queries: []data.DataQuery{{
CommonQueryProperties: data.CommonQueryProperties{
RefID: "A",
Datasource: &data.DataSourceRef{
Type: "x",
UID: "abc",
},
TimeRange: &data.TimeRange{
From: "now-1d",
To: "now",
},
},
}},
},
})
require.NoError(t, err)
require.Len(t, split.Requests, 1)
require.Equal(t, "now-1d", split.Requests[0].Request.From)
require.Equal(t, "now", split.Requests[0].Request.To)
})
t.Run("applies query time range if all time ranges are present", func(t *testing.T) {
split, err := parser.parseRequest(ctx, &query.QueryDataRequest{
QueryDataRequest: data.QueryDataRequest{
TimeRange: data.TimeRange{
From: "now-1h",
To: "now",
},
Queries: []data.DataQuery{{
CommonQueryProperties: data.CommonQueryProperties{
RefID: "A",
Datasource: &data.DataSourceRef{
Type: "x",
UID: "abc",
},
TimeRange: &data.TimeRange{
From: "now-1d",
To: "now",
},
},
}},
},
})
require.NoError(t, err)
require.Len(t, split.Requests, 1)
require.Equal(t, "now-1d", split.Requests[0].Request.From)
require.Equal(t, "now", split.Requests[0].Request.To)
})
t.Run("verify tests", func(t *testing.T) {
files, err := os.ReadDir("testdata")
require.NoError(t, err)