From 5777c2dd0fa3eac8363830b898dc01743d3e426d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 12 Jul 2022 09:18:16 +0300
Subject: [PATCH] Query object ids explicitly

---
 pkg/zabbix/methods.go                         |  2 +-
 .../zabbix_api/zabbixAPIConnector.ts          | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkg/zabbix/methods.go b/pkg/zabbix/methods.go
index b403e35..be31fed 100644
--- a/pkg/zabbix/methods.go
+++ b/pkg/zabbix/methods.go
@@ -376,7 +376,7 @@ func (ds *Zabbix) GetAllApps(ctx context.Context, hostids []string) ([]Applicati
 
 func (ds *Zabbix) GetAllHosts(ctx context.Context, groupids []string) ([]Host, error) {
 	params := ZabbixAPIParams{
-		"output":    []string{"name", "host"},
+		"output":    []string{"hostid", "name", "host"},
 		"sortfield": "name",
 		"groupids":  groupids,
 	}
diff --git a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
index 885664c..4b03fe0 100644
--- a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
+++ b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
@@ -144,7 +144,7 @@ export class ZabbixAPIConnector {
 
   getHosts(groupids) {
     const params: any = {
-      output: ['name', 'host'],
+      output: ['hostid', 'name', 'host'],
       sortfield: 'name'
     };
     if (groupids) {
@@ -177,6 +177,7 @@ export class ZabbixAPIConnector {
   getItems(hostids, appids, itemtype) {
     const params: any = {
       output: [
+        'itemid',
         'name',
         'key_',
         'value_type',
@@ -219,6 +220,7 @@ export class ZabbixAPIConnector {
     const params: any = {
       itemids: itemids,
       output: [
+        'itemid',
         'name',
         'key_',
         'value_type',
@@ -342,8 +344,9 @@ export class ZabbixAPIConnector {
     const itemids = _.map(items, 'itemid');
 
     const params: any = {
-      output: ["itemid",
-        "clock",
+      output: [
+        'itemid',
+        'clock',
         value_type
       ],
       itemids: itemids,
@@ -498,8 +501,8 @@ export class ZabbixAPIConnector {
       monitored: true,
       skipDependent: true,
       selectGroups: ['name', 'groupid'],
-      selectHosts: ['name', 'host', 'maintenance_status', 'proxy_hostid'],
-      selectItems: ['name', 'key_', 'lastvalue'],
+      selectHosts: ['hostid', 'name', 'host', 'maintenance_status', 'proxy_hostid'],
+      selectItems: ['itemid', 'name', 'key_', 'lastvalue'],
       // selectLastEvent: 'extend',
       // selectTags: 'extend',
       preservekeys: '1',
@@ -525,9 +528,9 @@ export class ZabbixAPIConnector {
       filter: {
         value: 1
       },
-      selectGroups: ['name', 'groupid'],
-      selectHosts: ['name', 'host', 'maintenance_status', 'proxy_hostid'],
-      selectItems: ['name', 'key_', 'lastvalue'],
+      selectGroups: ['groupid', 'name'],
+      selectHosts: ['hostid', 'name', 'host', 'maintenance_status', 'proxy_hostid'],
+      selectItems: ['itemid', 'name', 'key_', 'lastvalue'],
       selectLastEvent: 'extend',
       selectTags: 'extend'
     };
@@ -624,6 +627,7 @@ export class ZabbixAPIConnector {
     const params = {
       eventids: eventids,
       output: [
+        'alertid',
         'eventid',
         'message',
         'clock',
@@ -689,7 +693,7 @@ export class ZabbixAPIConnector {
       skipDependent: true,
       selectLastEvent: 'extend',
       selectGroups: 'extend',
-      selectHosts: ['host', 'name']
+      selectHosts: ['hostid', 'host', 'name']
     };
 
     if (count && acknowledged !== 0 && acknowledged !== 1) {