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

Merge c5348f1ea4f524575ffa72ce044a696d5c937cbf into 7a4a64310bec1f7f59bbdd8e8ab04ca938cbc3e6
AzureSDKAutomation · Jul 21, 2021 · 77ebeef · 77ebeef
1 parent 7f6414a
commit 77ebeef
Show file tree

Hide file tree

Showing 8 changed files with 758 additions and 18 deletions.
diff --git a/schemas/2014-04-01/Microsoft.Insights.json b/schemas/2014-04-01/Microsoft.Insights.json
diff --git a/schemas/2015-04-01/Microsoft.Insights.json b/schemas/2015-04-01/Microsoft.Insights.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.Insights.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.insights",
-  "description": "microsoft insights Resource Types",
+  "title": "Microsoft.Insights",
+  "description": "Microsoft Insights Resource Types",
   "resourceDefinitions": {
     "autoscalesettings": {
       "type": "object",
@@ -50,7 +50,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "microsoft.insights/autoscalesettings"
+            "Microsoft.Insights/autoscalesettings"
           ]
         }
       },
@@ -61,7 +61,7 @@
         "properties",
         "type"
       ],
-      "description": "microsoft.insights/autoscalesettings"
+      "description": "Microsoft.Insights/autoscalesettings"
     }
   },
   "definitions": {
@@ -222,6 +222,10 @@
           ],
           "description": "the collection of automatic scaling profiles that specify different scaling parameters for different time periods. A maximum of 20 profiles can be specified."
         },
+        "targetResourceLocation": {
+          "type": "string",
+          "description": "the location of the resource that the autoscale setting should be added to."
+        },
         "targetResourceUri": {
           "type": "string",
           "description": "the resource identifier of the resource that the autoscale setting should be added to."
@@ -252,7 +256,8 @@
         "sendToSubscriptionAdministrator": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -263,7 +268,8 @@
         "sendToSubscriptionCoAdministrators": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -310,6 +316,10 @@
           "type": "string",
           "description": "the namespace of the metric that defines what the rule monitors."
         },
+        "metricResourceLocation": {
+          "type": "string",
+          "description": "the location of the resource the rule monitors."
+        },
         "metricResourceUri": {
           "type": "string",
           "description": "the resource identifier of the resource the rule monitors."
@@ -341,7 +351,8 @@
                 "Average",
                 "Min",
                 "Max",
-                "Sum"
+                "Sum",
+                "Count"
               ]
             },
             {
@@ -534,7 +545,8 @@
               "enum": [
                 "ChangeCount",
                 "PercentChangeCount",
-                "ExactCount"
+                "ExactCount",
+                "ServiceAllowedNextValue"
               ]
             },
             {

diff --git a/schemas/2016-03-01/Microsoft.Insights.json b/schemas/2016-03-01/Microsoft.Insights.json
@@ -111,7 +111,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "microsoft.insights/logprofiles"
+            "Microsoft.Insights/logprofiles"
           ]
         }
       },
@@ -122,7 +122,7 @@
         "properties",
         "type"
       ],
-      "description": "microsoft.insights/logprofiles"
+      "description": "Microsoft.Insights/logprofiles"
     }
   },
   "definitions": {

diff --git a/schemas/2017-05-01-preview/Microsoft.Insights.json b/schemas/2017-05-01-preview/Microsoft.Insights.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2017-05-01-preview/Microsoft.Insights.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.insights",
-  "description": "microsoft insights Resource Types",
+  "title": "Microsoft.Insights",
+  "description": "Microsoft Insights Resource Types",
   "resourceDefinitions": {},
   "subscription_resourceDefinitions": {
     "diagnosticSettings": {
@@ -77,7 +77,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "microsoft.insights/diagnosticSettings"
+            "Microsoft.Insights/diagnosticSettings"
           ]
         }
       },
@@ -87,7 +87,7 @@
         "properties",
         "type"
       ],
-      "description": "microsoft.insights/diagnosticSettings"
+      "description": "Microsoft.Insights/diagnosticSettings"
     }
   },
   "definitions": {

diff --git a/schemas/2018-04-16/Microsoft.Insights.json b/schemas/2018-04-16/Microsoft.Insights.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2018-04-16/Microsoft.Insights.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.insights",
-  "description": "microsoft insights Resource Types",
+  "title": "Microsoft.Insights",
+  "description": "Microsoft Insights Resource Types",
   "resourceDefinitions": {
     "scheduledQueryRules": {
       "type": "object",
@@ -50,7 +50,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "microsoft.insights/scheduledQueryRules"
+            "Microsoft.Insights/scheduledQueryRules"
           ]
         }
       },
@@ -61,7 +61,7 @@
         "properties",
         "type"
       ],
-      "description": "microsoft.insights/scheduledQueryRules"
+      "description": "Microsoft.Insights/scheduledQueryRules"
     }
   },
   "definitions": {

diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -812,6 +812,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/2021-05-01-preview/Microsoft.Insights.json b/schemas/2021-05-01-preview/Microsoft.Insights.json
@@ -157,6 +157,10 @@
           ],
           "description": "The list of logs settings."
         },
+        "marketplacePartnerId": {
+          "type": "string",
+          "description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs."
+        },
         "metrics": {
           "oneOf": [
             {
@@ -250,6 +254,10 @@
           ],
           "description": "The list of logs settings."
         },
+        "marketplacePartnerId": {
+          "type": "string",
+          "description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs."
+        },
         "serviceBusRuleId": {
           "type": "string",
           "description": "The service bus rule Id of the diagnostic setting. This is here to maintain backwards compatibility."
@@ -391,6 +399,10 @@
           ],
           "description": "The list of logs settings."
         },
+        "marketplacePartnerId": {
+          "type": "string",
+          "description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs."
+        },
         "serviceBusRuleId": {
           "type": "string",
           "description": "The service bus rule Id of the diagnostic setting. This is here to maintain backwards compatibility."

diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
@@ -6223,6 +6223,9 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings"
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -812,6 +812,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 @@