opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 22:59:43 +08: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
3 changed files with 13 additions and 14 deletions
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
}
// todo, if field and pipelineAgg
if field != "" && isPipelineAgg(metricType) {
if isPipelineAggWithMultipleBucketPaths(metricType) {
if isPipelineAgg(metricType) {
if metricType != "" && isPipelineAggWithMultipleBucketPaths(metricType) {
metricID := ""
if v, ok := dataField.Labels["metricId"]; ok {
metricID = v
@ -612,15 +612,17 @@ func getFieldName(dataField data.Field, target *Query, metricTypeCount int) stri
}
}
} else {
found := false
for _, metric := range target.Metrics {
if metric.ID == field {
metricName += " " + describeMetric(metric.Type, field)
found = true
if field != "" {
found := false
for _, metric := range target.Metrics {
if metric.ID == field {
metricName += " " + describeMetric(metric.Type, field)
found = true
}
}
if !found {
metricName = "Unset"
}
}
if !found {
metricName = "Unset"
}
}
} else if field != "" {