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

Fix error on queries with aggregation function

Browse Source
This commit is contained in:
Alexander Zobnin
2021-08-10 22:03:34 +03:00
parent 33899b1171
commit 549b8ac95a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/datasource/response_handler.go
View File

@@ -111,12 +111,16 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
valueField.Name = data.TimeSeriesValueFieldName valueField.Name = data.TimeSeriesValueFieldName
item := series.Meta.Item item := series.Meta.Item
if item == nil {
item = &zabbix.Item{
Name: seriesName,
}
}
scopedVars := map[string]ScopedVar{ scopedVars := map[string]ScopedVar{
"__zbx_item": {Value: item.Name}, "__zbx_item": {Value: item.Name},
"__zbx_item_name": {Value: item.Name}, "__zbx_item_name": {Value: item.Name},
"__zbx_item_key": {Value: item.Key}, "__zbx_item_key": {Value: item.Key},
"__zbx_item_interval": {Value: item.Delay}, "__zbx_item_interval": {Value: item.Delay},
"__zbx_host": {Value: item.Delay},
} }
if len(item.Hosts) > 0 { if len(item.Hosts) > 0 {
scopedVars["__zbx_host"] = ScopedVar{Value: item.Hosts[0].Name} scopedVars["__zbx_host"] = ScopedVar{Value: item.Hosts[0].Name}