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

Fix missing labels in response data frame

Browse Source
This commit is contained in:
Alexander Zobnin
2022-04-19 17:54:36 +03:00
parent 91ad43bdda
commit f0842bfb7e
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/datasource/response_handler.go
View File

@@ -116,16 +116,25 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
Name: seriesName, 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},
} }
valueField.Labels = data.Labels{
"item": item.Name,
"item_key": item.Key,
}
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}
scopedVars["__zbx_host_name"] = ScopedVar{Value: item.Hosts[0].Name} scopedVars["__zbx_host_name"] = ScopedVar{Value: item.Hosts[0].Name}
valueField.Labels["host"] = item.Hosts[0].Name
} }
valueField.Config = &data.FieldConfig{ valueField.Config = &data.FieldConfig{
Custom: map[string]interface{}{ Custom: map[string]interface{}{
"scopedVars": scopedVars, "scopedVars": scopedVars,