mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Azure Monitor: Fix migration issue with MetricDefinitionsQuery template variable query types (#55262)
* updated imported dashboards * Adds check for MetricDefinitionsQuery in migration * Removed delete from migratio * switched back to const for migratedQ * Added depreacted to MetricDefinitionQuery
This commit is contained in:
parent
93e78e2146
commit
1e9f5a5080
@ -822,7 +822,7 @@
|
||||
"options": [],
|
||||
"query": {
|
||||
"grafanaTemplateVariableFn": {
|
||||
"kind": "MetricDefinitionsQuery",
|
||||
"kind": "MetricNamespaceQuery",
|
||||
"rawQuery": "Namespaces($sub, $rg)",
|
||||
"resourceGroup": "$rg",
|
||||
"subscription": "$sub"
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user