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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
dist/panel-triggers/module.js vendored
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,11 +220,11 @@ 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 zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
}).then(function (triggers) {
return _.map(triggers, _this3.formatTrigger.bind(_this3));
});
});
}
}, {
key: 'getAcknowledges',
@@ -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);
}

2
dist/panel-triggers/module.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/test/panel-triggers/module.js vendored
View File

@@ -165,6 +165,7 @@ var TriggerPanelCtrl = function (_PanelCtrl) {
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;
@@ -178,11 +179,11 @@ var TriggerPanelCtrl = function (_PanelCtrl) {
showTriggers: showEvents,
hideHostsInMaintenance: hideHostsInMaintenance
};
var getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
return getTriggers.then(function (triggers) {
return zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
}).then(function (triggers) {
return _lodash2.default.map(triggers, _this3.formatTrigger.bind(_this3));
});
});
}
}, {
key: 'getAcknowledges',
@@ -231,6 +232,7 @@ var TriggerPanelCtrl = function (_PanelCtrl) {
// Filter triggers by description
var triggerFilter = this.panel.triggers.trigger.filter;
triggerFilter = this.datasource.replaceTemplateVars(triggerFilter);
if (triggerFilter) {
triggerList = _filterTriggers(triggerList, triggerFilter);
}

9
src/panel-triggers/module.js
View File

@@ -130,6 +130,7 @@ class TriggerPanelCtrl extends PanelCtrl {
.then(datasource => {
var zabbix = datasource.zabbix;
this.zabbix = zabbix;
this.datasource = datasource;
var showEvents = this.panel.showEvents.value;
var triggerFilter = this.panel.triggers;
var hideHostsInMaintenance = this.panel.hideHostsInMaintenance;
@@ -143,11 +144,12 @@ class TriggerPanelCtrl extends PanelCtrl {
showTriggers: showEvents,
hideHostsInMaintenance: hideHostsInMaintenance
};
let getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
return getTriggers.then(triggers => {
return zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
})
.then(triggers => {
return _.map(triggers, this.formatTrigger.bind(this));
});
});
}
getAcknowledges(triggerList) {
@@ -191,6 +193,7 @@ class TriggerPanelCtrl extends PanelCtrl {
filterTriggers(triggerList) {
// Filter triggers by description
var triggerFilter = this.panel.triggers.trigger.filter;
triggerFilter = this.datasource.replaceTemplateVars(triggerFilter);
if (triggerFilter) {
triggerList = filterTriggers(triggerList, triggerFilter);
}