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

Elasticsearch: Fix legend generated on backend (#66039)

Browse Source 
* Elasticsearch: Fix legend

* Remove comments

* fix adding name to config

* Fix lint
This commit is contained in:
Ivana Huckova
2023-04-11 13:29:38 +02:00
committed by GitHub
parent 05f7ae6c69
commit 3e4eb9c93e
12 changed files with 131 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
+5 -3
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: Average counter
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: Value |
@@ -26,7 +26,6 @@
"frames": [
{
"schema": {
"name": "Average counter",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -49,7 +48,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "Average counter"
}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
+24 -12
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: val3 Max float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -28,7 +28,7 @@
// 0
// ]
// }
// Name: val3 Min float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -49,7 +49,7 @@
// 0
// ]
// }
// Name: val2 Max float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -70,7 +70,7 @@
// 0
// ]
// }
// Name: val2 Min float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -91,7 +91,7 @@
// 0
// ]
// }
// Name: val1 Max float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -112,7 +112,7 @@
// 0
// ]
// }
// Name: val1 Min float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -131,7 +131,6 @@
"frames": [
{
"schema": {
"name": "val3 Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -156,6 +155,9 @@
},
"labels": {
"label": "val3"
},
"config": {
"displayNameFromDS": "val3 Max float"
}
}
]
@@ -177,7 +179,6 @@
},
{
"schema": {
"name": "val3 Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -202,6 +203,9 @@
},
"labels": {
"label": "val3"
},
"config": {
"displayNameFromDS": "val3 Min float"
}
}
]
@@ -223,7 +227,6 @@
},
{
"schema": {
"name": "val2 Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -248,6 +251,9 @@
},
"labels": {
"label": "val2"
},
"config": {
"displayNameFromDS": "val2 Max float"
}
}
]
@@ -269,7 +275,6 @@
},
{
"schema": {
"name": "val2 Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -294,6 +299,9 @@
},
"labels": {
"label": "val2"
},
"config": {
"displayNameFromDS": "val2 Min float"
}
}
]
@@ -315,7 +323,6 @@
},
{
"schema": {
"name": "val1 Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -340,6 +347,9 @@
},
"labels": {
"label": "val1"
},
"config": {
"displayNameFromDS": "val1 Max float"
}
}
]
@@ -361,7 +371,6 @@
},
{
"schema": {
"name": "val1 Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -386,6 +395,9 @@
},
"labels": {
"label": "val1"
},
"config": {
"displayNameFromDS": "val1 Min float"
}
}
]
pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
+10 -6
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: Std Dev Lower counter
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -28,7 +28,7 @@
// 0
// ]
// }
// Name: Std Dev Upper counter
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -47,7 +47,6 @@
"frames": [
{
"schema": {
"name": "Std Dev Lower counter",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -70,7 +69,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "Std Dev Lower counter"
}
}
]
},
@@ -91,7 +93,6 @@
},
{
"schema": {
"name": "Std Dev Upper counter",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -114,7 +115,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "Std Dev Upper counter"
}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
+5 -3
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: Max float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+-------------------+
// | Name: Time | Name: Value |
@@ -26,7 +26,6 @@
"frames": [
{
"schema": {
"name": "Max float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -49,7 +48,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "Max float"
}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
+5 -3
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: Min float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+---------------------+
// | Name: Time | Name: Value |
@@ -26,7 +26,6 @@
"frames": [
{
"schema": {
"name": "Min float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -49,7 +48,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "Min float"
}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
+10 -6
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: p25.0 counter
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: Value |
@@ -28,7 +28,7 @@
// 0
// ]
// }
// Name: p75.0 counter
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: Value |
@@ -47,7 +47,6 @@
"frames": [
{
"schema": {
"name": "p25.0 counter",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -70,7 +69,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "p25.0 counter"
}
}
]
},
@@ -91,7 +93,6 @@
},
{
"schema": {
"name": "p75.0 counter",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -114,7 +115,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "p75.0 counter"
}
}
]
},
pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
+12 -6
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: val3
// Name:
// Dimensions: 2 Fields by 4 Rows
// +-----------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -29,7 +29,7 @@
// 0
// ]
// }
// Name: val2
// Name:
// Dimensions: 2 Fields by 4 Rows
// +-----------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -51,7 +51,7 @@
// 0
// ]
// }
// Name: val1
// Name:
// Dimensions: 2 Fields by 4 Rows
// +-----------------------------------+--------------------+
// | Name: Time | Name: Value |
@@ -71,7 +71,6 @@
"frames": [
{
"schema": {
"name": "val3",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -96,6 +95,9 @@
},
"labels": {
"label": "val3"
},
"config": {
"displayNameFromDS": "val3"
}
}
]
@@ -119,7 +121,6 @@
},
{
"schema": {
"name": "val2",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -144,6 +145,9 @@
},
"labels": {
"label": "val2"
},
"config": {
"displayNameFromDS": "val2"
}
}
]
@@ -167,7 +171,6 @@
},
{
"schema": {
"name": "val1",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -192,6 +195,9 @@
},
"labels": {
"label": "val1"
},
"config": {
"displayNameFromDS": "val1"
}
}
]
pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
+5 -3
View File
@@ -7,7 +7,7 @@
// 0
// ]
// }
// Name: Top Metrics float
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+-------------------+
// | Name: Time | Name: Value |
@@ -26,7 +26,6 @@
"frames": [
{
"schema": {
"name": "Top Metrics float",
"meta": {
"type": "timeseries-multi",
"typeVersion": [
@@ -49,7 +48,10 @@
"frame": "float64",
"nullable": true
},
"labels": {}
"labels": {},
"config": {
"displayNameFromDS": "Top Metrics float"
}
}
]
},