Merge pull request #1689 from Azure/autogenerate

Merge Autogenerate
AzureSDKAutomation · May 7, 2021 · 3c09e46 · 3c09e46
2 parents 8fd5922 + 1259114
commit 3c09e46
Show file tree

Hide file tree

Showing 10 changed files with 1,253 additions and 11 deletions.
diff --git a/generator/resources.json b/generator/resources.json
@@ -1411,7 +1411,8 @@
     "2019-05-01-preview",
     "2019-06-01",
     "2019-10-01",
-    "2019-11-01"
+    "2019-11-01",
+    "2021-05-01"
   ],
   "Microsoft.ContainerInstance/containerGroups": [
     "2017-08-01-preview",
@@ -2981,7 +2982,8 @@
   ],
   "Microsoft.Insights/myWorkbooks": [
     "2015-05-01",
-    "2020-10-20"
+    "2020-10-20",
+    "2021-03-08"
   ],
   "Microsoft.Insights/privateLinkScopes/privateEndpointConnections": [
     "2019-10-17-preview"
@@ -6428,10 +6430,12 @@
     "2021-03-01"
   ],
   "Microsoft.StoragePool/diskPools": [
-    "2020-03-15-preview"
+    "2020-03-15-preview",
+    "2021-04-01-preview"
   ],
   "Microsoft.StoragePool/diskPools/iscsiTargets": [
-    "2020-03-15-preview"
+    "2020-03-15-preview",
+    "2021-04-01-preview"
   ],
   "Microsoft.StorageSync/storageSyncServices": [
     "2017-06-05-preview",
@@ -7083,7 +7087,8 @@
   "microsoft.insights/workbooks": [
     "2015-05-01",
     "2018-06-17-preview",
-    "2020-10-20"
+    "2020-10-20",
+    "2021-03-08"
   ],
   "microsoft.insights/workbooktemplates": [
     "2019-10-17-preview"

diff --git a/schemas/2015-04-01/Microsoft.Insights.json b/schemas/2015-04-01/Microsoft.Insights.json
@@ -291,6 +291,17 @@
           ],
           "description": "List of dimension conditions. For example: [{\"DimensionName\":\"AppName\",\"Operator\":\"Equals\",\"Values\":[\"App1\"]},{\"DimensionName\":\"Deployment\",\"Operator\":\"Equals\",\"Values\":[\"default\"]}]."
         },
+        "dividePerInstance": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "a value indicating whether metric should divide per instance."
+        },
         "metricName": {
           "type": "string",
           "description": "the name of the metric that defines what the rule monitors."

diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -198,6 +198,9 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2019-11-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-05-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Datadog.json#/subscription_resourceDefinitions/agreements"
               },

diff --git a/schemas/2021-01-01-preview/Microsoft.EventHub.json b/schemas/2021-01-01-preview/Microsoft.EventHub.json
@@ -1351,15 +1351,16 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The Event Hubs throughput units, value should be 0 to 20 throughput units."
+          "description": "The Event Hubs throughput units for Basic or Standard tiers, where value should be 0 to 20 throughput units. The Event Hubs premium units for Premium tier, where value should be 0 to 10 premium units."
         },
         "name": {
           "oneOf": [
             {
               "type": "string",
               "enum": [
                 "Basic",
-                "Standard"
+                "Standard",
+                "Premium"
               ]
             },
             {
@@ -1374,7 +1375,8 @@
               "type": "string",
               "enum": [
                 "Basic",
-                "Standard"
+                "Standard",
+                "Premium"
               ]
             },
             {

diff --git a/schemas/2021-03-01-preview/Microsoft.Confluent.json b/schemas/2021-03-01-preview/Microsoft.Confluent.json
@@ -273,9 +273,7 @@
         }
       },
       "required": [
-        "emailAddress",
-        "firstName",
-        "lastName"
+        "emailAddress"
       ],
       "description": "Subscriber detail"
     }

diff --git a/schemas/2021-03-01-preview/Microsoft.SecurityInsights.json b/schemas/2021-03-01-preview/Microsoft.SecurityInsights.json
@@ -80,6 +80,49 @@
       ],
       "description": "Microsoft.SecurityInsights/dataConnectors"
     },
+    "onboardingStates": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01-preview"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Etag of the azure resource"
+        },
+        "name": {
+          "type": "string",
+          "description": "The Sentinel onboarding state name. Supports - default"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SentinelOnboardingStateProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The Sentinel onboarding state properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.SecurityInsights/onboardingStates"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.SecurityInsights/onboardingStates"
+    },
     "settings": {
       "type": "object",
       "oneOf": [
@@ -1724,6 +1767,23 @@
       },
       "description": "Required permissions for the connector"
     },
+    "SentinelOnboardingStateProperties": {
+      "type": "object",
+      "properties": {
+        "customerManagedKey": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag that indicates the status of the CMK setting"
+        }
+      },
+      "description": "The Sentinel onboarding state properties"
+    },
     "TIDataConnector": {
       "type": "object",
       "properties": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -198,6 +198,9 @@ @@
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2019-11-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
                   },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2021-05-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
+                  },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Datadog.json#/subscription_resourceDefinitions/agreements"
                   },
@@ Expand Down @@