|
|
|
@ -937,9 +937,6 @@ func TestSettingsCasting(t *testing.T) { |
|
|
|
|
t.Run("Inline Script", func(t *testing.T) { |
|
|
|
|
t.Run("Correctly handles scripts for ES < 5.6", func(t *testing.T) { |
|
|
|
|
c := newFakeClient("5.0.0") |
|
|
|
|
|
|
|
|
|
for key := range scriptableAggType { |
|
|
|
|
t.Run("Inline Script", func(t *testing.T) { |
|
|
|
|
_, err := executeTsdbQuery(c, `{ |
|
|
|
|
"timeField": "@timestamp", |
|
|
|
|
"bucketAggs": [ |
|
|
|
@ -948,14 +945,14 @@ func TestSettingsCasting(t *testing.T) { |
|
|
|
|
"metrics": [ |
|
|
|
|
{ |
|
|
|
|
"id": "1", |
|
|
|
|
"type": "`+key+`", |
|
|
|
|
"type": "avg", |
|
|
|
|
"settings": { |
|
|
|
|
"script": "my_script" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
"id": "3", |
|
|
|
|
"type": "`+key+`", |
|
|
|
|
"type": "avg", |
|
|
|
|
"settings": { |
|
|
|
|
"script": { |
|
|
|
|
"inline": "my_script" |
|
|
|
@ -974,15 +971,9 @@ func TestSettingsCasting(t *testing.T) { |
|
|
|
|
assert.Equal(t, map[string]interface{}{"inline": "my_script"}, newFormatAggSettings["script"]) |
|
|
|
|
assert.Equal(t, map[string]interface{}{"inline": "my_script"}, oldFormatAggSettings["script"]) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
t.Run("Correctly handles scripts for ES >= 5.6", func(t *testing.T) { |
|
|
|
|
c := newFakeClient("5.6.0") |
|
|
|
|
|
|
|
|
|
for key := range scriptableAggType { |
|
|
|
|
fmt.Println(key) |
|
|
|
|
t.Run("Inline Script", func(t *testing.T) { |
|
|
|
|
_, err := executeTsdbQuery(c, `{ |
|
|
|
|
"timeField": "@timestamp", |
|
|
|
|
"bucketAggs": [ |
|
|
|
@ -991,14 +982,14 @@ func TestSettingsCasting(t *testing.T) { |
|
|
|
|
"metrics": [ |
|
|
|
|
{ |
|
|
|
|
"id": "1", |
|
|
|
|
"type": "`+key+`", |
|
|
|
|
"type": "avg", |
|
|
|
|
"settings": { |
|
|
|
|
"script": "my_script" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
{
|
|
|
|
|
"id": "3", |
|
|
|
|
"type": "`+key+`", |
|
|
|
|
"type": "avg", |
|
|
|
|
"settings": { |
|
|
|
|
"script": { |
|
|
|
|
"inline": "my_script" |
|
|
|
@ -1017,8 +1008,6 @@ func TestSettingsCasting(t *testing.T) { |
|
|
|
|
assert.Equal(t, "my_script", newFormatAggSettings["script"]) |
|
|
|
|
assert.Equal(t, "my_script", oldFormatAggSettings["script"]) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|