From e93fba206dc701b75528f6676b1356745509796f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 31 Aug 2015 19:13:45 +0200
Subject: [PATCH] fix(kariosdb): fixed how kairosdb makes datasource requests,
 fixes #2628

---
 .../plugins/datasource/kairosdb/datasource.js    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js
index a0e9ac4e949..6db99f5a244 100644
--- a/public/app/plugins/datasource/kairosdb/datasource.js
+++ b/public/app/plugins/datasource/kairosdb/datasource.js
@@ -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 [];
         }