IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'prometheus-fix_step_calculation' of https://github.com/dan-cleinmark/grafana into dan-cleinmark-prometheus-fix_step_calculation

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-10-29 16:50:18 +01:00
commit 59fc72d37e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/prometheus/datasource.js
View File

@ -99,11 +99,11 @@ function (angular, _, moment, dateMath) {
var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end; var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end;
var step = query.step; var step = query.step;
var range = Math.floor(end - start); var range = Math.ceil(end - start);
// Prometheus drop query if range/step > 11000 // Prometheus drop query if range/step > 11000
// calibrate step if it is too big // calibrate step if it is too big
if (step !== 0 && range / step > 11000) { if (step !== 0 && range / step > 11000) {
step = Math.floor(range / 11000); step = Math.ceil(range / 11000);
} }
url += '&step=' + step; url += '&step=' + step;
@ -212,7 +212,7 @@ function (angular, _, moment, dateMath) {
sec = 1; sec = 1;
} }
return Math.floor(sec * intervalFactor) + 's'; return Math.ceil(sec * intervalFactor) + 's';
}; };
function transformMetricData(md, options) { function transformMetricData(md, options) {