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

fix Filter param (can accept array or single value)

Browse Source
This commit is contained in:
Alexander Zobnin
2020-01-14 18:39:21 +03:00
parent 72cca28dab
commit a7a72f5697
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models.go
View File

@@ -61,10 +61,10 @@ func (p *zabbixParamOutput) UnmarshalJSON(data []byte) error {
} }
type ZabbixAPIParams struct { type ZabbixAPIParams struct {
Output *zabbixParamOutput `json:"output,omitempty"` Output *zabbixParamOutput `json:"output,omitempty"`
SortField string `json:"sortfield,omitempty"` SortField string `json:"sortfield,omitempty"`
SortOrder string `json:"sortorder,omitempty"` SortOrder string `json:"sortorder,omitempty"`
Filter map[string][]int `json:"filter,omitempty"` Filter map[string]interface{} `json:"filter,omitempty"`
// Login // Login
User string `json:"user,omitempty"` User string `json:"user,omitempty"`

2
pkg/zabbix_api.go
View File

@@ -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"}}, Output: &zabbixParamOutput{Fields: []string{"itemid", "name", "key_", "value_type", "hostid", "status", "state"}},
SortField: "name", SortField: "name",
WebItems: true, WebItems: true,
Filter: map[string][]int{}, Filter: map[string]interface{}{},
SelectHosts: []string{"hostid", "name"}, SelectHosts: []string{"hostid", "name"},
HostIDs: hostids, HostIDs: hostids,
AppIDs: appids, AppIDs: appids,