From 2882a48f258a13222d855f28fbdb3325eef4b094 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 13 Aug 2016 20:28:24 +0300 Subject: [PATCH] Support template variables in functions, fixes #205. --- src/datasource-zabbix/datasource.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js index e076560..932920d 100644 --- a/src/datasource-zabbix/datasource.js +++ b/src/datasource-zabbix/datasource.js @@ -90,6 +90,12 @@ export class ZabbixAPIDatasource { target.item.filter = this.replaceTemplateVars(target.item.filter, options.scopedVars); target.textFilter = this.replaceTemplateVars(target.textFilter, options.scopedVars); + _.forEach(target.functions, func => { + func.params = _.map(func.params, param => { + return this.templateSrv.replace(param, options.scopedVars); + }); + }); + // Query numeric data if (!target.mode || target.mode === 0) { return this.queryNumericData(target, timeFrom, timeTo, useTrends); @@ -417,6 +423,13 @@ function bindFunctionDefs(functionDefs, category) { }); } +function filterFunctionDefs(funcs, category) { + let filteredFuncs = _.map(metricFunctions.getCategories()[category]); + return _.filter(funcs, func => { + return _.contains(filteredFuncs, func.def.name); + }); +} + function formatMetric(metricObj) { return { text: metricObj.name,