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

import fix step calibration

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2015-11-20 15:33:52 +09:00
parent 15dc30edf6
commit a1fcd3c5b6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ function (angular, _, moment, dateMath) {
sec = 1;
}
return Math.ceil(sec * intervalFactor) + 's';
return Math.ceil(sec * intervalFactor);
};
function transformMetricData(md, options) {
@@ -218,7 +218,7 @@ function (angular, _, moment, dateMath) {
metricLabel = createMetricLabel(md.metric, options);
var stepMs = parseInt(options.step.slice(0, -1)) * 1000;
var stepMs = parseInt(options.step) * 1000;
var lastTimestamp = null;
_.each(md.values, function(value) {
var dp_value = parseFloat(value[1]);

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"}' }],