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

Fix displaying metric names and alias functions, closes #1444

Browse Source
This commit is contained in:
Alexander Zobnin
2022-05-06 12:17:06 +03:00
parent 6d8689c660
commit 84419de6f5
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/datasource/response_handler.go
View File

@@ -103,8 +103,8 @@ func convertTimeSeriesToDataFrames(series []*timeseries.TimeSeriesData, valuemap
}
func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.ValueMap) *data.Frame {
timeFileld := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
timeFileld.Name = data.TimeSeriesTimeFieldName
timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
timeField.Name = data.TimeSeriesTimeFieldName
seriesName := series.Meta.Name
valueField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
@@ -136,6 +136,7 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
}
valueField.Config = &data.FieldConfig{
DisplayNameFromDS: seriesName,
Custom: map[string]interface{}{
"scopedVars": scopedVars,
"units": item.Units,
@@ -147,10 +148,10 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
valueField.Config.Mappings = mappings
}
frame := data.NewFrame(seriesName, timeFileld, valueField)
frame := data.NewFrame(seriesName, timeField, valueField)
for _, point := range series.TS {
timeFileld.Append(point.Time)
timeField.Append(point.Time)
valueField.Append(point.Value)
}