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 08:58:32 -04: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/prometheus/prometheus.go
+1 -1
View File
@@ -257,7 +257,7 @@ func (s *Service) parseQuery(queryContext *backend.QueryDataRequest, dsInfo *Dat
return nil, err
}
calculatedInterval := s.intervalCalculator.Calculate(query.TimeRange, minInterval)
calculatedInterval := s.intervalCalculator.Calculate(query.TimeRange, minInterval, query.MaxDataPoints)
safeInterval := s.intervalCalculator.CalculateSafeInterval(query.TimeRange, int64(safeRes))
adjustedInterval := safeInterval.Value