Working on new Zabbix API service.

2016-01-23 14:43:06 +03:00
parent bc52687bca
commit 51b0a7a0eb
4 changed files with 249 additions and 656 deletions
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -3,8 +3,7 @@ define([
  'lodash',
  'app/core/utils/datemath',
  './directives',
-  './zabbixAPIWrapper',
-  './zabbixAPIService',
+  './zabbixAPI',
  './utils',
  './helperFunctions',
  './zabbixCacheSrv',
@@ -15,7 +14,7 @@ function (angular, _, dateMath) {

  /** @ngInject */
  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
-                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache, ZabbixAPIService) {
+                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {

    // General data source settings
    this.name             = instanceSettings.name;