Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Query object ids explicitly

Browse Source
This commit is contained in:
Alexander Zobnin
2022-07-12 09:18:16 +03:00
parent 6fed222b05
commit 5777c2dd0f
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/zabbix/methods.go
View File

@@ -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) { func (ds *Zabbix) GetAllHosts(ctx context.Context, groupids []string) ([]Host, error) {
params := ZabbixAPIParams{ params := ZabbixAPIParams{
"output": []string{"name", "host"}, "output": []string{"hostid", "name", "host"},
"sortfield": "name", "sortfield": "name",
"groupids": groupids, "groupids": groupids,
} }

22
src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
View File

@@ -144,7 +144,7 @@ export class ZabbixAPIConnector {
getHosts(groupids) { getHosts(groupids) {
const params: any = { const params: any = {
output: ['name', 'host'], output: ['hostid', 'name', 'host'],
sortfield: 'name' sortfield: 'name'
}; };
if (groupids) { if (groupids) {
@@ -177,6 +177,7 @@ export class ZabbixAPIConnector {
getItems(hostids, appids, itemtype) { getItems(hostids, appids, itemtype) {
const params: any = { const params: any = {
output: [ output: [
'itemid',
'name', 'name',
'key_', 'key_',
'value_type', 'value_type',
@@ -219,6 +220,7 @@ export class ZabbixAPIConnector {
const params: any = { const params: any = {
itemids: itemids, itemids: itemids,
output: [ output: [
'itemid',
'name', 'name',
'key_', 'key_',
'value_type', 'value_type',
@@ -342,8 +344,9 @@ export class ZabbixAPIConnector {
const itemids = _.map(items, 'itemid'); const itemids = _.map(items, 'itemid');
const params: any = { const params: any = {
output: ["itemid", output: [
"clock", 'itemid',
'clock',
value_type value_type
], ],
itemids: itemids, itemids: itemids,
@@ -498,8 +501,8 @@ export class ZabbixAPIConnector {
monitored: true, monitored: true,
skipDependent: true, skipDependent: true,
selectGroups: ['name', 'groupid'], selectGroups: ['name', 'groupid'],
selectHosts: ['name', 'host', 'maintenance_status', 'proxy_hostid'], selectHosts: ['hostid', 'name', 'host', 'maintenance_status', 'proxy_hostid'],
selectItems: ['name', 'key_', 'lastvalue'], selectItems: ['itemid', 'name', 'key_', 'lastvalue'],
// selectLastEvent: 'extend', // selectLastEvent: 'extend',
// selectTags: 'extend', // selectTags: 'extend',
preservekeys: '1', preservekeys: '1',
@@ -525,9 +528,9 @@ export class ZabbixAPIConnector {
filter: { filter: {
value: 1 value: 1
}, },
selectGroups: ['name', 'groupid'], selectGroups: ['groupid', 'name'],
selectHosts: ['name', 'host', 'maintenance_status', 'proxy_hostid'], selectHosts: ['hostid', 'name', 'host', 'maintenance_status', 'proxy_hostid'],
selectItems: ['name', 'key_', 'lastvalue'], selectItems: ['itemid', 'name', 'key_', 'lastvalue'],
selectLastEvent: 'extend', selectLastEvent: 'extend',
selectTags: 'extend' selectTags: 'extend'
}; };
@@ -624,6 +627,7 @@ export class ZabbixAPIConnector {
const params = { const params = {
eventids: eventids, eventids: eventids,
output: [ output: [
'alertid',
'eventid', 'eventid',
'message', 'message',
'clock', 'clock',
@@ -689,7 +693,7 @@ export class ZabbixAPIConnector {
skipDependent: true, skipDependent: true,
selectLastEvent: 'extend', selectLastEvent: 'extend',
selectGroups: 'extend', selectGroups: 'extend',
selectHosts: ['host', 'name'] selectHosts: ['hostid', 'host', 'name']
}; };
if (count && acknowledged !== 0 && acknowledged !== 1) { if (count && acknowledged !== 0 && acknowledged !== 1) {