From 85f320aae3d1401331ee1a6abd3c43c651e2b4fe Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 7 Nov 2018 10:54:06 +0300 Subject: [PATCH] add method for querying list of proxies --- .../zabbix/connectors/zabbix_api/zabbixAPIConnector.js | 10 +++++++++- src/datasource-zabbix/zabbix/zabbix.js | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js index 3432669..adefea1 100644 --- a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js +++ b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js @@ -346,7 +346,7 @@ export class ZabbixAPIConnector { value: 1 }, selectGroups: ['name'], - selectHosts: ['name', 'host', 'maintenance_status'], + selectHosts: ['name', 'host', 'maintenance_status', 'proxy_hostid'], selectItems: ['name', 'key_', 'lastvalue'], selectLastEvent: 'extend', selectTags: 'extend' @@ -463,6 +463,14 @@ export class ZabbixAPIConnector { return triggers; }); } + + getProxies() { + var params = { + output: ['proxyid', 'host'], + }; + + return this.request('proxy.get', params); + } } function filterTriggersByAcknowledge(triggers, acknowledged) { diff --git a/src/datasource-zabbix/zabbix/zabbix.js b/src/datasource-zabbix/zabbix/zabbix.js index 6badc49..fef9e83 100644 --- a/src/datasource-zabbix/zabbix/zabbix.js +++ b/src/datasource-zabbix/zabbix/zabbix.js @@ -8,16 +8,16 @@ import { ZabbixNotImplemented } from './connectors/dbConnector'; const REQUESTS_TO_PROXYFY = [ 'getHistory', 'getTrend', 'getGroups', 'getHosts', 'getApps', 'getItems', 'getMacros', 'getItemsByIDs', - 'getEvents', 'getAlerts', 'getHostAlerts', 'getAcknowledges', 'getITService', 'getSLA', 'getVersion' + 'getEvents', 'getAlerts', 'getHostAlerts', 'getAcknowledges', 'getITService', 'getSLA', 'getVersion', 'getProxies' ]; const REQUESTS_TO_CACHE = [ - 'getGroups', 'getHosts', 'getApps', 'getItems', 'getMacros', 'getItemsByIDs', 'getITService' + 'getGroups', 'getHosts', 'getApps', 'getItems', 'getMacros', 'getItemsByIDs', 'getITService', 'getProxies' ]; const REQUESTS_TO_BIND = [ 'getHistory', 'getTrend', 'getMacros', 'getItemsByIDs', 'getEvents', 'getAlerts', 'getHostAlerts', - 'getAcknowledges', 'getITService', 'getVersion', 'login', 'acknowledgeEvent' + 'getAcknowledges', 'getITService', 'getVersion', 'login', 'acknowledgeEvent', 'getProxies' ]; export class Zabbix {