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

Fixed query editor: show only unique item names.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-05 14:50:13 +03:00
parent a75af217fd
commit 485cfd6687
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zabbix/queryCtrl.js
View File

@@ -174,6 +174,7 @@ function (angular, _) {
var groups = $scope.target.hostGroup ? splitMetrics(templateSrv.replace($scope.target.hostGroup.name)) : []; var groups = $scope.target.hostGroup ? splitMetrics(templateSrv.replace($scope.target.hostGroup.name)) : [];
var hosts = $scope.target.host ? splitMetrics(templateSrv.replace($scope.target.host.name)) : []; var hosts = $scope.target.host ? splitMetrics(templateSrv.replace($scope.target.host.name)) : [];
$scope.datasource.appFindQuery(hosts, groups).then(function (apps) { $scope.datasource.appFindQuery(hosts, groups).then(function (apps) {
// TODO: work with app names, not objects
var apps = _.map(_.uniq(_.map(apps, 'name')), function (appname) { var apps = _.map(_.uniq(_.map(apps, 'name')), function (appname) {
return {name: appname}; return {name: appname};
}); });
@@ -200,7 +201,11 @@ function (angular, _) {
var hosts = $scope.target.host ? splitMetrics(templateSrv.replace($scope.target.host.name)) : []; var hosts = $scope.target.host ? splitMetrics(templateSrv.replace($scope.target.host.name)) : [];
var apps = $scope.target.application ? splitMetrics(templateSrv.replace($scope.target.application.name)) : []; var apps = $scope.target.application ? splitMetrics(templateSrv.replace($scope.target.application.name)) : [];
$scope.datasource.itemFindQuery(groups, hosts, apps).then(function (items) { $scope.datasource.itemFindQuery(groups, hosts, apps).then(function (items) {
$scope.metric.itemList = $scope.metric.itemList.concat(items); // Show only unique item names
var uniq_items = _.uniq(items, function (item) {
return expandItemName(item);
});
$scope.metric.itemList = $scope.metric.itemList.concat(uniq_items);
// Expand item parameters // Expand item parameters
$scope.metric.itemList.forEach(function (item, index, array) { $scope.metric.itemList.forEach(function (item, index, array) {