Small panel-triggers/module.js refactor.

This commit is contained in:
Alexander Zobnin
2016-03-31 21:25:49 +03:00
parent 75f4a8eeb4
commit f5896a963f

View File

@@ -93,9 +93,12 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
var queryProcessor = datasource.queryProcessor; var queryProcessor = datasource.queryProcessor;
var showEvents = self.panel.showEvents.value; var showEvents = self.panel.showEvents.value;
var triggerFilter = self.panel.triggers; var triggerFilter = self.panel.triggers;
// Replace template variables
var groupFilter = self.templateSrv.replace(triggerFilter.group.filter); var groupFilter = self.templateSrv.replace(triggerFilter.group.filter);
var hostFilter = self.templateSrv.replace(triggerFilter.host.filter); var hostFilter = self.templateSrv.replace(triggerFilter.host.filter);
var appFilter = self.templateSrv.replace(triggerFilter.application.filter); var appFilter = self.templateSrv.replace(triggerFilter.application.filter);
var buildQuery = queryProcessor.buildTriggerQuery(groupFilter, hostFilter, appFilter); var buildQuery = queryProcessor.buildTriggerQuery(groupFilter, hostFilter, appFilter);
return buildQuery.then(query => { return buildQuery.then(query => {
return zabbix.getTriggers(query.groupids, return zabbix.getTriggers(query.groupids,
@@ -124,8 +127,10 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
// Set color // Set color
if (trigger.value === '1') { if (trigger.value === '1') {
// Problem state
triggerObj.color = self.panel.triggerSeverity[trigger.priority].color; triggerObj.color = self.panel.triggerSeverity[trigger.priority].color;
} else { } else {
// OK state
triggerObj.color = self.panel.okEventColor; triggerObj.color = self.panel.okEventColor;
} }