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

Skip frontend functions

Browse Source
This commit is contained in:
Alexander Zobnin
2021-05-25 18:12:36 +03:00
parent 51e487deab
commit ff16e2fe8d
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/datasource/response_handler.go
View File

@@ -26,7 +26,13 @@ func convertHistoryToTimeSeries(history zabbix.History, items []*zabbix.Item) []
}
pointSeries := seriesMap[point.ItemID]
if pointSeries.Meta.Item == nil {
itemName := pointItem.ExpandItemName()
pointSeries.Meta.Item = pointItem
pointSeries.Meta.Item.Name = itemName
pointSeries.Meta.Name = itemName
if len(pointItem.Hosts) > 0 {
pointSeries.Meta.Name = fmt.Sprintf("%s: %s", pointItem.Hosts[0].Name, itemName)
}
}
value := point.Value
@@ -51,12 +57,7 @@ func convertTimeSeriesToDataFrame(series []*timeseries.TimeSeriesData) *data.Fra
for _, s := range series {
field := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
item := s.Meta.Item
if len(item.Hosts) > 0 {
field.Name = fmt.Sprintf("%s: %s", item.Hosts[0].Name, item.ExpandItemName())
} else {
field.Name = item.ExpandItemName()
}
field.Name = s.Meta.Name
frame.Fields = append(frame.Fields, field)
}