From 63665dccae70b2007991c444297fb462915c87b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 22 Sep 2015 07:12:36 +0200 Subject: [PATCH] fix(grafana datasource): fixed the built in test data source, fixes #2795 --- public/app/plugins/datasource/grafana/datasource.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/public/app/plugins/datasource/grafana/datasource.js b/public/app/plugins/datasource/grafana/datasource.js index 16c16211d13..fec34b1f8c1 100644 --- a/public/app/plugins/datasource/grafana/datasource.js +++ b/public/app/plugins/datasource/grafana/datasource.js @@ -1,10 +1,9 @@ define([ 'angular', 'lodash', - 'kbn', './directives', ], -function (angular, _, kbn) { +function (angular, _) { 'use strict'; var module = angular.module('grafana.services'); @@ -15,11 +14,11 @@ function (angular, _, kbn) { } GrafanaDatasource.prototype.query = function(options) { - // get from & to in seconds - var from = kbn.parseDate(options.range.from).getTime(); - var to = kbn.parseDate(options.range.to).getTime(); - - return backendSrv.get('/api/metrics/test', { from: from, to: to, maxDataPoints: options.maxDataPoints }); + return backendSrv.get('/api/metrics/test', { + from: options.range.from.valueOf(), + to: options.range.to.valueOf(), + maxDataPoints: options.maxDataPoints + }); }; GrafanaDatasource.prototype.metricFindQuery = function() {