IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

elasticsearch: sort bucket keys to fix issue wth response parser tests

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-06-04 15:15:47 +02:00
parent 49d9235433
commit 38906acda9
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,15 +113,22 @@ func (rp *responseParser) processBuckets(aggs map[string]interface{}, target *Qu
} }
} }
for k, v := range esAgg.Get("buckets").MustMap() { buckets := esAgg.Get("buckets").MustMap()
bucket := simplejson.NewFromAny(v) bucketKeys := make([]string, 0)
for k := range buckets {
bucketKeys = append(bucketKeys, k)
}
sort.Strings(bucketKeys)
for _, bucketKey := range bucketKeys {
bucket := simplejson.NewFromAny(buckets[bucketKey])
newProps := make(map[string]string, 0) newProps := make(map[string]string, 0)
for k, v := range props { for k, v := range props {
newProps[k] = v newProps[k] = v
} }
newProps["filter"] = k newProps["filter"] = bucketKey
err = rp.processBuckets(bucket.MustMap(), target, series, table, newProps, depth+1) err = rp.processBuckets(bucket.MustMap(), target, series, table, newProps, depth+1)
if err != nil { if err != nil {