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

IntervalV2: Use maxDataPoints to calculate correct interval (#39036)

Browse Source 
* Use max data points to calculate interval

* Fix mockCalculator to mach Calculator

* Fix incorrect merge, replace queryModel with query
This commit is contained in:
Ivana Huckova
2021-09-13 14:58:32 +02:00
committed by GitHub
parent b97e2da2bf
commit f172701043
8 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/sqleng/sql_engine.go
+1 -1
View File
@@ -377,7 +377,7 @@ var Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, tim
if err != nil {
return "", err
}
interval := sqlIntervalCalculator.Calculate(timeRange, minInterval)
interval := sqlIntervalCalculator.Calculate(timeRange, minInterval, query.MaxDataPoints)
sql = strings.ReplaceAll(sql, "$__interval_ms", strconv.FormatInt(interval.Milliseconds(), 10))
sql = strings.ReplaceAll(sql, "$__interval", interval.Text)