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

Fixed item filtering in query editor.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-02-01 13:38:42 +03:00
parent f696760c32
commit 607e867ccb
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/datasource-zabbix/queryProcessor.js
View File

@@ -63,12 +63,12 @@ function (angular, _, utils) {
});
};
this.filterApplications = function(hostFilter) {
this.filterApplications = function(groupFilter, hostFilter) {
var hosts = [];
var apps = [];
var promises = [
this.cache.getHosts(),
this.filterHosts(groupFilter),
this.cache.getApplications()
];
@@ -103,15 +103,15 @@ function (angular, _, utils) {
});
};
this.filterItems = function (hostFilter, appFilter, showDisabledItems) {
this.filterItems = function (groupFilter, hostFilter, appFilter, showDisabledItems) {
var hosts = [];
var apps = [];
var items = [];
var promises = [
this.cache.getHosts(),
this.cache.getApplications(),
this.cache.getItems()
this.filterHosts(groupFilter),
this.filterApplications(groupFilter, hostFilter),
this.cache.getItems(),
];
return $q.all(promises).then(function(results) {