From a1fcd3c5b6247db96e10e3d138aea794ba945eb2 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Fri, 20 Nov 2015 15:33:52 +0900 Subject: [PATCH] import fix step calibration --- public/app/plugins/datasource/prometheus/datasource.js | 4 ++-- .../plugins/datasource/prometheus/specs/datasource_specs.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/prometheus/datasource.js b/public/app/plugins/datasource/prometheus/datasource.js index 7e45c10246c..2c9279cee96 100644 --- a/public/app/plugins/datasource/prometheus/datasource.js +++ b/public/app/plugins/datasource/prometheus/datasource.js @@ -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]); diff --git a/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts b/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts index 2ac4992edef..58034d09cac 100644 --- a/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts @@ -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"}' }],