fix Filter param (can accept array or single value)

grafana · Jan 14, 2020 · a7a72f5 · a7a72f5
1 parent 72cca28
commit a7a72f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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,