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

Tests: added tests for template variables replacing.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-11-09 16:52:12 +03:00
parent a8079316d7
commit f8419f04a9
2 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/datasource-zabbix/datasource.js
View File

@@ -449,7 +449,7 @@ function formatMetric(metricObj) {
* template variables, for example
* /CPU $cpu_item.*time/ where $cpu_item is system,user,iowait
*/
function zabbixTemplateFormat(value) {
export function zabbixTemplateFormat(value) {
if (typeof value === 'string') {
return utils.escapeRegex(value);
}
@@ -468,7 +468,7 @@ function zabbixTemplateFormat(value) {
*/
function replaceTemplateVars(templateSrv, target, scopedVars) {
var replacedTarget = templateSrv.replace(target, scopedVars, zabbixTemplateFormat);
if (target !== replacedTarget && !utils.regexPattern.test(replacedTarget)) {
if (target !== replacedTarget && !utils.isRegex(replacedTarget)) {
replacedTarget = '/^' + replacedTarget + '$/';
}
return replacedTarget;