root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 80 Packages Projects Releases Wiki Activity

elasticsearch: more robust field order (#65102)

This commit is contained in:
Gábor Farkas 2023-03-21 13:44:10 +01:00 committed by GitHub
parent 23e3ac0ac9
commit 335bcd1e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/tsdb/elasticsearch/response_parser.go
View File

@ -693,7 +693,7 @@ func processAggregationDocs(esAgg *simplejson.Json, aggDef *BucketAgg, target *Q
} }
case percentilesType: case percentilesType:
percentiles := bucket.GetPath(metric.ID, "values") percentiles := bucket.GetPath(metric.ID, "values")
for percentileName := range percentiles.MustMap() { for _, percentileName := range getSortedKeys(percentiles.MustMap()) {
percentileValue := percentiles.Get(percentileName).MustFloat64() percentileValue := percentiles.Get(percentileName).MustFloat64()
addMetricValue(values, fmt.Sprintf("p%v %v", percentileName, metric.Field), &percentileValue) addMetricValue(values, fmt.Sprintf("p%v %v", percentileName, metric.Field), &percentileValue)
} }
@ -1129,3 +1129,14 @@ func createFieldsFromPropKeys(frames data.Frames, propKeys []string) []*data.Fie
} }
return fields return fields
} }
func getSortedKeys(data map[string]interface{}) []string {
keys := make([]string, 0, len(data))
for k := range data {
keys = append(keys, k)
}
sort.Strings(keys)
return keys
}

2
pkg/tsdb/elasticsearch/response_parser_frontend_test.go
View File

@ -1030,7 +1030,7 @@ func TestPercentilesWithoutDateHistogram(t *testing.T) {
"3": { "3": {
"buckets": [ "buckets": [
{ {
"1": { "values": { "75": 3.3, "90": 5.5 } }, "1": { "values": { "90": 5.5, "75": 3.3 } },
"doc_count": 10, "doc_count": 10,
"key": "id1" "key": "id1"
}, },