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

Compact updateItemList() function.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-09 12:39:12 +03:00
parent 2745f832fd
commit cdf9437e75
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zabbix/datasource.js
View File

@@ -2,7 +2,7 @@ define([
'angular', 'angular',
'lodash', 'lodash',
'kbn', 'kbn',
'./queryCtrl', './queryCtrl'
], ],
function (angular, _, kbn) { function (angular, _, kbn) {
'use strict'; 'use strict';

11
zabbix/queryCtrl.js
View File

@@ -182,17 +182,12 @@ function (angular, _) {
var apps = $scope.target.application ? splitMetrics(templateSrv.replace($scope.target.application.name)) : undefined; var apps = $scope.target.application ? splitMetrics(templateSrv.replace($scope.target.application.name)) : undefined;
$scope.datasource.itemFindQuery(groups, hosts, apps).then(function (items) { $scope.datasource.itemFindQuery(groups, hosts, apps).then(function (items) {
// Show only unique item names // Show only unique item names
var uniq_items = _.uniq(items, function (item) { var uniq_items = _.map(_.uniq(items, function (item) {
return expandItemName(item); return expandItemName(item);
}), function (item) {
return {name: expandItemName(item)}
}); });
$scope.metric.itemList = $scope.metric.itemList.concat(uniq_items); $scope.metric.itemList = $scope.metric.itemList.concat(uniq_items);
// Expand item parameters
$scope.metric.itemList.forEach(function (item, index, array) {
if (item && item.key_ && item.name) {
item.name = expandItemName(item);
}
});
}); });
}; };