public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
+30 -42
View File
@@ -7,10 +7,10 @@
// 0
// ]
// }
// Name:
// Name: val3 Max float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val3 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -28,10 +28,10 @@
// 0
// ]
// }
// Name:
// Name: val3 Min float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val3 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -49,10 +49,10 @@
// 0
// ]
// }
// Name:
// Name: val2 Max float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val2 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -70,10 +70,10 @@
// 0
// ]
// }
// Name:
// Name: val2 Min float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val2 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -91,10 +91,10 @@
// 0
// ]
// }
// Name:
// Name: val1 Max float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val1 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -112,10 +112,10 @@
// 0
// ]
// }
// Name:
// Name: val1 Min float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val1 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -131,6 +131,7 @@
"frames": [
{
"schema": {
"name": "val3 Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -140,14 +141,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -155,9 +156,6 @@
},
"labels": {
"label": "val3"
},
"config": {
"displayNameFromDS": "val3 Max float"
}
}
]
@@ -179,6 +177,7 @@
},
{
"schema": {
"name": "val3 Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -188,14 +187,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -203,9 +202,6 @@
},
"labels": {
"label": "val3"
},
"config": {
"displayNameFromDS": "val3 Min float"
}
}
]
@@ -227,6 +223,7 @@
},
{
"schema": {
"name": "val2 Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -236,14 +233,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -251,9 +248,6 @@
},
"labels": {
"label": "val2"
},
"config": {
"displayNameFromDS": "val2 Max float"
}
}
]
@@ -275,6 +269,7 @@
},
{
"schema": {
"name": "val2 Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -284,14 +279,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -299,9 +294,6 @@
},
"labels": {
"label": "val2"
},
"config": {
"displayNameFromDS": "val2 Min float"
}
}
]
@@ -323,6 +315,7 @@
},
{
"schema": {
"name": "val1 Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -332,14 +325,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -347,9 +340,6 @@
},
"labels": {
"label": "val1"
},
"config": {
"displayNameFromDS": "val1 Max float"
}
}
]
@@ -371,6 +361,7 @@
},
{
"schema": {
"name": "val1 Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -380,14 +371,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -395,9 +386,6 @@
},
"labels": {
"label": "val1"
},
"config": {
"displayNameFromDS": "val1 Min float"
}
}
]
pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
+6 -8
View File
@@ -7,10 +7,10 @@
// 0
// ]
// }
// Name:
// Name: Max float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+-------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+-------------------+
@@ -26,6 +26,7 @@
"frames": [
{
"schema": {
"name": "Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -35,23 +36,20 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "Max float"
}
"labels": {}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
+6 -8
View File
@@ -7,10 +7,10 @@
// 0
// ]
// }
// Name:
// Name: Min float
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+---------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+---------------------+
@@ -26,6 +26,7 @@
"frames": [
{
"schema": {
"name": "Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -35,23 +36,20 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "Min float"
}
"labels": {}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
+15 -21
View File
@@ -7,10 +7,10 @@
// 0
// ]
// }
// Name:
// Name: val3
// Dimensions: 2 Fields by 4 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val3 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -29,10 +29,10 @@
// 0
// ]
// }
// Name:
// Name: val2
// Dimensions: 2 Fields by 4 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val2 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -51,10 +51,10 @@
// 0
// ]
// }
// Name:
// Name: val1
// Dimensions: 2 Fields by 4 Rows
// +-------------------------------+--------------------+
// | Name: time | Name: value |
// | Name: Time | Name: Value |
// | Labels: | Labels: label=val1 |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+--------------------+
@@ -71,6 +71,7 @@
"frames": [
{
"schema": {
"name": "val3",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -80,14 +81,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -95,9 +96,6 @@
},
"labels": {
"label": "val3"
},
"config": {
"displayNameFromDS": "val3"
}
}
]
@@ -121,6 +119,7 @@
},
{
"schema": {
"name": "val2",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -130,14 +129,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -145,9 +144,6 @@
},
"labels": {
"label": "val2"
},
"config": {
"displayNameFromDS": "val2"
}
}
]
@@ -171,6 +167,7 @@
},
{
"schema": {
"name": "val1",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -180,14 +177,14 @@
},
"fields": [
{
"name": "time",
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "value",
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
@@ -195,9 +192,6 @@
},
"labels": {
"label": "val1"
},
"config": {
"displayNameFromDS": "val1"
}
}
]