triggers-panel: replace variables in trigger name, issue #428

This commit is contained in:
Alexander Zobnin
2017-07-21 16:07:21 +03:00
parent eaaa86d31c
commit a5bfaed762
4 changed files with 20 additions and 13 deletions

View File

@@ -206,6 +206,7 @@ System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource
return this.datasourceSrv.get(this.panel.datasource).then(function (datasource) {
var zabbix = datasource.zabbix;
_this3.zabbix = zabbix;
_this3.datasource = datasource;
var showEvents = _this3.panel.showEvents.value;
var triggerFilter = _this3.panel.triggers;
var hideHostsInMaintenance = _this3.panel.hideHostsInMaintenance;
@@ -219,10 +220,10 @@ System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource
showTriggers: showEvents,
hideHostsInMaintenance: hideHostsInMaintenance
};
var getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
return getTriggers.then(function (triggers) {
return _.map(triggers, _this3.formatTrigger.bind(_this3));
});
return zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
}).then(function (triggers) {
return _.map(triggers, _this3.formatTrigger.bind(_this3));
});
}
}, {
@@ -272,6 +273,7 @@ System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource
// Filter triggers by description
var triggerFilter = this.panel.triggers.trigger.filter;
triggerFilter = this.datasource.replaceTemplateVars(triggerFilter);
if (triggerFilter) {
triggerList = _filterTriggers(triggerList, triggerFilter);
}

File diff suppressed because one or more lines are too long