IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 04:59:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

[prometheus] Fix step calibration

Browse Source 
The step interval is (correctly) being converted to seconds, but the
unit of measure suffixed onto the end is preventing the subsequent
step calibration. Because the query upstream defaults to seconds as
the unit of measure, the suffix can simply be removed and everything
works as intended.

patchset 01: Also fix the spec.
This commit is contained in:
John McFarlane 2015-11-19 16:33:08 -08:00
parent 924ecce2c3
commit c4048f8f22
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,7 @@ function (angular, _, moment, dateMath) {
sec = 1;
}
return Math.ceil(sec * intervalFactor) + 's';
return Math.ceil(sec * intervalFactor);
};
function transformMetricData(md, options) {

2
public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
View File

@ -19,7 +19,7 @@ describe('PrometheusDatasource', function() {
var results;
var urlExpected = 'proxied/api/v1/query_range?query=' +
encodeURIComponent('test{job="testjob"}') +
'&start=1443438675&end=1443460275&step=60s';
'&start=1443438675&end=1443460275&step=60';
var query = {
range: { from: moment(1443438674760), to: moment(1443460274760) },
targets: [{ expr: 'test{job="testjob"}' }],