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

Fixed bug with aggregation functions bind when dashboard loaded.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-28 18:38:31 +03:00
parent 95cae7ee4d
commit 7565cb0114
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/datasource-zabbix/datasource.js
View File

@@ -152,7 +152,8 @@ function (angular, _, dateMath, utils, metricFunctions) {
return _.contains(transformFunctions, func.def.name);
});
var functions = _.map(transFuncDefs, function(func) {
return func.bindFunction(DataProcessingService.metricFunctions);
var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
return funcInstance.bindFunction(DataProcessingService.metricFunctions);
});
// Metric data processing
@@ -171,7 +172,8 @@ function (angular, _, dateMath, utils, metricFunctions) {
return _.contains(aggregationFunctions, func.def.name);
});
var functions = _.map(aggFuncDefs, function(func) {
return func.bindFunction(DataProcessingService.metricFunctions);
var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
return funcInstance.bindFunction(DataProcessingService.metricFunctions);
});
var dp = _.map(timeseries_data, 'datapoints');