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

Fixed item filtering by types.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-02-01 14:31:20 +03:00
parent fbebb1f04e
commit 5ead2950b8
3 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,12 @@ function (angular, _, utils) {
}
};
this.filterGroups = function(groupFilter) {
return self.cache.getGroups().then(function(groupList) {
return groupList;
});
};
this.filterHosts = function(groupFilter) {
var groups = [];
var hosts = [];
@@ -103,7 +109,7 @@ function (angular, _, utils) {
});
};
this.filterItems = function (groupFilter, hostFilter, appFilter, showDisabledItems) {
this.filterItems = function (groupFilter, hostFilter, appFilter, itemType, showDisabledItems) {
var hosts = [];
var apps = [];
var items = [];
@@ -111,7 +117,7 @@ function (angular, _, utils) {
var promises = [
this.filterHosts(groupFilter),
this.filterApplications(groupFilter, hostFilter),
this.cache.getItems(),
this.cache.getItems(itemType),
];
return $q.all(promises).then(function(results) {