Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AssociatedWorkspaces and CapacityReservationProperties added to cluster #11736

Merged
merged 17 commits into from
Nov 24, 2020
Merged

AssociatedWorkspaces and CapacityReservationProperties added to cluster #11736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
739072e
AssociatedWorkspaces and CapacityReservationProperties added to clust…
dhaiman Nov 18, 2020
f9c5195
change AssociatedWorkspaces to array
dhaiman Nov 18, 2020
109e2df
fix validation errors
dhaiman Nov 19, 2020
5b05cfe
Merge branch 'master' into dhaiman/update_cluster_properties
dhaiman Nov 19, 2020
f422a29
fix validation errors
dhaiman Nov 19, 2020
d1b0d79
Merge branch 'dhaiman/update_cluster_properties' of https://github.co…
dhaiman Nov 19, 2020
003ce46
missing token added
dhaiman Nov 19, 2020
4d9722e
read only properties deleted
dhaiman Nov 19, 2020
855de90
read only properties deleted
dhaiman Nov 19, 2020
2d8aa8b
LintDIff Errors Fixed
dhaiman Nov 22, 2020
ece5dae
LACluster added to WorkspaceSku
dhaiman Nov 22, 2020
f3d3936
update error description
dhaiman Nov 22, 2020
a63db78
revert types.json changes
dhaiman Nov 22, 2020
08402a9
add prettier
arolshan Nov 22, 2020
727cc42
change default error response to use V2 format
dhaiman Nov 23, 2020
555def8
SS
dhaiman Nov 23, 2020
395ef8b
use V2 types.json file
dhaiman Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 93 additions & 34 deletions ...alinsights/resource-manager/Microsoft.OperationalInsights/stable/2020-10-01/Clusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"description": "Gets Log Analytics clusters in a resource group.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -67,7 +67,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ClusterErrorResponse"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
},
Expand All @@ -90,10 +90,10 @@
"description": "Gets the Log Analytics clusters in a subscription.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -106,7 +106,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ClusterErrorResponse"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
},
Expand All @@ -129,13 +129,13 @@
"description": "Create or update a Log Analytics cluster.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"name": "clusterName",
Expand Down Expand Up @@ -176,7 +176,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ClusterErrorResponse"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
},
Expand All @@ -195,7 +195,7 @@
"description": "Deletes a cluster instance.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "clusterName",
Expand All @@ -205,10 +205,10 @@
"description": "Name of the Log Analytics Cluster."
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -221,7 +221,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ClusterErrorResponse"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
},
Expand All @@ -240,13 +240,13 @@
"description": "Gets a Log Analytics cluster instance.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"name": "clusterName",
Expand All @@ -266,7 +266,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ClusterErrorResponse"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
}
Expand All @@ -284,7 +284,7 @@
"description": "Updates a Log Analytics cluster.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "clusterName",
Expand All @@ -303,10 +303,10 @@
"description": "The parameters required to patch a Log Analytics cluster."
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -319,7 +319,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ClusterErrorResponse"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
}
Expand Down Expand Up @@ -381,20 +381,31 @@
"keyVaultProperties": {
"$ref": "#/definitions/keyVaultProperties",
"description": "The associated key properties."
},
"lastModifiedDate": {
"type": "string",
"description": "The last time the cluster was updated.",
"readOnly": true
},
"createdDate": {
"type": "string",
"description": "The cluster creation time",
"readOnly": true
},
"associatedWorkspaces": {
"description": "The list of Log Analytics workspaces associated with the cluster",
"type": "array",
"items": {
"$ref": "#/definitions/AssociatedWorkspace"
}
},
"capacityReservationProperties": {
"$ref": "#/definitions/CapacityReservationProperties",
"description": "Additional properties for capacity reservation"
}
},
"description": "Cluster properties."
},
"ClusterErrorResponse": {
"description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message.",
"type": "object",
"properties": {
"error": {
"description": "The details of the error.",
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
}
}
},
"ClusterPatchProperties": {
"properties": {
"keyVaultProperties": {
Expand Down Expand Up @@ -453,7 +464,7 @@
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
}
],
"description": "The top level Log Analytics cluster resource container."
Expand Down Expand Up @@ -573,6 +584,54 @@
"type": "string"
}
}
},
"AssociatedWorkspace": {
"type": "object",
"description": "The list of Log Analytics workspaces associated with the cluster.",
"properties": {
"workspaceId": {
"readOnly": true,
"description": "The id of the assigned workspace.",
"type": "string"
},
"workspaceName": {
"readOnly": true,
"description": "The name id the assigned workspace.",
"type": "string"
},
"resourceId": {
"readOnly": true,
"description": "The ResourceId id the assigned workspace.",
"type": "string"
},
"associateDate": {
"readOnly": true,
"description": "The time of workspace association.",
"type": "string"
}
}
},
"CapacityReservationProperties": {
"description": "The Capacity Reservation properties.",
"properties": {
"lastSkuUpdate": {
"readOnly": true,
"description": "The last time Sku was updated.",
"type": "string"
},
"minCapacity": {
"readOnly": true,
"description": "Minimum CapacityReservation value in GB.",
"type": "integer",
"format": "int64"
},
"maxCapacity": {
"readOnly": true,
"description": "Maximum CapacityReservation value in GB.",
"type": "integer",
"format": "int64"
}
}
}
},
"parameters": {}
Expand Down
8 changes: 7 additions & 1 deletion ...insights/resource-manager/Microsoft.OperationalInsights/stable/2020-10-01/Operations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"description": "Lists all of the available OperationalInsights Rest API operations.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -57,6 +57,12 @@
"schema": {
"$ref": "#/definitions/OperationListResult"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
},
"x-ms-pageable": {
Expand Down
Loading