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

Elasticsearch: Fix where name of frame is set (#64233)

Browse Source 
* Elasticsearch: Use displayName field for naming

* Change solution to frame.Name to be backward compatible

* Fix snapshot tests

* Use Time and Value for time and value fields

* Use variables from grafana-plugin-sdk-go for name
This commit is contained in:
Ivana Huckova
2023-03-08 13:32:01 +01:00
committed by GitHub
parent 1cb39b3523
commit aa123e0d50
8 changed files with 158 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ func parseResponse(responses []*es.SearchResponse, targets []*Query, configuredF
if err != nil {
return &backend.QueryDataResponse{}, err
}
nameFields(queryRes, target)
nameFrames(queryRes, target)
trimDatapoints(queryRes, target)
result.Responses[target.RefID] = queryRes
@@ -381,8 +381,8 @@ func processBuckets(aggs map[string]interface{}, target *Query,
func newTimeSeriesFrame(timeData []time.Time, tags map[string]string, values []*float64) *data.Frame {
frame := data.NewFrame("",
data.NewField("time", nil, timeData),
data.NewField("value", tags, values))
data.NewField(data.TimeSeriesTimeFieldName, nil, timeData),
data.NewField(data.TimeSeriesValueFieldName, tags, values))
frame.Meta = &data.FrameMeta{
Type: data.FrameTypeTimeSeriesMulti,
}
@@ -777,7 +777,7 @@ func getSortedLabelValues(labels data.Labels) []string {
return values
}
func nameFields(queryResult backend.DataResponse, target *Query) {
func nameFrames(queryResult backend.DataResponse, target *Query) {
set := make(map[string]struct{})
frames := queryResult.Frames
for _, v := range frames {
@@ -796,9 +796,7 @@ func nameFields(queryResult backend.DataResponse, target *Query) {
// another is "number"
valueField := frame.Fields[1]
fieldName := getFieldName(*valueField, target, metricTypeCount)
if fieldName != "" {
valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: fieldName})
}
frame.Name = fieldName
}
}
}