Skip to content

Commit 3c09e46

Browse files
authored
Merge pull request #1689 from Azure/autogenerate
Merge Autogenerate
2 parents 8fd5922 + 1259114 commit 3c09e46

File tree

10 files changed

+1253
-11
lines changed

10 files changed

+1253
-11
lines changed

generator/resources.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,8 @@
14111411
"2019-05-01-preview",
14121412
"2019-06-01",
14131413
"2019-10-01",
1414-
"2019-11-01"
1414+
"2019-11-01",
1415+
"2021-05-01"
14151416
],
14161417
"Microsoft.ContainerInstance/containerGroups": [
14171418
"2017-08-01-preview",
@@ -2981,7 +2982,8 @@
29812982
],
29822983
"Microsoft.Insights/myWorkbooks": [
29832984
"2015-05-01",
2984-
"2020-10-20"
2985+
"2020-10-20",
2986+
"2021-03-08"
29852987
],
29862988
"Microsoft.Insights/privateLinkScopes/privateEndpointConnections": [
29872989
"2019-10-17-preview"
@@ -6428,10 +6430,12 @@
64286430
"2021-03-01"
64296431
],
64306432
"Microsoft.StoragePool/diskPools": [
6431-
"2020-03-15-preview"
6433+
"2020-03-15-preview",
6434+
"2021-04-01-preview"
64326435
],
64336436
"Microsoft.StoragePool/diskPools/iscsiTargets": [
6434-
"2020-03-15-preview"
6437+
"2020-03-15-preview",
6438+
"2021-04-01-preview"
64356439
],
64366440
"Microsoft.StorageSync/storageSyncServices": [
64376441
"2017-06-05-preview",
@@ -7083,7 +7087,8 @@
70837087
"microsoft.insights/workbooks": [
70847088
"2015-05-01",
70857089
"2018-06-17-preview",
7086-
"2020-10-20"
7090+
"2020-10-20",
7091+
"2021-03-08"
70877092
],
70887093
"microsoft.insights/workbooktemplates": [
70897094
"2019-10-17-preview"

schemas/2015-04-01/Microsoft.Insights.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,17 @@
291291
],
292292
"description": "List of dimension conditions. For example: [{\"DimensionName\":\"AppName\",\"Operator\":\"Equals\",\"Values\":[\"App1\"]},{\"DimensionName\":\"Deployment\",\"Operator\":\"Equals\",\"Values\":[\"default\"]}]."
293293
},
294+
"dividePerInstance": {
295+
"oneOf": [
296+
{
297+
"type": "boolean"
298+
},
299+
{
300+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
301+
}
302+
],
303+
"description": "a value indicating whether metric should divide per instance."
304+
},
294305
"metricName": {
295306
"type": "string",
296307
"description": "the name of the metric that defines what the rule monitors."

schemas/2018-05-01/subscriptionDeploymentTemplate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@
198198
{
199199
"$ref": "https://schema.management.azure.com/schemas/2019-11-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
200200
},
201+
{
202+
"$ref": "https://schema.management.azure.com/schemas/2021-05-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
203+
},
201204
{
202205
"$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Datadog.json#/subscription_resourceDefinitions/agreements"
203206
},

schemas/2021-01-01-preview/Microsoft.EventHub.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,15 +1351,16 @@
13511351
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
13521352
}
13531353
],
1354-
"description": "The Event Hubs throughput units, value should be 0 to 20 throughput units."
1354+
"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."
13551355
},
13561356
"name": {
13571357
"oneOf": [
13581358
{
13591359
"type": "string",
13601360
"enum": [
13611361
"Basic",
1362-
"Standard"
1362+
"Standard",
1363+
"Premium"
13631364
]
13641365
},
13651366
{
@@ -1374,7 +1375,8 @@
13741375
"type": "string",
13751376
"enum": [
13761377
"Basic",
1377-
"Standard"
1378+
"Standard",
1379+
"Premium"
13781380
]
13791381
},
13801382
{

schemas/2021-03-01-preview/Microsoft.Confluent.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,7 @@
273273
}
274274
},
275275
"required": [
276-
"emailAddress",
277-
"firstName",
278-
"lastName"
276+
"emailAddress"
279277
],
280278
"description": "Subscriber detail"
281279
}

schemas/2021-03-01-preview/Microsoft.SecurityInsights.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,49 @@
8080
],
8181
"description": "Microsoft.SecurityInsights/dataConnectors"
8282
},
83+
"onboardingStates": {
84+
"type": "object",
85+
"properties": {
86+
"apiVersion": {
87+
"type": "string",
88+
"enum": [
89+
"2021-03-01-preview"
90+
]
91+
},
92+
"etag": {
93+
"type": "string",
94+
"description": "Etag of the azure resource"
95+
},
96+
"name": {
97+
"type": "string",
98+
"description": "The Sentinel onboarding state name. Supports - default"
99+
},
100+
"properties": {
101+
"oneOf": [
102+
{
103+
"$ref": "#/definitions/SentinelOnboardingStateProperties"
104+
},
105+
{
106+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
107+
}
108+
],
109+
"description": "The Sentinel onboarding state properties"
110+
},
111+
"type": {
112+
"type": "string",
113+
"enum": [
114+
"Microsoft.SecurityInsights/onboardingStates"
115+
]
116+
}
117+
},
118+
"required": [
119+
"apiVersion",
120+
"name",
121+
"properties",
122+
"type"
123+
],
124+
"description": "Microsoft.SecurityInsights/onboardingStates"
125+
},
83126
"settings": {
84127
"type": "object",
85128
"oneOf": [
@@ -1724,6 +1767,23 @@
17241767
},
17251768
"description": "Required permissions for the connector"
17261769
},
1770+
"SentinelOnboardingStateProperties": {
1771+
"type": "object",
1772+
"properties": {
1773+
"customerManagedKey": {
1774+
"oneOf": [
1775+
{
1776+
"type": "boolean"
1777+
},
1778+
{
1779+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1780+
}
1781+
],
1782+
"description": "Flag that indicates the status of the CMK setting"
1783+
}
1784+
},
1785+
"description": "The Sentinel onboarding state properties"
1786+
},
17271787
"TIDataConnector": {
17281788
"type": "object",
17291789
"properties": {

0 commit comments

Comments
 (0)