public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug which appended same fields over and over again

Browse Source
This commit is contained in:
dsotirakis
2021-06-04 17:26:59 +03:00
parent a311f2e664
commit 804a1d7125
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/elasticsearch/response_parser.go
+4
View File
@@ -210,6 +210,8 @@ func (rp *responseParser) processMetrics(esAgg *simplejson.Json, target *Query,
sort.Strings(percentileKeys)
for _, percentileName := range percentileKeys {
tags := make(map[string]string, len(props))
timeVector := make([]time.Time, 0, len(esAggBuckets))
values := make([]*float64, 0, len(esAggBuckets))
for k, v := range props {
tags[k] = v
@@ -285,6 +287,8 @@ func (rp *responseParser) processMetrics(esAgg *simplejson.Json, target *Query,
}
tags := make(map[string]string, len(props))
timeVector := make([]time.Time, 0, len(esAggBuckets))
values := make([]*float64, 0, len(esAggBuckets))
for k, v := range props {
tags[k] = v
pkg/tsdb/elasticsearch/response_parser_test.go
+10 -10
View File
@@ -333,9 +333,9 @@ func TestResponseParser(t *testing.T) {
require.Equal(t, frame.Name, "p90")
require.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Name, "time")
require.Equal(t, frame.Fields[0].Len(), 4)
require.Equal(t, frame.Fields[0].Len(), 2)
require.Equal(t, frame.Fields[1].Name, "value")
require.Equal(t, frame.Fields[1].Len(), 4)
require.Equal(t, frame.Fields[1].Len(), 2)
})
t.Run("With extended stats", func(t *testing.T) {
@@ -417,17 +417,17 @@ func TestResponseParser(t *testing.T) {
require.Equal(t, frame.Name, "server1 Std Dev Lower")
require.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Name, "time")
require.Equal(t, frame.Fields[0].Len(), 2)
require.Equal(t, frame.Fields[0].Len(), 1)
require.Equal(t, frame.Fields[1].Name, "value")
require.Equal(t, frame.Fields[1].Len(), 2)
require.Equal(t, frame.Fields[1].Len(), 1)
frame = dataframes[2]
require.Equal(t, frame.Name, "server1 Std Dev Upper")
require.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Name, "time")
require.Equal(t, frame.Fields[0].Len(), 3)
require.Equal(t, frame.Fields[0].Len(), 1)
require.Equal(t, frame.Fields[1].Name, "value")
require.Equal(t, frame.Fields[1].Len(), 3)
require.Equal(t, frame.Fields[1].Len(), 1)
frame = dataframes[3]
require.Equal(t, frame.Name, "server2 Max")
@@ -441,17 +441,17 @@ func TestResponseParser(t *testing.T) {
require.Equal(t, frame.Name, "server2 Std Dev Lower")
require.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Name, "time")
require.Equal(t, frame.Fields[0].Len(), 2)
require.Equal(t, frame.Fields[0].Len(), 1)
require.Equal(t, frame.Fields[1].Name, "value")
require.Equal(t, frame.Fields[1].Len(), 2)
require.Equal(t, frame.Fields[1].Len(), 1)
frame = dataframes[5]
require.Equal(t, frame.Name, "server2 Std Dev Upper")
require.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Name, "time")
require.Equal(t, frame.Fields[0].Len(), 3)
require.Equal(t, frame.Fields[0].Len(), 1)
require.Equal(t, frame.Fields[1].Name, "value")
require.Equal(t, frame.Fields[1].Len(), 3)
require.Equal(t, frame.Fields[1].Len(), 1)
})
t.Run("Single group by with alias pattern", func(t *testing.T) {