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

Fix tests

Browse Source
This commit is contained in:
dsotirakis
2021-06-07 10:52:45 +03:00
parent 83da8585bc
commit 36536785a2
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/elasticsearch/response_parser.go
+4 -2
View File
@@ -234,13 +234,15 @@ func (rp *responseParser) processMetrics(esAgg *simplejson.Json, target *Query,
metrics := metric.Settings.Get("metrics").MustArray()
for _, metricField := range metrics {
tags := make(map[string]string, len(props))
timeVector := make([]time.Time, 0, len(esAggBuckets))
values := make([]*float64, 0, len(esAggBuckets))
for _, v := range buckets {
bucket := simplejson.NewFromAny(v)
stats := bucket.GetPath(metric.ID, "top")
key := castToFloat(bucket.Get("key"))
tags := make(map[string]string, len(props))
for k, v := range props {
tags[k] = v
}
pkg/tsdb/elasticsearch/response_parser_test.go
+19 -15
View File
@@ -1029,32 +1029,36 @@ func TestResponseParser(t *testing.T) {
assert.NoError(t, err)
assert.Len(t, dataframes, 2)
seriesOne := dataframes[0]
assert.Equal(t, seriesOne.Name, "Top Metrics @value")
assert.Len(t, seriesOne.Fields, 2)
v, _ := seriesOne.FloatAt(0, 0)
frame := dataframes[0]
assert.Equal(t, frame.Name, "Top Metrics @value")
assert.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Len(), 2)
require.Equal(t, frame.Fields[1].Len(), 2)
v, _ := frame.FloatAt(0, 0)
assert.Equal(t, 1609459200000., v)
v, _ = seriesOne.FloatAt(1, 0)
v, _ = frame.FloatAt(1, 0)
assert.Equal(t, 1., v)
v, _ = seriesOne.FloatAt(0, 1)
v, _ = frame.FloatAt(0, 1)
assert.Equal(t, 1609459210000., v)
v, _ = seriesOne.FloatAt(1, 1)
v, _ = frame.FloatAt(1, 1)
assert.Equal(t, 1., v)
seriesTwo := dataframes[1]
assert.Equal(t, seriesTwo.Name, "Top Metrics @anotherValue")
l, _ := seriesTwo.MarshalJSON()
frame = dataframes[1]
assert.Equal(t, frame.Name, "Top Metrics @anotherValue")
l, _ := frame.MarshalJSON()
fmt.Println(string(l))
assert.Len(t, seriesTwo.Fields, 2)
v, _ = seriesTwo.FloatAt(0, 0)
assert.Len(t, frame.Fields, 2)
require.Equal(t, frame.Fields[0].Len(), 2)
require.Equal(t, frame.Fields[1].Len(), 2)
v, _ = frame.FloatAt(0, 0)
assert.Equal(t, 1609459200000., v)
v, _ = seriesTwo.FloatAt(1, 0)
v, _ = frame.FloatAt(1, 0)
assert.Equal(t, 2., v)
v, _ = seriesTwo.FloatAt(0, 1)
v, _ = frame.FloatAt(0, 1)
assert.Equal(t, 1609459210000., v)
v, _ = seriesTwo.FloatAt(1, 1)
v, _ = frame.FloatAt(1, 1)
assert.Equal(t, 2., v)
})
}