CodeGen from PR 14588 in Azure/azure-rest-api-specs

Merge 3c67592066e75e1e972d7ce54d9aa67782d947c5 into c51580c6f102bace66c5bed4b979437c21b81882
AzureSDKAutomation · Jun 30, 2021 · 23e2ba9 · 23e2ba9
1 parent c9b469e
commit 23e2ba9
Show file tree

Hide file tree

Showing 4 changed files with 446 additions and 36 deletions.
diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -318,6 +318,9 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2017-05-01-preview/Microsoft.Insights.json#/subscription_resourceDefinitions/diagnosticSettings"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-05-01-preview/Microsoft.Insights.json#/subscription_resourceDefinitions/diagnosticSettings"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2019-06-01-preview/Microsoft.ManagedNetwork.json#/unknown_resourceDefinitions/scopeAssignments"
               },

diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
@@ -171,6 +171,9 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2020-01-01-preview/Microsoft.Insights.json#/managementGroup_resourceDefinitions/diagnosticSettings"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-05-01-preview/Microsoft.Insights.json#/managementGroup_resourceDefinitions/diagnosticSettings"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2018-07-01-preview/Microsoft.PolicyInsights.json#/unknown_resourceDefinitions/remediations"
               },

diff --git a/schemas/2021-02-01-preview/Microsoft.Insights.json b/schemas/2021-02-01-preview/Microsoft.Insights.json
@@ -80,31 +80,6 @@
     }
   },
   "definitions": {
-    "Action": {
-      "type": "object",
-      "properties": {
-        "actionGroupId": {
-          "type": "string",
-          "description": "Action Group resource Id to invoke when the alert fires."
-        },
-        "webHookProperties": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a webhook object."
-        }
-      },
-      "description": "Actions to invoke when the alert fires."
-    },
     "Condition": {
       "type": "object",
       "properties": {
@@ -297,17 +272,8 @@
       "type": "object",
       "properties": {
         "actions": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/Action"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "object",
+          "properties": {},
           "description": "Actions to invoke when the alert fires."
         },
         "autoMitigate": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -318,6 +318,9 @@ @@
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2017-05-01-preview/Microsoft.Insights.json#/subscription_resourceDefinitions/diagnosticSettings"
                   },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2021-05-01-preview/Microsoft.Insights.json#/subscription_resourceDefinitions/diagnosticSettings"
+                  },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2019-06-01-preview/Microsoft.ManagedNetwork.json#/unknown_resourceDefinitions/scopeAssignments"
                   },
@@ Expand Down @@