Fix missing labels in response data frame

grafana · Apr 19, 2022 · f0842bf · f0842bf
1 parent 91ad43b
commit f0842bf
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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,