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

Refactor: remove unused code

Browse Source
This commit is contained in:
Alexander Zobnin
2022-05-06 12:18:15 +03:00
parent 84419de6f5
commit daaf2b634d
1 changed files with 0 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
pkg/datasource/response_handler.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/alexanderzobnin/grafana-zabbix/pkg/gtime" "github.com/alexanderzobnin/grafana-zabbix/pkg/gtime"
"github.com/alexanderzobnin/grafana-zabbix/pkg/timeseries" "github.com/alexanderzobnin/grafana-zabbix/pkg/timeseries"
"github.com/alexanderzobnin/grafana-zabbix/pkg/zabbix" "github.com/alexanderzobnin/grafana-zabbix/pkg/zabbix"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana-plugin-sdk-go/data"
) )
@@ -54,44 +53,6 @@ func convertHistoryToTimeSeries(history zabbix.History, items []*zabbix.Item) []
return series return series
} }
func convertTimeSeriesToDataFrame(series []*timeseries.TimeSeriesData) *data.Frame {
timeFileld := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
timeFileld.Name = "time"
frame := data.NewFrame("History", timeFileld)
if len(series) == 0 {
return frame
}
for _, s := range series {
field := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
field.Name = s.Meta.Name
frame.Fields = append(frame.Fields, field)
}
for i, s := range series {
currentFieldIndex := i + 1
for _, point := range s.TS {
timeFileld.Append(point.Time)
for fieldIndex, field := range frame.Fields {
if fieldIndex == currentFieldIndex {
field.Append(point.Value)
} else if fieldIndex > 0 {
field.Append(nil)
}
}
}
}
wideFrame, err := data.LongToWide(frame, &data.FillMissing{Mode: data.FillModeNull})
if err != nil {
backend.Logger.Debug("Error converting data frame to the wide format", "error", err)
return frame
}
return wideFrame
}
func convertTimeSeriesToDataFrames(series []*timeseries.TimeSeriesData, valuemaps []zabbix.ValueMap) []*data.Frame { func convertTimeSeriesToDataFrames(series []*timeseries.TimeSeriesData, valuemaps []zabbix.ValueMap) []*data.Frame {
frames := make([]*data.Frame, 0) frames := make([]*data.Frame, 0)
@@ -158,46 +119,6 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
return frame return frame
} }
func convertHistoryToDataFrame(history zabbix.History, items []*zabbix.Item) *data.Frame {
timeFileld := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
timeFileld.Name = "time"
frame := data.NewFrame("History", timeFileld)
for _, item := range items {
field := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
if len(item.Hosts) > 0 {
field.Name = fmt.Sprintf("%s: %s", item.Hosts[0].Name, item.ExpandItemName())
} else {
field.Name = item.ExpandItemName()
}
frame.Fields = append(frame.Fields, field)
}
for _, point := range history {
for columnIndex, field := range frame.Fields {
if columnIndex == 0 {
ts := time.Unix(point.Clock, point.NS)
field.Append(ts)
} else {
item := items[columnIndex-1]
if point.ItemID == item.ID {
value := point.Value
field.Append(&value)
} else {
field.Append(nil)
}
}
}
}
wideFrame, err := data.LongToWide(frame, &data.FillMissing{Mode: data.FillModeNull})
if err != nil {
backend.Logger.Debug("Error converting data frame to the wide format", "error", err)
return frame
}
return wideFrame
}
func convertTrendToHistory(trend zabbix.Trend, valueType string) (zabbix.History, error) { func convertTrendToHistory(trend zabbix.Trend, valueType string) (zabbix.History, error) {
history := make([]zabbix.HistoryPoint, 0) history := make([]zabbix.HistoryPoint, 0)
for _, point := range trend { for _, point := range trend {