From a7a72f56978b8ffbc462895317e015ed1f412b2e Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 14 Jan 2020 18:39:21 +0300 Subject: [PATCH] fix Filter param (can accept array or single value) --- pkg/models.go | 8 ++++---- pkg/zabbix_api.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/models.go b/pkg/models.go index a304d12..95e6251 100644 --- a/pkg/models.go +++ b/pkg/models.go @@ -61,10 +61,10 @@ func (p *zabbixParamOutput) UnmarshalJSON(data []byte) error { } type ZabbixAPIParams struct { - Output *zabbixParamOutput `json:"output,omitempty"` - SortField string `json:"sortfield,omitempty"` - SortOrder string `json:"sortorder,omitempty"` - Filter map[string][]int `json:"filter,omitempty"` + Output *zabbixParamOutput `json:"output,omitempty"` + SortField string `json:"sortfield,omitempty"` + SortOrder string `json:"sortorder,omitempty"` + Filter map[string]interface{} `json:"filter,omitempty"` // Login User string `json:"user,omitempty"` diff --git a/pkg/zabbix_api.go b/pkg/zabbix_api.go index c847f5b..8a503f8 100644 --- a/pkg/zabbix_api.go +++ b/pkg/zabbix_api.go @@ -293,7 +293,7 @@ func (ds *ZabbixDatasource) getAllItems(ctx context.Context, dsInfo *datasource. Output: &zabbixParamOutput{Fields: []string{"itemid", "name", "key_", "value_type", "hostid", "status", "state"}}, SortField: "name", WebItems: true, - Filter: map[string][]int{}, + Filter: map[string]interface{}{}, SelectHosts: []string{"hostid", "name"}, HostIDs: hostids, AppIDs: appids,