From d0e49402eb5ac2d0175b1b3cf4c0d2b1a96ff013 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Wed, 27 Jan 2021 13:53:49 -0800 Subject: [PATCH 01/12] Updated error response for Action Groups API --- .../stable/2019-06-01/actionGroups_API.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index 3a132ee2cbff..492f63c9d02d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -807,7 +807,16 @@ "description": "Describes the format of Error response.", "type": "object", "properties": { - "code": { + "error": { + "description": "The error object.", + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "ErrorDetail": { + "description": "The error detail.", + "properties": { + "code": { "description": "Error code", "type": "string" }, @@ -816,7 +825,7 @@ "type": "string" } } - }, + }, "ActionGroupPatchBody": { "description": "An action group object for the body of patch operations.", "properties": { From ff2e84f5f54f83e48b109775282d170f1e0ec5de Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Wed, 27 Jan 2021 13:57:49 -0800 Subject: [PATCH 02/12] spacing --- .../Microsoft.Insights/stable/2019-06-01/actionGroups_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index 492f63c9d02d..66eb238bfcc1 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -825,7 +825,7 @@ "type": "string" } } - }, + }, "ActionGroupPatchBody": { "description": "An action group object for the body of patch operations.", "properties": { From 368cf473b2ee038bc14b50c8d3c3c1463053fdef Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Fri, 29 Jan 2021 12:47:32 -0800 Subject: [PATCH 03/12] added missing fields to Action Group Resource spec --- .../stable/2019-06-01/actionGroups_API.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index 66eb238bfcc1..f87acb53297c 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -352,6 +352,16 @@ "readOnly": true, "description": "Azure resource type" }, + "kind": { + "type": "string", + "readOnly": true, + "description": "Azure resource kind" + }, + "identity": { + "type": "string", + "readOnly": true, + "description": "Azure resource identity" + }, "location": { "type": "string", "description": "Resource location", From 43bde072637ae6b3d57a417d11463e45b4925ebf Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Fri, 29 Jan 2021 12:58:16 -0800 Subject: [PATCH 04/12] Added missing fields for action group resource in older version --- .../stable/2019-03-01/actionGroups_API.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json index 2d4abcb438fb..84807b0e9670 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json @@ -352,6 +352,16 @@ "readOnly": true, "description": "Azure resource type" }, + "kind": { + "type": "string", + "readOnly": true, + "description": "Azure resource kind" + }, + "identity": { + "type": "string", + "readOnly": true, + "description": "Azure resource identity" + }, "location": { "type": "string", "description": "Resource location", From 88de008baea573ca3bea495361d8f0b83027aeea Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Mon, 8 Feb 2021 16:05:52 -0800 Subject: [PATCH 05/12] Updated "resource" name --- .../stable/2019-03-01/actionGroups_API.json | 4 ++-- .../stable/2019-06-01/actionGroups_API.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json index 84807b0e9670..37a6c7dd628d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json @@ -335,7 +335,7 @@ } }, "definitions": { - "Resource": { + "AzureResource": { "properties": { "id": { "type": "string", @@ -387,7 +387,7 @@ "description": "An action group resource.", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/AzureResource" } ], "properties": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index f87acb53297c..a5b4766b72a4 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -335,7 +335,7 @@ } }, "definitions": { - "Resource": { + "AzureResource": { "properties": { "id": { "type": "string", @@ -387,7 +387,7 @@ "description": "An action group resource.", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/AzureResource" } ], "properties": { From 807854796ecc94027d1b128d549a98832d6110ca Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Thu, 25 Feb 2021 15:56:06 -0800 Subject: [PATCH 06/12] Removed changes to errorResponse --- .../stable/2019-06-01/actionGroups_API.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index a5b4766b72a4..b222706b74c0 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -817,9 +817,13 @@ "description": "Describes the format of Error response.", "type": "object", "properties": { - "error": { - "description": "The error object.", - "$ref": "#/definitions/ErrorDetail" + "code": { + "description": "Error code", + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string" } } }, From 653c6bbab5a27d9caaeb63b239aea351b091b791 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Thu, 25 Feb 2021 15:57:31 -0800 Subject: [PATCH 07/12] Removed errorObject --- .../stable/2019-06-01/actionGroups_API.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index b222706b74c0..b5a013459dca 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -826,19 +826,7 @@ "type": "string" } } - }, - "ErrorDetail": { - "description": "The error detail.", - "properties": { - "code": { - "description": "Error code", - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "type": "string" - } - } + } }, "ActionGroupPatchBody": { "description": "An action group object for the body of patch operations.", From e6bcbb8805791b6cafb9810fafd0c791dec355e6 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Thu, 25 Feb 2021 15:58:29 -0800 Subject: [PATCH 08/12] format --- .../Microsoft.Insights/stable/2019-06-01/actionGroups_API.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index b5a013459dca..519fa09d498a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -826,8 +826,7 @@ "type": "string" } } - } - }, + }, "ActionGroupPatchBody": { "description": "An action group object for the body of patch operations.", "properties": { From d3f98c8bcf368e32523cfe1578ce54382511b198 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Fri, 26 Mar 2021 13:02:52 -0700 Subject: [PATCH 09/12] Updated required and default fields in Action groups spec --- .../stable/2019-03-01/actionGroups_API.json | 41 +++++++++++++------ .../stable/2019-06-01/actionGroups_API.json | 24 +++++------ 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json index 37a6c7dd628d..24bf91638567 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json @@ -516,6 +516,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": false, "description": "Indicates whether to use common alert schema." }, "status": { @@ -526,8 +527,7 @@ }, "required": [ "name", - "emailAddress", - "useCommonAlertSchema" + "emailAddress" ] }, "SmsReceiver": { @@ -570,13 +570,30 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": false, "description": "Indicates whether to use common alert schema." + }, + "useAadAuth": { + "type": "boolean", + "default": false, + "description": "Indicates whether or not use AAD authentication." + }, + "objectId": { + "type": "string", + "description": "Indicates the webhook app object Id for aad auth." + }, + "identifierUri": { + "type": "string", + "description": "Indicates the identifier uri for aad auth." + }, + "tenantId": { + "type": "string", + "description": "Indicates the tenant id for aad auth." } }, "required": [ "name", - "serviceUri", - "useCommonAlertSchema" + "serviceUri" ] }, "ItsmReceiver": { @@ -657,6 +674,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": false, "description": "Indicates whether to use common alert schema." } }, @@ -664,8 +682,7 @@ "automationAccountId", "runbookName", "webhookResourceId", - "isGlobalRunbook", - "useCommonAlertSchema" + "isGlobalRunbook" ] }, "VoiceReceiver": { @@ -707,14 +724,14 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": false, "description": "Indicates whether to use common alert schema." } }, "required": [ "name", "resourceId", - "callbackUrl", - "useCommonAlertSchema" + "callbackUrl" ] }, "AzureFunctionReceiver": { @@ -738,6 +755,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": false, "description": "Indicates whether to use common alert schema." } }, @@ -745,8 +763,7 @@ "name", "functionAppResourceId", "functionName", - "httpTriggerUrl", - "useCommonAlertSchema" + "httpTriggerUrl" ] }, "ArmRoleReceiver": { @@ -762,13 +779,13 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": false, "description": "Indicates whether to use common alert schema." } }, "required": [ "name", - "roleId", - "useCommonAlertSchema" + "roleId" ] }, "ReceiverStatus": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index 519fa09d498a..d6f8634ccaaf 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -516,6 +516,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": "false", "description": "Indicates whether to use common alert schema." }, "status": { @@ -526,8 +527,7 @@ }, "required": [ "name", - "emailAddress", - "useCommonAlertSchema" + "emailAddress" ] }, "SmsReceiver": { @@ -570,6 +570,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": "false", "description": "Indicates whether to use common alert schema." }, "useAadAuth": { @@ -592,8 +593,7 @@ }, "required": [ "name", - "serviceUri", - "useCommonAlertSchema" + "serviceUri" ] }, "ItsmReceiver": { @@ -674,6 +674,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": "false", "description": "Indicates whether to use common alert schema." } }, @@ -681,8 +682,7 @@ "automationAccountId", "runbookName", "webhookResourceId", - "isGlobalRunbook", - "useCommonAlertSchema" + "isGlobalRunbook" ] }, "VoiceReceiver": { @@ -724,14 +724,14 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": "false", "description": "Indicates whether to use common alert schema." } }, "required": [ "name", "resourceId", - "callbackUrl", - "useCommonAlertSchema" + "callbackUrl" ] }, "AzureFunctionReceiver": { @@ -755,6 +755,7 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": "false", "description": "Indicates whether to use common alert schema." } }, @@ -762,8 +763,7 @@ "name", "functionAppResourceId", "functionName", - "httpTriggerUrl", - "useCommonAlertSchema" + "httpTriggerUrl" ] }, "ArmRoleReceiver": { @@ -779,13 +779,13 @@ }, "useCommonAlertSchema": { "type": "boolean", + "default": "false", "description": "Indicates whether to use common alert schema." } }, "required": [ "name", - "roleId", - "useCommonAlertSchema" + "roleId" ] }, "ReceiverStatus": { From 2cef53faea16ffc8ca3a4ad34c3d23d641409741 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra <21337621+ritwik8119@users.noreply.github.com> Date: Wed, 31 Mar 2021 13:17:24 -0700 Subject: [PATCH 10/12] Update default value to boolean Co-authored-by: kai ru <69238381+kairu-ms@users.noreply.github.com> --- .../stable/2019-06-01/actionGroups_API.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index d6f8634ccaaf..344767320616 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -674,7 +674,7 @@ }, "useCommonAlertSchema": { "type": "boolean", - "default": "false", + "default": false, "description": "Indicates whether to use common alert schema." } }, @@ -724,7 +724,7 @@ }, "useCommonAlertSchema": { "type": "boolean", - "default": "false", + "default": false, "description": "Indicates whether to use common alert schema." } }, @@ -755,7 +755,7 @@ }, "useCommonAlertSchema": { "type": "boolean", - "default": "false", + "default": false, "description": "Indicates whether to use common alert schema." } }, @@ -779,7 +779,7 @@ }, "useCommonAlertSchema": { "type": "boolean", - "default": "false", + "default": false, "description": "Indicates whether to use common alert schema." } }, From f3832a38e820547c682081e44beb43d028fe2be8 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Wed, 31 Mar 2021 13:35:16 -0700 Subject: [PATCH 11/12] changes default value type to boolean --- .../stable/2019-06-01/actionGroups_API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json index d6f8634ccaaf..b6d8efac30fb 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-06-01/actionGroups_API.json @@ -516,7 +516,7 @@ }, "useCommonAlertSchema": { "type": "boolean", - "default": "false", + "default": false, "description": "Indicates whether to use common alert schema." }, "status": { @@ -570,7 +570,7 @@ }, "useCommonAlertSchema": { "type": "boolean", - "default": "false", + "default": false, "description": "Indicates whether to use common alert schema." }, "useAadAuth": { From 31ab2184988aba0ca52069ad6857a3e3fb0ccbf2 Mon Sep 17 00:00:00 2001 From: Ritwik Rajendra Date: Fri, 2 Apr 2021 12:19:03 -0700 Subject: [PATCH 12/12] undo webhook receiver changes --- .../stable/2019-03-01/actionGroups_API.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json index 24bf91638567..f7bf2ef3138b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2019-03-01/actionGroups_API.json @@ -572,23 +572,6 @@ "type": "boolean", "default": false, "description": "Indicates whether to use common alert schema." - }, - "useAadAuth": { - "type": "boolean", - "default": false, - "description": "Indicates whether or not use AAD authentication." - }, - "objectId": { - "type": "string", - "description": "Indicates the webhook app object Id for aad auth." - }, - "identifierUri": { - "type": "string", - "description": "Indicates the identifier uri for aad auth." - }, - "tenantId": { - "type": "string", - "description": "Indicates the tenant id for aad auth." } }, "required": [