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

Use time series format internally

Browse Source
This commit is contained in:
Alexander Zobnin
2021-05-24 17:11:36 +03:00
parent f3d6fa3c2b
commit 7748508a5c
6 changed files with 125 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/datasource/zabbix.go
View File

@@ -60,7 +60,7 @@ func (ds *ZabbixDatasourceInstance) queryNumericItems(ctx context.Context, query
return frames, nil
}
func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context, query *QueryModel, items zabbix.Items) (*data.Frame, error) {
func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context, query *QueryModel, items []*zabbix.Item) (*data.Frame, error) {
valueType := ds.getTrendValueType(query)
consolidateBy := ds.getConsolidateBy(query)
@@ -73,7 +73,12 @@ func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context
return nil, err
}
frame := convertHistoryToDataFrame(history, items)
series := convertHistoryToTimeSeries(history, items)
// TODO: handle time series functions
frame := convertTimeSeriesToDataFrame(series)
// frame := convertHistoryToDataFrame(history, items)
return frame, nil
}
@@ -100,7 +105,7 @@ func (ds *ZabbixDatasourceInstance) getConsolidateBy(query *QueryModel) string {
return consolidateBy
}
func (ds *ZabbixDatasourceInstance) getHistotyOrTrend(ctx context.Context, query *QueryModel, items zabbix.Items, trendValueType string) (zabbix.History, error) {
func (ds *ZabbixDatasourceInstance) getHistotyOrTrend(ctx context.Context, query *QueryModel, items []*zabbix.Item, trendValueType string) (zabbix.History, error) {
timeRange := query.TimeRange
useTrend := ds.isUseTrend(timeRange)