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

annotations: replace variables in trigger name, fixes #428

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-21 16:00:01 +03:00
parent 411efc5784
commit eaaa86d31c
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,13 +367,14 @@ class ZabbixAPIDatasource {
return getTriggers.then(triggers => {
// Filter triggers by description
if (utils.isRegex(annotation.trigger)) {
let triggerName = this.replaceTemplateVars(annotation.trigger, {});
if (utils.isRegex(triggerName)) {
triggers = _.filter(triggers, trigger => {
return utils.buildRegex(annotation.trigger).test(trigger.description);
return utils.buildRegex(triggerName).test(trigger.description);
});
} else if (annotation.trigger) {
} else if (triggerName) {
triggers = _.filter(triggers, trigger => {
return trigger.description === annotation.trigger;
return trigger.description === triggerName;
});
}