Skip to content

Commit d4d7ea6

Browse files
dhaimanarolshan
dhaiman
and
arolshan
authored
AssociatedWorkspaces and CapacityReservationProperties added to cluster (#11736)
* AssociatedWorkspaces and CapacityReservationProperties added to cluster. Cluser defualt error bug fixed * change AssociatedWorkspaces to array * fix validation errors * fix validation errors * missing token added * read only properties deleted * read only properties deleted * LintDIff Errors Fixed * LACluster added to WorkspaceSku * update error description * revert types.json changes * add prettier * change default error response to use V2 format * use V2 types.json file Co-authored-by: Arie Olshanezky <[email protected]>
1 parent 03adb71 commit d4d7ea6

File tree

6 files changed

+212
-106
lines changed

6 files changed

+212
-106
lines changed

‎specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/stable/2020-10-01/Clusters.json‎

Lines changed: 93 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
"description": "Gets Log Analytics clusters in a resource group.",
4949
"parameters": [
5050
{
51-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
51+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
5252
},
5353
{
54-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
54+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
5555
},
5656
{
57-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
57+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
5858
}
5959
],
6060
"responses": {
@@ -67,7 +67,7 @@
6767
"default": {
6868
"description": "Error response describing why the operation failed.",
6969
"schema": {
70-
"$ref": "#/definitions/ClusterErrorResponse"
70+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
7171
}
7272
}
7373
},
@@ -90,10 +90,10 @@
9090
"description": "Gets the Log Analytics clusters in a subscription.",
9191
"parameters": [
9292
{
93-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
93+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
9494
},
9595
{
96-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
96+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
9797
}
9898
],
9999
"responses": {
@@ -106,7 +106,7 @@
106106
"default": {
107107
"description": "Error response describing why the operation failed.",
108108
"schema": {
109-
"$ref": "#/definitions/ClusterErrorResponse"
109+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
110110
}
111111
}
112112
},
@@ -129,13 +129,13 @@
129129
"description": "Create or update a Log Analytics cluster.",
130130
"parameters": [
131131
{
132-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
132+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
133133
},
134134
{
135-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
135+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
136136
},
137137
{
138-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
138+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
139139
},
140140
{
141141
"name": "clusterName",
@@ -176,7 +176,7 @@
176176
"default": {
177177
"description": "Error response describing why the operation failed.",
178178
"schema": {
179-
"$ref": "#/definitions/ClusterErrorResponse"
179+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
180180
}
181181
}
182182
},
@@ -195,7 +195,7 @@
195195
"description": "Deletes a cluster instance.",
196196
"parameters": [
197197
{
198-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
198+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
199199
},
200200
{
201201
"name": "clusterName",
@@ -205,10 +205,10 @@
205205
"description": "Name of the Log Analytics Cluster."
206206
},
207207
{
208-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
208+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
209209
},
210210
{
211-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
211+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
212212
}
213213
],
214214
"responses": {
@@ -221,7 +221,7 @@
221221
"default": {
222222
"description": "Error response describing why the operation failed.",
223223
"schema": {
224-
"$ref": "#/definitions/ClusterErrorResponse"
224+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
225225
}
226226
}
227227
},
@@ -240,13 +240,13 @@
240240
"description": "Gets a Log Analytics cluster instance.",
241241
"parameters": [
242242
{
243-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
243+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
244244
},
245245
{
246-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
246+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
247247
},
248248
{
249-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
249+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
250250
},
251251
{
252252
"name": "clusterName",
@@ -266,7 +266,7 @@
266266
"default": {
267267
"description": "Error response describing why the operation failed.",
268268
"schema": {
269-
"$ref": "#/definitions/ClusterErrorResponse"
269+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
270270
}
271271
}
272272
}
@@ -284,7 +284,7 @@
284284
"description": "Updates a Log Analytics cluster.",
285285
"parameters": [
286286
{
287-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
287+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
288288
},
289289
{
290290
"name": "clusterName",
@@ -303,10 +303,10 @@
303303
"description": "The parameters required to patch a Log Analytics cluster."
304304
},
305305
{
306-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
306+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
307307
},
308308
{
309-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
309+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
310310
}
311311
],
312312
"responses": {
@@ -319,7 +319,7 @@
319319
"default": {
320320
"description": "Error response describing why the operation failed.",
321321
"schema": {
322-
"$ref": "#/definitions/ClusterErrorResponse"
322+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
323323
}
324324
}
325325
}
@@ -381,20 +381,31 @@
381381
"keyVaultProperties": {
382382
"$ref": "#/definitions/keyVaultProperties",
383383
"description": "The associated key properties."
384+
},
385+
"lastModifiedDate": {
386+
"type": "string",
387+
"description": "The last time the cluster was updated.",
388+
"readOnly": true
389+
},
390+
"createdDate": {
391+
"type": "string",
392+
"description": "The cluster creation time",
393+
"readOnly": true
394+
},
395+
"associatedWorkspaces": {
396+
"description": "The list of Log Analytics workspaces associated with the cluster",
397+
"type": "array",
398+
"items": {
399+
"$ref": "#/definitions/AssociatedWorkspace"
400+
}
401+
},
402+
"capacityReservationProperties": {
403+
"$ref": "#/definitions/CapacityReservationProperties",
404+
"description": "Additional properties for capacity reservation"
384405
}
385406
},
386407
"description": "Cluster properties."
387408
},
388-
"ClusterErrorResponse": {
389-
"description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message.",
390-
"type": "object",
391-
"properties": {
392-
"error": {
393-
"description": "The details of the error.",
394-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
395-
}
396-
}
397-
},
398409
"ClusterPatchProperties": {
399410
"properties": {
400411
"keyVaultProperties": {
@@ -453,7 +464,7 @@
453464
},
454465
"allOf": [
455466
{
456-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
467+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
457468
}
458469
],
459470
"description": "The top level Log Analytics cluster resource container."
@@ -573,6 +584,54 @@
573584
"type": "string"
574585
}
575586
}
587+
},
588+
"AssociatedWorkspace": {
589+
"type": "object",
590+
"description": "The list of Log Analytics workspaces associated with the cluster.",
591+
"properties": {
592+
"workspaceId": {
593+
"readOnly": true,
594+
"description": "The id of the assigned workspace.",
595+
"type": "string"
596+
},
597+
"workspaceName": {
598+
"readOnly": true,
599+
"description": "The name id the assigned workspace.",
600+
"type": "string"
601+
},
602+
"resourceId": {
603+
"readOnly": true,
604+
"description": "The ResourceId id the assigned workspace.",
605+
"type": "string"
606+
},
607+
"associateDate": {
608+
"readOnly": true,
609+
"description": "The time of workspace association.",
610+
"type": "string"
611+
}
612+
}
613+
},
614+
"CapacityReservationProperties": {
615+
"description": "The Capacity Reservation properties.",
616+
"properties": {
617+
"lastSkuUpdate": {
618+
"readOnly": true,
619+
"description": "The last time Sku was updated.",
620+
"type": "string"
621+
},
622+
"minCapacity": {
623+
"readOnly": true,
624+
"description": "Minimum CapacityReservation value in GB.",
625+
"type": "integer",
626+
"format": "int64"
627+
},
628+
"maxCapacity": {
629+
"readOnly": true,
630+
"description": "Maximum CapacityReservation value in GB.",
631+
"type": "integer",
632+
"format": "int64"
633+
}
634+
}
576635
}
577636
},
578637
"parameters": {}

‎specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/stable/2020-10-01/Operations.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"description": "Lists all of the available OperationalInsights Rest API operations.",
4949
"parameters": [
5050
{
51-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
51+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
5252
}
5353
],
5454
"responses": {
@@ -57,6 +57,12 @@
5757
"schema": {
5858
"$ref": "#/definitions/OperationListResult"
5959
}
60+
},
61+
"default": {
62+
"description": "Error response describing why the operation failed.",
63+
"schema": {
64+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
65+
}
6066
}
6167
},
6268
"x-ms-pageable": {

0 commit comments

Comments
 (0)