Skip to content

Commit 4374a7b

Browse files
authored
Merge pull request #106173 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 7eb86b5 + df5fac0 commit 4374a7b

File tree

9 files changed

+80
-34
lines changed

9 files changed

+80
-34
lines changed

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ As a first planning step, you should review your environment and determine wheth
7777

7878
- Hybrid Azure AD join is not supported on Windows down-level devices when using credential roaming or user profile roaming or mandatory profile.
7979

80+
- Server Core OS doesn't support any type of device registration.
81+
8082
### OS imaging considerations
8183
- If you are relying on the System Preparation Tool (Sysprep) and if you are using a **pre-Windows 10 1809** image for installation, make sure that image is not from a device that is already registered with Azure AD as Hybrid Azure AD join.
8284

articles/azure-functions/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@
425425
- name: Overview
426426
href: functions-bindings-signalr-service.md
427427
displayName: SignalR Service
428-
- name: Overview
428+
- name: Input
429429
href: functions-bindings-signalr-service-input.md
430430
displayName: SignalR Service
431-
- name: Overview
431+
- name: Output
432432
href: functions-bindings-signalr-service-output.md
433433
displayName: SignalR Service
434434
- name: Table storage

articles/azure-functions/functions-how-to-azure-devops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242
arguments: '--configuration Release --output publish_output'
4343
projects: '*.csproj'
4444
publishWebProjects: false
45-
modifyOutputPath: true
45+
modifyOutputPath: false
4646
zipAfterPublish: false
4747
- task: ArchiveFiles@2
4848
displayName: "Archive files"

articles/azure-monitor/app/data-retention-privacy.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,12 @@ By default `%TEMP%/appInsights-node{INSTRUMENTATION KEY}` is used for persisting
168168

169169
The folder prefix `appInsights-node` can be overridden by changing the runtime value of the static variable `Sender.TEMPDIR_PREFIX` found in [Sender.ts](https://github.com/Microsoft/ApplicationInsights-node.js/blob/7a1ecb91da5ea0febf5ceab13d6a4bf01a63933d/Library/Sender.ts#L384).
170170

171+
### JavaScript (browser)
172+
173+
[HTML5 Session Storage](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage) is used to persist data. Two separate buffers are used: `AI_buffer` and `AI_sent_buffer`. Telemetry that is batched and waiting to be sent is stored in `AI_buffer`. Telemetry that was just sent is placed in `AI_sent_buffer` until the ingestion server responds that it was successfully received. When telemetry is successfully received, it's removed from all buffers. On transient failures (for example, a user loses network connectivity), telemetry remains in `AI_buffer` until it is successfully received or the ingestion server responds that the telemetry is invalid (bad schema or too old, for example).
174+
175+
Telemetry buffers can be disabled by setting [`enableSessionStorageBuffer`](https://github.com/microsoft/ApplicationInsights-JS/blob/17ef50442f73fd02a758fbd74134933d92607ecf/legacy/JavaScript/JavaScriptSDK.Interfaces/IConfig.ts#L31) to `false`. When session storage is turned off, a local array is instead used as persistent storage. Because the JavaScript SDK runs on a client device, the user has access to this storage location via their browser's developer tools.
176+
171177
### OpenCensus Python
172178

173179
By default OpenCensus Python SDK uses the current user folder `%username%/.opencensus/.azure/`. Permissions to access this folder are restricted to the current user and Administrators. (See [implementation](https://github.com/census-instrumentation/opencensus-python/blob/master/contrib/opencensus-ext-azure/opencensus/ext/azure/common/storage.py) here.) The folder with your persisted data will be named after the Python file that generated the telemetry.

articles/batch/batch-docker-container-workloads.md

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ manager: evansma
88
ms.service: batch
99
ms.topic: article
1010
ms.workload: na
11-
ms.date: 08/09/2019
11+
ms.date: 03/02/2020
1212
ms.author: labrenne
1313
ms.custom: seodec18
1414

1515
---
1616

1717
# Run container applications on Azure Batch
1818

19-
Azure Batch lets you run and scale large numbers of batch computing jobs on Azure. Batch tasks can run directly on virtual machines (nodes) in a Batch pool, but you can also set up a Batch pool to run tasks in Docker-compatible containers on the nodes. This article shows you how to create a pool of compute nodes that support running container tasks, and then run container tasks on the pool.
19+
Azure Batch lets you run and scale large numbers of batch computing jobs on Azure. Batch tasks can run directly on virtual machines (nodes) in a Batch pool, but you can also set up a Batch pool to run tasks in Docker-compatible containers on the nodes. This article shows you how to create a pool of compute nodes that support running container tasks, and then run container tasks on the pool.
2020

2121
You should be familiar with container concepts and how to create a Batch pool and job. The code examples use the Batch .NET and Python SDKs. You can also use other Batch SDKs and tools, including the Azure portal, to create container-enabled Batch pools and to run container tasks.
2222

2323
## Why use containers?
2424

25-
Using containers provides an easy way to run Batch tasks without having to manage an environment and dependencies to run applications. Containers deploy applications as lightweight, portable, self-sufficient units that can run in several different environments. For example, build and test a container locally, then upload the container image to a registry in Azure or elsewhere. The container deployment model ensures that the runtime environment of your application is always correctly installed and configured wherever you host the application. Container-based tasks in Batch can also take advantage of features of non-container tasks, including application packages and management of resource files and output files.
25+
Using containers provides an easy way to run Batch tasks without having to manage an environment and dependencies to run applications. Containers deploy applications as lightweight, portable, self-sufficient units that can run in several different environments. For example, build and test a container locally, then upload the container image to a registry in Azure or elsewhere. The container deployment model ensures that the runtime environment of your application is always correctly installed and configured wherever you host the application. Container-based tasks in Batch can also take advantage of features of non-container tasks, including application packages and management of resource files and output files.
2626

2727
## Prerequisites
2828

@@ -35,7 +35,7 @@ Using containers provides an easy way to run Batch tasks without having to manag
3535

3636
* **Accounts**: In your Azure subscription, you need to create a Batch account and optionally an Azure Storage account.
3737

38-
* **A supported VM image**: Containers are only supported in pools created with the Virtual Machine Configuration, from images detailed in the following section, "Supported virtual machine images." If you provide a custom image, see the considerations in the following section and the requirements in [Use a managed custom image to create a pool of virtual machines](batch-custom-images.md).
38+
* **A supported VM image**: Containers are only supported in pools created with the Virtual Machine Configuration, from images detailed in the following section, "Supported virtual machine images." If you provide a custom image, see the considerations in the following section and the requirements in [Use a managed custom image to create a pool of virtual machines](batch-custom-images.md).
3939

4040
### Limitations
4141

@@ -45,33 +45,37 @@ Using containers provides an easy way to run Batch tasks without having to manag
4545

4646
## Supported virtual machine images
4747

48-
Use one of the following supported Windows or Linux images to create a pool of VM compute nodes for container workloads. For more information about Marketplace images that are compatible with Batch, see [list of virtual machine images](batch-linux-nodes.md#list-of-virtual-machine-images).
48+
Use one of the following supported Windows or Linux images to create a pool of VM compute nodes for container workloads. For more information about Marketplace images that are compatible with Batch, see [list of virtual machine images](batch-linux-nodes.md#list-of-virtual-machine-images).
4949

50-
### Windows images
50+
### Windows support
5151

52-
For Windows container workloads, Batch currently supports the **Windows Server 2016 Datacenter with Containers** image in the Azure Marketplace. Only Docker container images are supported on Windows.
52+
Batch supports Windows server images that have container support designations. Typically these image sku names are suffixed with `-with-containers` or `-with-containers-smalldisk`. Additionally, [the API to list all supported images in Batch](batch-linux-nodes.md#list-of-virtual-machine-images) will denote a `DockerCompatible` capability if the image supports Docker containers.
5353

5454
You can also create custom images from VMs running Docker on Windows.
5555

56-
### Linux images
56+
### Linux support
5757

58-
For Linux container workloads, Batch currently supports the following Linux images published by Microsoft Azure Batch in the Azure Marketplace:
58+
For Linux container workloads, Batch currently supports the following Linux images published by Microsoft Azure Batch in the Azure Marketplace without the need for a custom image.
5959

60-
* **CentOS for Azure Batch container pools**
60+
#### VM sizes without RDMA
6161

62-
* **CentOS (with RDMA drivers) for Azure Batch container pools**
62+
- Publisher: `microsoft-azure-batch`
63+
- Offer: `centos-container`
64+
- Offer: `ubuntu-server-container`
6365

64-
* **Ubuntu Server for Azure Batch container pools**
66+
#### VM sizes with RDMA
6567

66-
* **Ubuntu Server (with RDMA drivers) for Azure Batch container pools**
68+
- Publisher: `microsoft-azure-batch`
69+
- Offer: `centos-container-rdma`
70+
- Offer: `ubuntu-server-container-rdma`
6771

68-
These images are only supported for use in Azure Batch pools. They feature:
72+
These images are only supported for use in Azure Batch pools and are geared for Docker container execution. They feature:
6973

70-
* A pre-installed [Moby](https://github.com/moby/moby) container runtime
74+
* A pre-installed Docker-compatible [Moby](https://github.com/moby/moby) container runtime
7175

72-
* Pre-installed NVIDIA GPU drivers, to streamline deployment on Azure N-series VMs
76+
* Pre-installed NVIDIA GPU drivers and NVIDIA container runtime, to streamline deployment on Azure N-series VMs
7377

74-
* Your choice of images with or without pre-installed RDMA drivers. These drivers allow pool nodes to access the Azure RDMA network when deployed on RDMA-capable VM sizes.
78+
* Pre-installed/pre-configured image with support for Infiniband RDMA VM sizes for images with the suffix of `-rdma`. Currently these images do not support SR-IOV IB/RDMA VM sizes.
7579

7680
You can also create custom images from VMs running Docker on one of the Linux distributions that is compatible with Batch. If you choose to provide your own custom Linux image, see the instructions in [Use a managed custom image to create a pool of virtual machines](batch-custom-images.md).
7781

@@ -125,7 +129,7 @@ new_pool = batch.models.PoolAddParameter(
125129

126130
### Prefetch images for container configuration
127131

128-
To prefetch container images on the pool, add the list of container images (`container_image_names`, in Python) to the `ContainerConfiguration`.
132+
To prefetch container images on the pool, add the list of container images (`container_image_names`, in Python) to the `ContainerConfiguration`.
129133

130134
The following basic Python example shows how to prefetch a standard Ubuntu container image from [Docker Hub](https://hub.docker.com).
131135

@@ -137,7 +141,7 @@ image_ref_to_use = batch.models.ImageReference(
137141
version='latest')
138142

139143
"""
140-
Specify container configuration, fetching the official Ubuntu container image from Docker Hub.
144+
Specify container configuration, fetching the official Ubuntu container image from Docker Hub.
141145
"""
142146

143147
container_conf = batch.models.ContainerConfiguration(
@@ -224,17 +228,17 @@ CloudPool pool = batchClient.PoolOperations.CreatePool(
224228

225229
To run a container task on a container-enabled pool, specify container-specific settings. Settings include the image to use, registry, and container run options.
226230

227-
* Use the `ContainerSettings` property of the task classes to configure container-specific settings. These settings are defined by the [TaskContainerSettings](/dotnet/api/microsoft.azure.batch.taskcontainersettings) class. Note that the `--rm` container option doesn't require an additional `--runtime` option since it is taken care of by Batch.
231+
* Use the `ContainerSettings` property of the task classes to configure container-specific settings. These settings are defined by the [TaskContainerSettings](/dotnet/api/microsoft.azure.batch.taskcontainersettings) class. Note that the `--rm` container option doesn't require an additional `--runtime` option since it is taken care of by Batch.
228232

229233
* If you run tasks on container images, the [cloud task](/dotnet/api/microsoft.azure.batch.cloudtask) and [job manager task](/dotnet/api/microsoft.azure.batch.cloudjob.jobmanagertask) require container settings. However, the [start task](/dotnet/api/microsoft.azure.batch.starttask), [job preparation task](/dotnet/api/microsoft.azure.batch.cloudjob.jobpreparationtask), and [job release task](/dotnet/api/microsoft.azure.batch.cloudjob.jobreleasetask) do not require container settings (that is, they can run within a container context or directly on the node).
230234

231235
### Container task command line
232236

233-
When you run a container task, Batch automatically uses the [docker create](https://docs.docker.com/engine/reference/commandline/create/) command to create a container using the image specified in the task. Batch then controls task execution in the container.
237+
When you run a container task, Batch automatically uses the [docker create](https://docs.docker.com/engine/reference/commandline/create/) command to create a container using the image specified in the task. Batch then controls task execution in the container.
234238

235239
As with non-container Batch tasks, you set a command line for a container task. Because Batch automatically creates the container, the command line only specifies the command or commands that will run in the container.
236240

237-
If the container image for a Batch task is configured with an [ENTRYPOINT](https://docs.docker.com/engine/reference/builder/#exec-form-entrypoint-example) script, you can set your command line to either use the default ENTRYPOINT or override it:
241+
If the container image for a Batch task is configured with an [ENTRYPOINT](https://docs.docker.com/engine/reference/builder/#exec-form-entrypoint-example) script, you can set your command line to either use the default ENTRYPOINT or override it:
238242

239243
* To use the default ENTRYPOINT of the container image, set the task command line to the empty string `""`.
240244

@@ -244,19 +248,19 @@ Optional [ContainerRunOptions](/dotnet/api/microsoft.azure.batch.taskcontainerse
244248

245249
### Container task working directory
246250

247-
A Batch container task executes in a working directory in the container that is very similar to the directory Batch sets up for a regular (non-container) task. Note that this working directory is different from the [WORKDIR](https://docs.docker.com/engine/reference/builder/#workdir) if configured in the image, or the default container working directory (`C:\` on a Windows container, or `/` on a Linux container).
251+
A Batch container task executes in a working directory in the container that is very similar to the directory Batch sets up for a regular (non-container) task. Note that this working directory is different from the [WORKDIR](https://docs.docker.com/engine/reference/builder/#workdir) if configured in the image, or the default container working directory (`C:\` on a Windows container, or `/` on a Linux container).
248252

249253
For a Batch container task:
250254

251255
* All directories recursively below the `AZ_BATCH_NODE_ROOT_DIR` on the host node (the root of Azure Batch directories) are mapped into the container
252256
* All task environment variables are mapped into the container
253-
* The task working directory `AZ_BATCH_TASK_WORKING_DIR` on the node is set the same as for a regular task and mapped into the container.
257+
* The task working directory `AZ_BATCH_TASK_WORKING_DIR` on the node is set the same as for a regular task and mapped into the container.
254258

255259
These mappings allow you to work with container tasks in much the same way as non-container tasks. For example, install applications using application packages, access resource files from Azure Storage, use task environment settings, and persist task output files after the container stops.
256260

257261
### Troubleshoot container tasks
258262

259-
If your container task doesn't run as expected, you might need to get information about the WORKDIR or ENTRYPOINT configuration of the container image. To see the configuration, run the [docker image inspect](https://docs.docker.com/engine/reference/commandline/image_inspect/) command.
263+
If your container task doesn't run as expected, you might need to get information about the WORKDIR or ENTRYPOINT configuration of the container image. To see the configuration, run the [docker image inspect](https://docs.docker.com/engine/reference/commandline/image_inspect/) command.
260264

261265
If needed, adjust the settings of the container task based on the image:
262266

@@ -266,7 +270,7 @@ If needed, adjust the settings of the container task based on the image:
266270

267271
## Container task examples
268272

269-
The following Python snippet shows a basic command line running in a container created from a fictitious image pulled from Docker Hub. Here, the `--rm` container option removes the container after the task finishes, and the `--workdir` option sets a working directory. The command line overrides the container ENTRYPOINT with a simple shell command that writes a small file to the task working directory on the host.
273+
The following Python snippet shows a basic command line running in a container created from a fictitious image pulled from Docker Hub. Here, the `--rm` container option removes the container after the task finishes, and the `--workdir` option sets a working directory. The command line overrides the container ENTRYPOINT with a simple shell command that writes a small file to the task working directory on the host.
270274

271275
```python
272276
task_id = 'sampletask'
@@ -295,7 +299,7 @@ TaskContainerSettings cmdContainerSettings = new TaskContainerSettings (
295299
CloudTask containerTask = new CloudTask (
296300
id: "Task1",
297301
containerSettings: cmdContainerSettings,
298-
commandLine: cmdLine);
302+
commandLine: cmdLine);
299303
```
300304

301305

articles/cognitive-services/Speech-Service/speech-synthesis-markup.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ By default, the text-to-speech service synthesizes text using a neutral speaking
190190

191191
Currently, speaking style adjustments are supported for these neural voices:
192192
* `en-US-JessaNeural`
193+
* `pt-BR-FranciscaNeural`
193194
* `zh-CN-XiaoxiaoNeural`
194195

195196
Changes are applied at the sentence level, and style vary by voice. If a style isn't supported, the service will return speech in the default neutral speaking style.
@@ -215,6 +216,7 @@ Use this table to determine which speaking styles are supported for each neural
215216
| | `type="chat"` | Speak in a casual, relaxed tone |
216217
| | `type="newscast"` | Expresses a formal tone, similar to news broadcasts |
217218
| | `type="customerservice"` | Speak in a friendly and patient way as customer service |
219+
| `pt-BR-FranciscaNeural` | `type="cheerful"` | Expresses an emotion that is positive and happy |
218220
| `zh-CN-XiaoxiaoNeural` | `type="newscast"` | Expresses a formal tone, similar to news broadcasts |
219221
| | `type="sentiment"` | Conveys a touching message or a story |
220222

0 commit comments

Comments
 (0)