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

Azure Monitor: Fix migration issue with MetricDefinitionsQuery template variable query types (#55262) (#55359)

Browse Source 
* updated imported dashboards

* Adds check for MetricDefinitionsQuery in migration

* Removed delete from migratio

* switched back to const for migratedQ

* Added depreacted to MetricDefinitionQuery

(cherry picked from commit 1e9f5a5080)

Co-authored-by: Yaelle Chaudy <42030685+yaelleC@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)
2022-09-19 11:33:31 +02:00
committed by GitHub
co-authored by Yaelle Chaudy
parent 2f1f764364
commit 4c1225219c
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsightsGeoMap.json
+1 -1
View File
@@ -822,7 +822,7 @@
"options": [],
"query": {
"grafanaTemplateVariableFn": {
"kind": "MetricDefinitionsQuery",
"kind": "MetricNamespaceQuery",
"rawQuery": "Namespaces($sub, $rg)",
"resourceGroup": "$rg",
"subscription": "$sub"
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/networkInsightsDashboard.json
+4 -4
View File
@@ -1870,7 +1870,7 @@
"options": [],
"query": {
"grafanaTemplateVariableFn": {
"kind": "MetricDefinitionsQuery",
"kind": "MetricNamespaceQuery",
"rawQuery": "namespaces($sub,$rg)",
"resourceGroup": "$rg",
"subscription": "$sub"
@@ -1898,7 +1898,7 @@
"options": [],
"query": {
"grafanaTemplateVariableFn": {
"kind": "MetricDefinitionsQuery",
"kind": "MetricNamespaceQuery",
"rawQuery": "namespaces($sub,$rg)",
"resourceGroup": "$rg",
"subscription": "$sub"
@@ -1926,7 +1926,7 @@
"options": [],
"query": {
"grafanaTemplateVariableFn": {
"kind": "MetricDefinitionsQuery",
"kind": "MetricNamespaceQuery",
"rawQuery": "namespaces($sub,$rg)",
"resourceGroup": "$rg",
"subscription": "$sub"
@@ -1954,7 +1954,7 @@
"options": [],
"query": {
"grafanaTemplateVariableFn": {
"kind": "MetricDefinitionsQuery",
"kind": "MetricNamespaceQuery",
"rawQuery": "namespaces($sub,$rg)",
"resourceGroup": "$rg",
"subscription": "$sub"
public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts
+3
View File
@@ -287,6 +287,9 @@ const migrateGrafanaTemplateVariableFn = (query: AzureMonitorQuery) => {
case 'MetricNamespaceQuery':
migratedQuery.queryType = AzureQueryType.NamespacesQuery;
break;
case 'MetricDefinitionsQuery':
migratedQuery.queryType = AzureQueryType.NamespacesQuery;
break;
case 'MetricNamesQuery':
migratedQuery.queryType = AzureQueryType.MetricNamesQuery;
break;
public/app/plugins/datasource/grafana-azure-monitor-datasource/types/templateVariables.ts
+9
View File
@@ -43,6 +43,14 @@ export interface MetricNamespaceQuery extends BaseGrafanaTemplateVariableQuery {
metricNamespace?: string;
resourceName?: string;
}
/** @deprecated Use MetricNamespaceQuery instead */
export interface MetricDefinitionsQuery extends BaseGrafanaTemplateVariableQuery {
kind: 'MetricDefinitionsQuery';
subscription: string;
resourceGroup: string;
metricNamespace?: string;
resourceName?: string;
}
export interface MetricNamesQuery extends BaseGrafanaTemplateVariableQuery {
kind: 'MetricNamesQuery';
subscription: string;
@@ -62,6 +70,7 @@ export type GrafanaTemplateVariableQuery =
| ResourceGroupsQuery
| ResourceNamesQuery
| MetricNamespaceQuery
| MetricDefinitionsQuery
| MetricNamesQuery
| WorkspacesQuery
| UnknownQuery;