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

Fix filtering by application

Browse Source
This commit is contained in:
Alexander Zobnin
2021-08-10 12:51:43 +03:00
parent 21f1d87dc1
commit 8efc020f33
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/zabbix/methods.go
View File

@@ -93,6 +93,8 @@ func (ds *Zabbix) GetItems(ctx context.Context, groupFilter string, hostFilter s
apps, err := ds.GetApps(ctx, groupFilter, hostFilter, appFilter) apps, err := ds.GetApps(ctx, groupFilter, hostFilter, appFilter)
// Apps not supported in Zabbix 5.4 and higher // Apps not supported in Zabbix 5.4 and higher
isZabbix54orHigher := isAppMethodNotFoundError(err) isZabbix54orHigher := isAppMethodNotFoundError(err)
ds.logger.Debug("isZabbix54orHigher", "value", isZabbix54orHigher)
ds.logger.Debug("apps", "apps", apps)
if isZabbix54orHigher { if isZabbix54orHigher {
apps = []Application{} apps = []Application{}
} else if err != nil { } else if err != nil {
@@ -104,10 +106,10 @@ func (ds *Zabbix) GetItems(ctx context.Context, groupFilter string, hostFilter s
} }
var allItems []*Item var allItems []*Item
if len(hostids) > 0 { if len(appids) > 0 {
allItems, err = ds.GetAllItems(ctx, hostids, nil, itemType)
} else if len(appids) > 0 {
allItems, err = ds.GetAllItems(ctx, nil, appids, itemType) allItems, err = ds.GetAllItems(ctx, nil, appids, itemType)
} else if len(hostids) > 0 {
allItems, err = ds.GetAllItems(ctx, hostids, nil, itemType)
} }
if isZabbix54orHigher && itemTagFilter != "" { if isZabbix54orHigher && itemTagFilter != "" {