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

Azure: AzureMonitorMetrics - change response to be dataplane compliant (#69308)

Browse Source 
* Azure: AzureMonitorMetrics - change response to be dataplane compliant
can be disabled via toggle azureMonitorDataplane
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
This commit is contained in:
Kyle Brandt
2023-07-24 16:50:49 +03:00
committed by GitHub
parent c280f884f0
commit ee60d8c82d
26 changed files with 515 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
Vendored
+56 -4
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+------------------------------------------------------+
@@ -17,7 +23,13 @@
//
//
//
// Frame[1]
// Frame[1] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+------------------------------------------------------+
@@ -34,7 +46,13 @@
//
//
//
// Frame[2]
// Frame[2] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+--------------------------------------------------------+
@@ -51,7 +69,13 @@
//
//
//
// Frame[3]
// Frame[3] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+--------------------------------------------------------+
@@ -73,6 +97,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -135,6 +166,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -197,6 +235,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -259,6 +304,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json
Vendored
+47
View File
@@ -0,0 +1,47 @@
{
"cost": 0,
"timespan": "2019-02-08T10:13:50Z\/2019-02-08T16:13:50Z",
"interval": "PT1M",
"value": [
{
"id": "\/subscriptions\/xxx\/resourceGroups\/grafanastaging\/providers\/Microsoft.Compute\/virtualMachines\/grafana\/providers\/Microsoft.Insights\/metrics\/Percentage CPU",
"type": "Microsoft.Insights\/metrics",
"name": {
"value": "Percentage CPU",
"localizedValue": "Percentage CPU"
},
"unit": "Percent",
"timeseries": [
{
"metadatavalues": [
],
"data": [
{
"timeStamp": "2019-02-08T10:13:00Z",
"average": 2.0875
},
{
"timeStamp": "2019-02-08T10:14:00Z",
"average": 2.1525
},
{
"timeStamp": "2019-02-08T10:15:00Z",
"average": 2.155
},
{
"timeStamp": "2019-02-08T10:16:00Z",
"average": 3.6925
},
{
"timeStamp": "2019-02-08T10:17:00Z",
"average": 2.44
}
]
}
]
}
],
"namespace": "Microsoft.Compute\/virtualMachines",
"resourceregion": "westeurope"
}
pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json.non-dataplane-compliant-response.golden.jsonc
Vendored
+83
View File
@@ -0,0 +1,83 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
// | Name: Time | Name: Percentage CPU |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*float64 |
// +-------------------------------+----------------------+
// | 2019-02-08 10:13:00 +0000 UTC | 2.0875 |
// | 2019-02-08 10:14:00 +0000 UTC | 2.1525 |
// | 2019-02-08 10:15:00 +0000 UTC | 2.155 |
// | 2019-02-08 10:16:00 +0000 UTC | 3.6925 |
// | 2019-02-08 10:17:00 +0000 UTC | 2.44 |
// +-------------------------------+----------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
},
"config": {
"links": [
{
"title": "View in Azure Portal",
"targetBlank": true,
"url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
}
]
}
},
{
"name": "Percentage CPU",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"labels": {},
"config": {
"unit": "percent",
"links": [
{
"title": "View in Azure Portal",
"targetBlank": true,
"url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
}
]
}
}
]
},
"data": {
"values": [
[
1549620780000,
1549620840000,
1549620900000,
1549620960000,
1549621020000
],
[
2.0875,
2.1525,
2.155,
3.6925,
2.44
]
]
}
}
]
}
pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+----------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
Vendored
+42 -3
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 6 Rows
// +-------------------------------+---------------------------+
@@ -18,7 +24,13 @@
//
//
//
// Frame[1]
// Frame[1] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 6 Rows
// +-------------------------------+----------------------------+
@@ -36,7 +48,13 @@
//
//
//
// Frame[2]
// Frame[2] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 6 Rows
// +-------------------------------+------------------------------------------+
@@ -59,6 +77,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -122,6 +147,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -185,6 +217,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
Vendored
+42 -3
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 6 Rows
// +-------------------------------+---------------------------+
@@ -18,7 +24,13 @@
//
//
//
// Frame[1]
// Frame[1] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 6 Rows
// +-------------------------------+----------------------------+
@@ -36,7 +48,13 @@
//
//
//
// Frame[2]
// Frame[2] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 6 Rows
// +-------------------------------+------------------------------------------+
@@ -59,6 +77,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -123,6 +148,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -187,6 +219,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
Vendored
+42 -3
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+------------------------------------------+
@@ -15,7 +21,13 @@
//
//
//
// Frame[1]
// Frame[1] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+--------------------------------------+
@@ -30,7 +42,13 @@
//
//
//
// Frame[2]
// Frame[2] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 3 Rows
// +-------------------------------+-----------------------------------------------------+
@@ -50,6 +68,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -109,6 +134,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
@@ -168,6 +200,13 @@
},
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 1 Rows
// +-------------------------------+----------------------+
@@ -18,6 +24,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",
pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
Vendored
+14 -1
View File
@@ -1,6 +1,12 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0]
// Frame[0] {
// "type": "timeseries-multi",
// "typeVersion": [
// 0,
// 1
// ]
// }
// Name:
// Dimensions: 2 Fields by 5 Rows
// +-------------------------------+------------------------------+
@@ -22,6 +28,13 @@
"frames": [
{
"schema": {
"meta": {
"type": "timeseries-multi",
"typeVersion": [
0,
1
]
},
"fields": [
{
"name": "Time",