From 69d781e6982ec5ebfdc89833581ddac900aa3a24 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 12 May 2015 22:58:34 +0300
Subject: [PATCH] Replace $http to backendSrv for grafana-2-like request style.

---
 zabbix/datasource.js        | 21 +++++++++++++--------
 zabbix/partials/config.html |  7 +++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index 67f3184..5ca2ac1 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -9,12 +9,12 @@ function (angular, _, kbn) {
 
   var module = angular.module('grafana.services');
 
-  module.factory('ZabbixAPIDatasource', function($q, $http, templateSrv) {
+  module.factory('ZabbixAPIDatasource', function($q, backendSrv, templateSrv) {
 
     function ZabbixAPIDatasource(datasource) {
       this.name             = datasource.name;
-      this.type             = 'ZabbixAPIDatasource';
-      this.supportMetrics   = true;
+      this.type             = 'zabbix';
+
       this.url              = datasource.url;
 
       // TODO: fix passing username and password from config.html
@@ -23,6 +23,11 @@ function (angular, _, kbn) {
 
       // No datapoints limit by default
       this.limitMetrics     = datasource.limitMetrics || 0;
+      this.supportMetrics   = true;
+      this.supportAnnotations = true;
+
+      // For testing
+      this.ds = datasource;
     }
 
 
@@ -133,10 +138,10 @@ function (angular, _, kbn) {
         performedQuery = this.performZabbixAPILogin().then(function (response) {
           self.auth = response;
           options.data.auth = response;
-          return $http(options);
+          return backendSrv.datasourceRequest(options);
         });
       } else {
-        performedQuery = $http(options);
+        performedQuery = backendSrv.datasourceRequest(options);
       }
 
       // Handle response
@@ -237,7 +242,7 @@ function (angular, _, kbn) {
         },
       };
 
-      return $http(options).then(function (result) {
+      return backendSrv.datasourceRequest(options).then(function (result) {
         if (!result.data) {
           return null;
         }
@@ -351,7 +356,7 @@ function (angular, _, kbn) {
         },
       };
 
-      return $http(tid_options).then(function(result) {
+      return backendSrv.datasourceRequest(tid_options).then(function(result) {
         var obs = {};
         obs = _.indexBy(result.data.result, 'triggerid');
 
@@ -374,7 +379,7 @@ function (angular, _, kbn) {
           },
         };
 
-        return $http(options).then(function(result2) {
+        return backendSrv.datasourceRequest(options).then(function(result2) {
           var list = [];
           _.each(result2.data.result, function(e) {
             list.push({
diff --git a/zabbix/partials/config.html b/zabbix/partials/config.html
index 81f0e44..a8f4506 100644
--- a/zabbix/partials/config.html
+++ b/zabbix/partials/config.html
@@ -1,22 +1,21 @@
 <div ng-include="httpConfigPartialSrc"></div>
 
 <br>
-
 <h5>Zabbix API details</h5>
 
-<div class="tight-form">
+<div class="tight-form last">
   <ul class="tight-form-list">
     <li class="tight-form-item" style="width: 80px">
       User
     </li>
     <li>
-      <input type="text" class="tight-form-input input-large" ng-model='current.user' placeholder=""></input>
+      <input type="text" class="tight-form-input input-large" ng-model='current.zabbixUser' placeholder=""></input>
     </li>
     <li class="tight-form-item">
       Password
     </li>
     <li>
-      <input type="password" class="tight-form-input input-large" ng-model='current.password' placeholder=""></input>
+      <input type="password" class="tight-form-input input-large" ng-model='current.zabbixPassword' placeholder=""></input>
     </li>
   </ul>
   <div class="clearfix"></div>