From 71f8d10f0669de24311ad5e867a3027edfe07b7d Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Tue, 8 Jun 2021 11:32:02 +0300 Subject: [PATCH 1/8] Moved webHookProperties from inside Action to ScheduledQueryRuleProperties --- .../scheduledQueryRule_API.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json index c10fe1c4a857..fdb06f1cff71 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json @@ -316,14 +316,6 @@ "actionGroupId": { "type": "string", "description": "Action Group resource Id to invoke when the alert fires." - }, - "webHookProperties": { - "type": "object", - "additionalProperties": { - "type": "string", - "description": "The dictionary of custom properties to include with the post operation. These data are appended to the webhook payload." - }, - "description": "The properties of a webhook object." } } }, @@ -411,6 +403,14 @@ }, "description": "Actions to invoke when the alert fires." }, + "webHookProperties": { + "type": "object", + "additionalProperties": { + "type": "string", + "description": "The dictionary of custom properties to include with the post operation. These data are appended to the webhook payload." + }, + "description": "The properties of a webhook object." + }, "isWorkspaceAlertsStorageConfigured": { "type": "boolean", "readOnly": true, From b3218a23f1306c4148e6743c06aab2471bbcd1ca Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Tue, 8 Jun 2021 11:42:33 +0300 Subject: [PATCH 2/8] Updated webHookProperties location in all examples --- .../createOrUpdateScheduledQueryRule.json | 36 +++++++++---------- ...UpdateScheduledQueryRuleResourceGroup.json | 36 +++++++++---------- ...rUpdateScheduledQueryRuleSubscription.json | 36 +++++++++---------- .../examples/getScheduledQueryRule.json | 12 +++---- ...istScheduledQueryRulesByResourceGroup.json | 24 ++++++------- ...listScheduledQueryRulesBySubscription.json | 24 ++++++------- .../examples/patchScheduledQueryRule.json | 12 +++---- 7 files changed, 90 insertions(+), 90 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json index a5f4a76a85e9..77090f8313b4 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json @@ -50,13 +50,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } }, @@ -113,13 +113,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } }, @@ -175,13 +175,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json index 808247601259..69d80d6de91f 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json @@ -36,13 +36,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } }, @@ -85,13 +85,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } }, @@ -133,13 +133,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json index bd3bfab4d0d7..708b5ce5f9bf 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json @@ -53,13 +53,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } }, @@ -119,13 +119,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } }, @@ -184,13 +184,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json index 01d24ea4ae94..97bd49fb40fd 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json @@ -58,13 +58,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json index 03b6e2d84f36..fcf43a1fc3f2 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json @@ -62,13 +62,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } }, { @@ -107,13 +107,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } ] diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json index 16dacf228515..a25e70436872 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json @@ -61,13 +61,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } }, { @@ -106,13 +106,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } ] diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json index 8d7dd8d59bb8..da6477944201 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json @@ -49,13 +49,13 @@ "muteActionsDuration": "PT30M", "actions": [ { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup", - "webHookProperties": { - "key11": "value11", - "key12": "value12" - } + "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" } - ] + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" + } } } } From 93706fe1d0e6d03393a9e4770d85a5f2d3665e07 Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Tue, 8 Jun 2021 15:20:48 +0300 Subject: [PATCH 3/8] Using new Actions field with an actionGroups array and webHookProperties --- .../createOrUpdateScheduledQueryRule.json | 42 +++++++++---------- ...UpdateScheduledQueryRuleResourceGroup.json | 42 +++++++++---------- ...rUpdateScheduledQueryRuleSubscription.json | 42 +++++++++---------- .../examples/getScheduledQueryRule.json | 14 +++---- ...istScheduledQueryRulesByResourceGroup.json | 28 ++++++------- ...listScheduledQueryRulesBySubscription.json | 28 ++++++------- .../examples/patchScheduledQueryRule.json | 14 +++---- .../scheduledQueryRule_API.json | 31 +++++++------- 8 files changed, 122 insertions(+), 119 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json index 77090f8313b4..f4a19eaec09a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json @@ -48,14 +48,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } @@ -111,14 +111,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } @@ -173,14 +173,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json index 69d80d6de91f..ac9a51664b18 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json @@ -34,14 +34,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } @@ -83,14 +83,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } @@ -131,14 +131,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json index 708b5ce5f9bf..8413f7444c0e 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json @@ -51,14 +51,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } @@ -117,14 +117,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } @@ -182,14 +182,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json index 97bd49fb40fd..ec3d77ec9a23 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json @@ -56,14 +56,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json index fcf43a1fc3f2..aacb91dfbc54 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json @@ -60,14 +60,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } }, @@ -105,14 +105,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json index a25e70436872..695f6631913d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json @@ -59,14 +59,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } }, @@ -104,14 +104,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json index da6477944201..ed1011f97025 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json @@ -47,14 +47,14 @@ ] }, "muteActionsDuration": "PT30M", - "actions": [ - { - "actionGroupId": "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + "actions": { + "actionGroups": [ + "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" + ], + "webHookProperties": { + "key11": "value11", + "key12": "value12" } - ], - "webHookProperties": { - "key11": "value11", - "key12": "value12" } } } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json index fdb06f1cff71..fe5b62cc8b38 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json @@ -309,13 +309,24 @@ } }, "definitions": { - "Action": { + "Actions": { "type": "object", "description": "Actions to invoke when the alert fires.", "properties": { - "actionGroupId": { - "type": "string", - "description": "Action Group resource Id to invoke when the alert fires." + "actionGroups": { + "type": "array", + "items": { + "type": "string", + "description": "Action Group resource Ids to invoke when the alert fires." + } + }, + "webHookProperties": { + "type": "object", + "additionalProperties": { + "type": "string", + "description": "The dictionary of custom properties to include with the post operation. These data are appended to the webhook payload." + }, + "description": "The properties of a webhook object." } } }, @@ -397,20 +408,12 @@ "description": "Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired. Relevant only for rules of the kind LogAlert." }, "actions": { - "type": "array", + "type": "object", "items": { - "$ref": "#/definitions/Action" + "$ref": "#/definitions/Actions" }, "description": "Actions to invoke when the alert fires." }, - "webHookProperties": { - "type": "object", - "additionalProperties": { - "type": "string", - "description": "The dictionary of custom properties to include with the post operation. These data are appended to the webhook payload." - }, - "description": "The properties of a webhook object." - }, "isWorkspaceAlertsStorageConfigured": { "type": "boolean", "readOnly": true, From f0914f6381aae9ec66d8dcf5cd0921d072ee8c0b Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Tue, 8 Jun 2021 16:17:58 +0300 Subject: [PATCH 4/8] Renamed webHookProperties to actionProperties --- .../examples/createOrUpdateScheduledQueryRule.json | 6 +++--- .../createOrUpdateScheduledQueryRuleResourceGroup.json | 6 +++--- .../createOrUpdateScheduledQueryRuleSubscription.json | 6 +++--- .../2021-02-01-preview/examples/getScheduledQueryRule.json | 2 +- .../examples/listScheduledQueryRulesByResourceGroup.json | 4 ++-- .../examples/listScheduledQueryRulesBySubscription.json | 4 ++-- .../examples/patchScheduledQueryRule.json | 2 +- .../preview/2021-02-01-preview/scheduledQueryRule_API.json | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json index f4a19eaec09a..48c9e1705d03 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json @@ -52,7 +52,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -115,7 +115,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -177,7 +177,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json index ac9a51664b18..41adac964de7 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json @@ -38,7 +38,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -87,7 +87,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -135,7 +135,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json index 8413f7444c0e..ab95ddf05033 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json @@ -55,7 +55,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -121,7 +121,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -186,7 +186,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json index ec3d77ec9a23..1f69f92734a7 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json @@ -60,7 +60,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json index aacb91dfbc54..7ae3ca9fa185 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json @@ -64,7 +64,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -109,7 +109,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json index 695f6631913d..b90faebcbb7d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json @@ -63,7 +63,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } @@ -108,7 +108,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json index ed1011f97025..736f1df48a0d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json @@ -51,7 +51,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "webHookProperties": { + "actionProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json index fe5b62cc8b38..a79c5178feb3 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json @@ -320,13 +320,13 @@ "description": "Action Group resource Ids to invoke when the alert fires." } }, - "webHookProperties": { + "actionProperties": { "type": "object", "additionalProperties": { "type": "string", - "description": "The dictionary of custom properties to include with the post operation. These data are appended to the webhook payload." + "description": "The dictionary of custom properties to include with the post operation. These data are appended to the alert payload." }, - "description": "The properties of a webhook object." + "description": "The properties of an alert payload." } } }, From 2e236356ba99894d0aff069ba6c15bb10ed19ea0 Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Tue, 8 Jun 2021 18:13:40 +0300 Subject: [PATCH 5/8] Prettier fix --- package-lock.json | 3 ++- .../preview/2021-02-01-preview/scheduledQueryRule_API.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c112b7c88c93..a4a252ff48d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3764,7 +3764,7 @@ "requires": { "esprima": "1.2.2", "static-eval": "2.0.2", - "underscore": "^1.12.1" + "underscore": "1.7.0" }, "dependencies": { "esprima": { @@ -5957,6 +5957,7 @@ "version": "3.12.1", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz", "integrity": "sha512-o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ==", + "dev": true, "optional": true }, "underscore": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json index a79c5178feb3..1f99c391ffbb 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json @@ -313,7 +313,7 @@ "type": "object", "description": "Actions to invoke when the alert fires.", "properties": { - "actionGroups": { + "actionGroups": { "type": "array", "items": { "type": "string", From 5d1aa5f4754c8e806dca20af0f319b1ad90ce836 Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Tue, 8 Jun 2021 22:20:18 +0300 Subject: [PATCH 6/8] Renamed actionProperties to customProperties --- .../examples/createOrUpdateScheduledQueryRule.json | 6 +++--- .../createOrUpdateScheduledQueryRuleResourceGroup.json | 6 +++--- .../createOrUpdateScheduledQueryRuleSubscription.json | 6 +++--- .../2021-02-01-preview/examples/getScheduledQueryRule.json | 2 +- .../examples/listScheduledQueryRulesByResourceGroup.json | 4 ++-- .../examples/listScheduledQueryRulesBySubscription.json | 4 ++-- .../examples/patchScheduledQueryRule.json | 2 +- .../preview/2021-02-01-preview/scheduledQueryRule_API.json | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json index 48c9e1705d03..2f3fe528dcb9 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json @@ -52,7 +52,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -115,7 +115,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -177,7 +177,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json index 41adac964de7..dd34bbdebb64 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleResourceGroup.json @@ -38,7 +38,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -87,7 +87,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -135,7 +135,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json index ab95ddf05033..4c4e90962745 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRuleSubscription.json @@ -55,7 +55,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -121,7 +121,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -186,7 +186,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json index 1f69f92734a7..c5785d29624b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/getScheduledQueryRule.json @@ -60,7 +60,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json index 7ae3ca9fa185..32c65a82c215 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesByResourceGroup.json @@ -64,7 +64,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -109,7 +109,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json index b90faebcbb7d..6e08765816d7 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/listScheduledQueryRulesBySubscription.json @@ -63,7 +63,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } @@ -108,7 +108,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json index 736f1df48a0d..bdc7b71cec97 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/patchScheduledQueryRule.json @@ -51,7 +51,7 @@ "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ], - "actionProperties": { + "customProperties": { "key11": "value11", "key12": "value12" } diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json index 1f99c391ffbb..d000ef52abaf 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json @@ -320,7 +320,7 @@ "description": "Action Group resource Ids to invoke when the alert fires." } }, - "actionProperties": { + "customProperties": { "type": "object", "additionalProperties": { "type": "string", From 2b5b322ef8bc9a796f952b8e2d26460dc307250e Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Wed, 9 Jun 2021 07:00:01 +0300 Subject: [PATCH 7/8] Fixed description for actionGroups --- .../preview/2021-02-01-preview/scheduledQueryRule_API.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json index d000ef52abaf..d6e5846da71a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json @@ -316,9 +316,9 @@ "actionGroups": { "type": "array", "items": { - "type": "string", - "description": "Action Group resource Ids to invoke when the alert fires." - } + "type": "string" + }, + "description": "Action Group resource Ids to invoke when the alert fires." }, "customProperties": { "type": "object", From 25277ca99f0e4beb6e75a782333c127e8329358c Mon Sep 17 00:00:00 2001 From: Avi Jerafi Date: Wed, 9 Jun 2021 11:14:15 +0300 Subject: [PATCH 8/8] Prettier fix for example --- .../examples/createOrUpdateScheduledQueryRule.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json index 2f3fe528dcb9..4e52e254e432 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-02-01-preview/examples/createOrUpdateScheduledQueryRule.json @@ -111,7 +111,7 @@ ] }, "muteActionsDuration": "PT30M", - "actions": { + "actions": { "actionGroups": [ "/subscriptions/1cf177ed-1330-4692-80ea-fd3d7783b147/resourcegroups/sqrapi/providers/microsoft.insights/actiongroups/myactiongroup" ],