diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/containerInstance.json index 1631452821f1..9df6d5915acf 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/containerInstance.json @@ -268,7 +268,7 @@ } }, "summary": "Restarts all containers in a container group.", - "description": "Restarts all containers in a contaienr group in place. If container image has updates, new image will be downloaded.", + "description": "Restarts all containers in a container group in place. If container image has updates, new image will be downloaded.", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -300,7 +300,7 @@ } }, "summary": "Stops all containers in a container group.", - "description": "Stops all containers in a contaienr group. Compute resources will be deallocated and billing will stop.", + "description": "Stops all containers in a container group. Compute resources will be deallocated and billing will stop.", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -975,6 +975,10 @@ "diagnostics": { "description": "The diagnostic information for a container group.", "$ref": "#/definitions/ContainerGroupDiagnostics" + }, + "networkProfile": { + "description": "The network profile information for a container group.", + "$ref": "#/definitions/ContainerGroupNetworkProfile" } }, "required": [ @@ -1029,6 +1033,25 @@ "workspaceKey": { "description": "The workspace key for log analytics", "type": "string" + }, + "logType": { + "type": "string", + "description": "The log type to be used.", + "enum": [ + "ContainerInsights", + "ContainerInstanceLogs" + ], + "x-ms-enum": { + "name": "LogAnalyticsLogType", + "modelAsString": true + } + }, + "metadata": { + "type": "object", + "description": "Metadata for log analytics.", + "additionalProperties": { + "type": "string" + } } }, "required": [ @@ -1036,6 +1059,19 @@ "workspaceKey" ] }, + "ContainerGroupNetworkProfile": { + "description": "Container group network profile information.", + "type": "object", + "properties": { + "id": { + "description": "The identifier for a network profile.", + "type": "string" + } + }, + "required": [ + "id" + ] + }, "IpAddress": { "description": "IP address for the container group.", "type": "object", diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/examples/ContainerGroupsCreateOrUpdate.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/examples/ContainerGroupsCreateOrUpdate.json index 5a3d24e121b2..cbb44352f67b 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/examples/ContainerGroupsCreateOrUpdate.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2018-09-01/examples/ContainerGroupsCreateOrUpdate.json @@ -50,9 +50,16 @@ "diagnostics": { "logAnalytics": { "workspaceId": "workspaceid", - "workspaceKey": "workspaceKey" + "workspaceKey": "workspaceKey", + "logType": "ContainerInsights", + "metadata": { + "test-key": "test-metadata-value" + } } }, + "networkProfile": { + "id": "test-network-profile-id" + }, "imageRegistryCredentials": [], "ipAddress": { "ports": [ diff --git a/specification/containerinstance/resource-manager/readme.go.md b/specification/containerinstance/resource-manager/readme.go.md index 1b42e90c871b..ea4c94553695 100644 --- a/specification/containerinstance/resource-manager/readme.go.md +++ b/specification/containerinstance/resource-manager/readme.go.md @@ -13,6 +13,7 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2018-09 - tag: package-2018-06 - tag: package-2018-04 - tag: package-2018-02-preview @@ -21,6 +22,15 @@ batch: - tag: package-2017-08-preview ``` +### Tag: package-2018-09 and go + +These settings apply only when `--tag=package-2018-09 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2018-09' && $(go) +output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-09-01/containerinstance +``` + ### Tag: package-2018-06 and go These settings apply only when `--tag=package-2018-06 --go` is specified on the command line. diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index a9c9d1c113c8..8fdf3ddf266a 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,16 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2018-06 +tag: package-2018-09 +``` + +### Tag: package-2018-09 + +These settings apply only when `--tag=package-2018-09` is specified on the command line. + +``` yaml $(tag) == 'package-2018-09' +input-file: +- Microsoft.ContainerInstance/stable/2018-09-01/containerInstance.json ``` ### Tag: package-2018-06 diff --git a/specification/containerinstance/resource-manager/readme.ruby.md b/specification/containerinstance/resource-manager/readme.ruby.md index de03943f180e..bfcccb104e89 100644 --- a/specification/containerinstance/resource-manager/readme.ruby.md +++ b/specification/containerinstance/resource-manager/readme.ruby.md @@ -12,12 +12,45 @@ azure-arm: true ``` yaml $(ruby) && $(multiapi) batch: + - tag: package-2018-09 + - tag: package-2018-06 + - tag: package-2018-04 - tag: package-2018-02-preview - tag: package-2017-12-preview - tag: package-2017-10-preview - tag: package-2017-08-preview ``` +### Tag: package-2018-09 and ruby + +These settings apply only when `--tag=package-2018-09 --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-09' && $(ruby) +namespace: "Azure::ContainerInstance::Mgmt::V2018_02_01_preview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_container_instance/lib +``` + +### Tag: package-2018-06 and ruby + +These settings apply only when `--tag=package-2018-06 --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06' && $(ruby) +namespace: "Azure::ContainerInstance::Mgmt::V2018_02_01_preview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_container_instance/lib +``` + +### Tag: package-2018-04 and ruby + +These settings apply only when `--tag=package-2018-04 --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-04' && $(ruby) +namespace: "Azure::ContainerInstance::Mgmt::V2018_02_01_preview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_container_instance/lib +``` + ### Tag: package-2018-02-preview and ruby These settings apply only when `--tag=package-2018-02-preview --ruby` is specified on the command line.