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

Fix trend values count and sum

Browse Source
This commit is contained in:
Alexander Zobnin
2021-05-28 11:54:43 +03:00
parent 4e6a77cad0
commit 98b6a34fb1
2 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/datasource/zabbix.go
View File

@@ -61,11 +61,11 @@ func (ds *ZabbixDatasourceInstance) queryNumericItems(ctx context.Context, query
}
func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context, query *QueryModel, items []*zabbix.Item) ([]*data.Frame, error) {
valueType := ds.getTrendValueType(query)
trendValueType := ds.getTrendValueType(query)
consolidateBy := ds.getConsolidateBy(query)
if consolidateBy == "" {
consolidateBy = valueType
if consolidateBy != "" {
trendValueType = consolidateBy
}
err := applyFunctionsPre(query, items)
@@ -73,7 +73,7 @@ func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context
return nil, err
}
history, err := ds.getHistotyOrTrend(ctx, query, items, consolidateBy)
history, err := ds.getHistotyOrTrend(ctx, query, items, trendValueType)
if err != nil {
return nil, err
}