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

Add host name to metric if multiple hosts returned.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-11-13 18:40:50 +03:00
parent 0bf7f4b870
commit 834b953e41
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/datasource-zabbix/responseHandler.js
View File

@@ -22,7 +22,7 @@ function convertHistory(history, items, addHostName, convertPointCallback) {
// Group history by itemid // Group history by itemid
var grouped_history = _.groupBy(history, 'itemid'); var grouped_history = _.groupBy(history, 'itemid');
var hosts = _.uniq(_.flatten(_.map(items, 'hosts')),'hostid'); //uniq is needed to deduplicate var hosts = _.uniqBy(_.flatten(_.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate
return _.map(grouped_history, function(hist, itemid) { return _.map(grouped_history, function(hist, itemid) {
var item = _.find(items, {'itemid': itemid}); var item = _.find(items, {'itemid': itemid});
@@ -38,11 +38,11 @@ function convertHistory(history, items, addHostName, convertPointCallback) {
}); });
} }
function handleHistory(history, items, addHostName) { function handleHistory(history, items, addHostName = true) {
return convertHistory(history, items, addHostName, convertHistoryPoint); return convertHistory(history, items, addHostName, convertHistoryPoint);
} }
function handleTrends(history, items, addHostName, valueType) { function handleTrends(history, items, valueType, addHostName = true) {
var convertPointCallback = _.partial(convertTrendPoint, valueType); var convertPointCallback = _.partial(convertTrendPoint, valueType);
return convertHistory(history, items, addHostName, convertPointCallback); return convertHistory(history, items, addHostName, convertPointCallback);
} }