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

19
plugins/datasource-zabbix/queryCtrl.js
View File

@@ -112,17 +112,20 @@ define([
};
$scope.filterApplications = function () {
var groupFilter = templateSrv.replace($scope.target.group.filter);
var hostFilter = templateSrv.replace($scope.target.host.filter);
$scope.datasource.queryProcessor.filterApplications(hostFilter).then(function(apps) {
$scope.metric.filteredApplications = apps;
});
$scope.datasource.queryProcessor.filterApplications(groupFilter, hostFilter)
.then(function(apps) {
$scope.metric.filteredApplications = apps;
});
};
$scope.filterItems = function () {
var groupFilter = templateSrv.replace($scope.target.group.filter);
var hostFilter = templateSrv.replace($scope.target.host.filter);
var appFilter = templateSrv.replace($scope.target.application.filter);
$scope.datasource.queryProcessor.filterItems(hostFilter, appFilter, $scope.target.showDisabledItems)
.then(function(items) {
$scope.datasource.queryProcessor.filterItems(groupFilter, hostFilter, appFilter,
$scope.target.showDisabledItems).then(function(items) {
$scope.metric.filteredItems = items;
});
};
@@ -135,21 +138,21 @@ define([
// Handle group blur and filter hosts
$scope.onGroupBlur = function() {
$scope.filterHosts();
$scope.initFilters();
$scope.parseTarget();
$scope.get_data();
};
// Handle host blur and filter applications
$scope.onHostBlur = function() {
$scope.filterApplications();
$scope.initFilters();
$scope.parseTarget();
$scope.get_data();
};
// Handle application blur and filter items
$scope.onApplicationBlur = function() {
$scope.filterItems();
$scope.initFilters();
$scope.parseTarget();
$scope.get_data();
};