From f5896a963fa22b168523860e2060eeab69a9f6da Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 31 Mar 2016 21:25:49 +0300 Subject: [PATCH] Small panel-triggers/module.js refactor. --- src/panel-triggers/module.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js index 253222d..7d791fe 100644 --- a/src/panel-triggers/module.js +++ b/src/panel-triggers/module.js @@ -93,9 +93,12 @@ class TriggerPanelCtrl extends MetricsPanelCtrl { var queryProcessor = datasource.queryProcessor; var showEvents = self.panel.showEvents.value; var triggerFilter = self.panel.triggers; + + // Replace template variables var groupFilter = self.templateSrv.replace(triggerFilter.group.filter); var hostFilter = self.templateSrv.replace(triggerFilter.host.filter); var appFilter = self.templateSrv.replace(triggerFilter.application.filter); + var buildQuery = queryProcessor.buildTriggerQuery(groupFilter, hostFilter, appFilter); return buildQuery.then(query => { return zabbix.getTriggers(query.groupids, @@ -124,8 +127,10 @@ class TriggerPanelCtrl extends MetricsPanelCtrl { // Set color if (trigger.value === '1') { + // Problem state triggerObj.color = self.panel.triggerSeverity[trigger.priority].color; } else { + // OK state triggerObj.color = self.panel.okEventColor; }