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

elastic: backend: handle naming bucket_scripts (#60460)

Browse Source
This commit is contained in:
Gábor Farkas 2023-01-04 15:26:57 +01:00 committed by GitHub
parent 72d257ed4f
commit 12c4098bcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,8 +592,8 @@ func getFieldName(dataField data.Field, target *Query, metricTypeCount int) stri
return frameName return frameName
} }
// todo, if field and pipelineAgg // todo, if field and pipelineAgg
if field != "" && isPipelineAgg(metricType) { if isPipelineAgg(metricType) {
if isPipelineAggWithMultipleBucketPaths(metricType) { if metricType != "" && isPipelineAggWithMultipleBucketPaths(metricType) {
metricID := "" metricID := ""
if v, ok := dataField.Labels["metricId"]; ok { if v, ok := dataField.Labels["metricId"]; ok {
metricID = v metricID = v
@ -612,15 +612,17 @@ func getFieldName(dataField data.Field, target *Query, metricTypeCount int) stri
} }
} }
} else { } else {
found := false if field != "" {
for _, metric := range target.Metrics { found := false
if metric.ID == field { for _, metric := range target.Metrics {
metricName += " " + describeMetric(metric.Type, field) if metric.ID == field {
found = true metricName += " " + describeMetric(metric.Type, field)
found = true
}
}
if !found {
metricName = "Unset"
} }
}
if !found {
metricName = "Unset"
} }
} }
} else if field != "" { } else if field != "" {

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

@ -1281,7 +1281,7 @@ func TestBucketScript(t *testing.T) {
requireFrameLength(t, frames[0], 2) requireFrameLength(t, frames[0], 2)
requireTimeSeriesName(t, "Sum @value", frames[0]) requireTimeSeriesName(t, "Sum @value", frames[0])
requireTimeSeriesName(t, "Max @value", frames[1]) requireTimeSeriesName(t, "Max @value", frames[1])
// requireTimeSeriesName(t, "Sum @value * Max @value", frames[2]) // FIXME requireTimeSeriesName(t, "Sum @value * Max @value", frames[2])
requireNumberValue(t, 2, frames[0], 0) requireNumberValue(t, 2, frames[0], 0)
requireNumberValue(t, 3, frames[1], 0) requireNumberValue(t, 3, frames[1], 0)

3
pkg/tsdb/elasticsearch/response_parser_test.go
View File

@ -912,7 +912,6 @@ func TestResponseParser(t *testing.T) {
{ "id": "3", "type": "max", "field": "@value" }, { "id": "3", "type": "max", "field": "@value" },
{ {
"id": "4", "id": "4",
"field": "select field",
"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }], "pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
"settings": { "script": "params.var1 * params.var2" }, "settings": { "script": "params.var1 * params.var2" },
"type": "bucket_script" "type": "bucket_script"
@ -991,14 +990,12 @@ func TestResponseParser(t *testing.T) {
{ "id": "3", "type": "max", "field": "@value" }, { "id": "3", "type": "max", "field": "@value" },
{ {
"id": "4", "id": "4",
"field": "select field",
"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }], "pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
"settings": { "script": "params.var1 * params.var2" }, "settings": { "script": "params.var1 * params.var2" },
"type": "bucket_script" "type": "bucket_script"
}, },
{ {
"id": "5", "id": "5",
"field": "select field",
"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }], "pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
"settings": { "script": "params.var1 * params.var2 * 2" }, "settings": { "script": "params.var1 * params.var2 * 2" },
"type": "bucket_script" "type": "bucket_script"