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

Elasticsearch: Fix processing of response with multiple group by for alerting (#65165)

Browse Source 
* Elasticsearch: Fix processing of response with multiple group by on backend

* Remove unused param from createFields

* Switch comments
This commit is contained in:
Ivana Huckova
2023-03-22 18:53:09 +02:00
committed by GitHub
parent adcdf190bb
commit ae0f9fc44f
2 changed files with 99 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/elasticsearch/response_parser.go
+11 -4
View File
@@ -665,7 +665,7 @@ func processAggregationDocs(esAgg *simplejson.Json, aggDef *BucketAgg, target *Q
queryResult *backend.DataResponse, props map[string]string) error {
propKeys := createPropKeys(props)
frames := data.Frames{}
fields := createFieldsFromPropKeys(queryResult.Frames, propKeys)
fields := createFields(queryResult.Frames, propKeys)
for _, v := range esAgg.Get("buckets").MustArray() {
bucket := simplejson.NewFromAny(v)
@@ -675,7 +675,8 @@ func processAggregationDocs(esAgg *simplejson.Json, aggDef *BucketAgg, target *Q
for _, field := range fields {
for _, propKey := range propKeys {
if field.Name == propKey {
field.Append(props[propKey])
value := props[propKey]
field.Append(&value)
}
}
if field.Name == aggDef.Field {
@@ -1134,9 +1135,15 @@ func setSearchWords(frame *data.Frame, searchWords map[string]bool) {
}
}
func createFieldsFromPropKeys(frames data.Frames, propKeys []string) []*data.Field {
func createFields(frames data.Frames, propKeys []string) []*data.Field {
var fields []*data.Field
if frames == nil {
// Otherwise use the fields from frames
if frames != nil {
for _, frame := range frames {
fields = append(fields, frame.Fields...)
}
// If we have no frames, we create fields from propKeys
} else {
for _, propKey := range propKeys {
fields = append(fields, data.NewField(propKey, nil, []*string{}))
}