Fix sortSeries() function, fixes #1274
This commit is contained in:
@@ -353,9 +353,8 @@ func applySortSeries(series []*timeseries.TimeSeriesData, params ...interface{})
|
|||||||
return nil, errParsingFunctionParam(err)
|
return nil, errParsingFunctionParam(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
aggFunc := timeseries.AggAvg
|
timeseries.SortByName(series, order)
|
||||||
sorted := timeseries.SortBy(series, order, aggFunc)
|
return series, nil
|
||||||
return sorted, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyTimeShiftPre(query *QueryModel, items []*zabbix.Item, params ...interface{}) error {
|
func applyTimeShiftPre(query *QueryModel, items []*zabbix.Item, params ...interface{}) error {
|
||||||
|
|||||||
@@ -50,3 +50,15 @@ func SortByItem(series []*TimeSeriesData) []*TimeSeriesData {
|
|||||||
|
|
||||||
return series
|
return series
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func SortByName(series []*TimeSeriesData, order string) []*TimeSeriesData {
|
||||||
|
sort.Slice(series, func(i, j int) bool {
|
||||||
|
if order == "desc" {
|
||||||
|
return series[i].Meta.Name > series[j].Meta.Name
|
||||||
|
} else {
|
||||||
|
return series[i].Meta.Name < series[j].Meta.Name
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return series
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user