From f0842bfb7e0c0c912f00f6f67c2226dacccf1f40 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 19 Apr 2022 17:54:36 +0300 Subject: [PATCH] Fix missing labels in response data frame --- pkg/datasource/response_handler.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/datasource/response_handler.go b/pkg/datasource/response_handler.go index edafab6..0931516 100644 --- a/pkg/datasource/response_handler.go +++ b/pkg/datasource/response_handler.go @@ -116,16 +116,25 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val Name: seriesName, } } + scopedVars := map[string]ScopedVar{ "__zbx_item": {Value: item.Name}, "__zbx_item_name": {Value: item.Name}, "__zbx_item_key": {Value: item.Key}, "__zbx_item_interval": {Value: item.Delay}, } + + valueField.Labels = data.Labels{ + "item": item.Name, + "item_key": item.Key, + } + if len(item.Hosts) > 0 { scopedVars["__zbx_host"] = 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{ Custom: map[string]interface{}{ "scopedVars": scopedVars,