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

refactor: move macros expanding to utils

Browse Source
This commit is contained in:
Alexander Zobnin
2017-06-08 14:17:49 +03:00
parent fe455113d5
commit 5de016dd80
8 changed files with 135 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/datasource-zabbix/utils.js
View File

@@ -52,8 +52,47 @@ function splitKeyParams(paramStr) {
return params;
}
///////////
// MACRO //
///////////
const MACRO_PATTERN = /{\$[A-Z0-9_\.]+}/g;
export function containsMacro(itemName) {
return MACRO_PATTERN.test(itemName);
}
export function replaceMacro(item, macros) {
let itemName = item.name;
let item_macros = itemName.match(MACRO_PATTERN);
_.forEach(item_macros, macro => {
let host_macros = _.filter(macros, m => {
if (m.hostid) {
return m.hostid === item.hostid;
} else {
// Add global macros
return true;
}
});
let macro_def = _.find(host_macros, { macro: macro });
if (macro_def && macro_def.value) {
let macro_value = macro_def.value;
let macro_regex = new RegExp(escapeMacro(macro));
itemName = itemName.replace(macro_regex, macro_value);
}
});
return itemName;
}
function escapeMacro(macro) {
macro = macro.replace(/\$/, '\\\$');
return macro;
}
// Pattern for testing regex
export var regexPattern = /^\/(.*)\/([gmi]*)$/m;
export const regexPattern = /^\/(.*)\/([gmi]*)$/m;
export function isRegex(str) {
return regexPattern.test(str);

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

@@ -121,8 +121,8 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy) {
return this.getMacros(hostids)
.then(macros => {
_.forEach(items, item => {
if (containsMacro(item.name)) {
item.name = replaceMacro(item, macros);
if (utils.containsMacro(item.name)) {
item.name = utils.replaceMacro(item, macros);
}
});
return items;
@@ -239,38 +239,3 @@ function getHostIds(items) {
});
return _.uniq(_.flatten(hostIds));
}
let MACRO_PATTERN = /{\$[A-Z0-9_\.]+}/g;
function containsMacro(itemName) {
return MACRO_PATTERN.test(itemName);
}
function replaceMacro(item, macros) {
let itemName = item.name;
let item_macros = itemName.match(MACRO_PATTERN);
_.forEach(item_macros, macro => {
let host_macros = _.filter(macros, m => {
if (m.hostid) {
return m.hostid === item.hostid;
} else {
// Add global macros
return true;
}
});
let macro_def = _.find(host_macros, {macro: macro});
if (macro_def && macro_def.value) {
let macro_value = macro_def.value;
let macro_regex = new RegExp(escapeMacro(macro));
itemName = itemName.replace(macro_regex, macro_value);
}
});
return itemName;
}
function escapeMacro(macro) {
macro = macro.replace(/\$/, '\\\$');
return macro;
}