Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: fix query.controller.js

Browse Source
This commit is contained in:
Alexander Zobnin
2016-11-13 18:40:01 +03:00
parent d11f1b7616
commit 0bf7f4b870
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/datasource-zabbix/query.controller.js
View File

@@ -14,13 +14,8 @@ export class ZabbixQueryController extends QueryCtrl {
// ZabbixQueryCtrl constructor // ZabbixQueryCtrl constructor
constructor($scope, $injector, $rootScope, $sce, templateSrv) { constructor($scope, $injector, $rootScope, $sce, templateSrv) {
// Call superclass constructor
super($scope, $injector); super($scope, $injector);
this.zabbix = this.datasource.zabbix;
this.zabbix = this.datasource.zabbixAPI;
this.cache = this.datasource.zabbixCache;
this.queryBuilder = this.datasource.queryBuilder;
// Use custom format for template variables // Use custom format for template variables
this.replaceTemplateVars = this.datasource.replaceTemplateVars; this.replaceTemplateVars = this.datasource.replaceTemplateVars;
@@ -116,7 +111,7 @@ export class ZabbixQueryController extends QueryCtrl {
} }
suggestGroups() { suggestGroups() {
return this.queryBuilder.getAllGroups() return this.zabbix.getAllGroups()
.then(groups => { .then(groups => {
this.metric.groupList = groups; this.metric.groupList = groups;
return groups; return groups;
@@ -125,7 +120,7 @@ export class ZabbixQueryController extends QueryCtrl {
suggestHosts() { suggestHosts() {
let groupFilter = this.replaceTemplateVars(this.target.group.filter); let groupFilter = this.replaceTemplateVars(this.target.group.filter);
return this.queryBuilder.getAllHosts(groupFilter) return this.zabbix.getAllHosts(groupFilter)
.then(hosts => { .then(hosts => {
this.metric.hostList = hosts; this.metric.hostList = hosts;
return hosts; return hosts;
@@ -135,7 +130,7 @@ export class ZabbixQueryController extends QueryCtrl {
suggestApps() { suggestApps() {
let groupFilter = this.replaceTemplateVars(this.target.group.filter); let groupFilter = this.replaceTemplateVars(this.target.group.filter);
let hostFilter = this.replaceTemplateVars(this.target.host.filter); let hostFilter = this.replaceTemplateVars(this.target.host.filter);
return this.queryBuilder.getAllApps(groupFilter, hostFilter) return this.zabbix.getAllApps(groupFilter, hostFilter)
.then(apps => { .then(apps => {
this.metric.appList = apps; this.metric.appList = apps;
return apps; return apps;
@@ -151,7 +146,7 @@ export class ZabbixQueryController extends QueryCtrl {
showDisabledItems: this.target.options.showDisabledItems showDisabledItems: this.target.options.showDisabledItems
}; };
return this.queryBuilder return this.zabbix
.getAllItems(groupFilter, hostFilter, appFilter, options) .getAllItems(groupFilter, hostFilter, appFilter, options)
.then(items => { .then(items => {
this.metric.itemList = items; this.metric.itemList = items;