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

fix(kariosdb): fixed how kairosdb makes datasource requests, fixes #2628

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-08-31 19:13:45 +02:00
parent 3dfa28570f
commit e93fba206d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/plugins/datasource/kairosdb/datasource.js
View File

@ -10,7 +10,7 @@ function (angular, _, kbn) {
var module = angular.module('grafana.services');
module.factory('KairosDBDatasource', function($q, $http, templateSrv) {
module.factory('KairosDBDatasource', function($q, backendSrv, templateSrv) {
function KairosDBDatasource(datasource) {
this.type = datasource.type;
@ -51,10 +51,6 @@ function (angular, _, kbn) {
return this.performTimeSeriesQuery(queries, start, end).then(handleKairosDBQueryResponseAlias, handleQueryError);
};
///////////////////////////////////////////////////////////////////////
/// Query methods
///////////////////////////////////////////////////////////////////////
KairosDBDatasource.prototype.performTimeSeriesQuery = function(queries, start, end) {
var reqBody = {
metrics: queries,
@ -70,7 +66,7 @@ function (angular, _, kbn) {
data: reqBody
};
return $http(options);
return backendSrv.datasourceRequest(options);
};
/**
@ -83,7 +79,7 @@ function (angular, _, kbn) {
method: 'GET'
};
return $http(options).then(function(response) {
return backendSrv.datasourceRequest(options).then(function(response) {
if (!response.data) {
return $q.when([]);
}
@ -110,7 +106,7 @@ function (angular, _, kbn) {
}
};
return $http(options).then(function(result) {
return backendSrv.datasourceRequest(options).then(function(result) {
if (!result.data) {
return $q.when([]);
}
@ -139,7 +135,7 @@ function (angular, _, kbn) {
}
};
return $http(options).then(function(result) {
return backendSrv.datasourceRequest(options).then(function(result) {
if (!result.data) {
return $q.when([]);
}
@ -158,7 +154,7 @@ function (angular, _, kbn) {
}
};
return $http(options).then(function(response) {
return backendSrv.datasourceRequest(options).then(function(response) {
if (!response.data) {
return [];
}