From 98f77ee6617456c1af913e5b5ea65c3fd67850c7 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 30 Mar 2016 20:55:07 +0300 Subject: [PATCH] Fixed host name displaying (not worked in Zabbix 3.0). --- src/datasource-zabbix/zabbixAPI.service.js | 2 +- src/panel-triggers/module.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/datasource-zabbix/zabbixAPI.service.js b/src/datasource-zabbix/zabbixAPI.service.js index ab35f0a..beb4eec 100644 --- a/src/datasource-zabbix/zabbixAPI.service.js +++ b/src/datasource-zabbix/zabbixAPI.service.js @@ -313,7 +313,7 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) { value: 1 }, selectGroups: ['name'], - selectHosts: ['name'], + selectHosts: ['name', 'host'], selectItems: ['name', 'key_', 'lastvalue'], selectLastEvent: 'extend' }; diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js index 7467ae3..103b281 100644 --- a/src/panel-triggers/module.js +++ b/src/panel-triggers/module.js @@ -122,6 +122,11 @@ class TriggerPanelCtrl extends MetricsPanelCtrl { } triggerObj.age = timestamp.fromNow(true); + // Set host that the trigger belongs + if (trigger.hosts.length) { + triggerObj.host = trigger.hosts[0].name; + } + // Set color if (trigger.value === '1') { triggerObj.color = self.panel.triggerSeverity[trigger.priority].color;