Skip to content

Commit 4407418

Browse files
authored
Merge pull request #210405 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 0459848 + 3ece503 commit 4407418

File tree

9 files changed

+94
-31
lines changed

9 files changed

+94
-31
lines changed

articles/azure-monitor/app/javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Most configuration fields are named so that they can default to false. All field
193193
| samplingPercentage | Percentage of events that will be sent. Default is 100, meaning all events are sent. Set this option if you want to preserve your data cap for large-scale applications. | numeric<br/>100 |
194194
| autoTrackPageVisitTime | If true, on a pageview, the _previous_ instrumented page's view time is tracked and sent as telemetry and a new timer is started for the current pageview. It's sent as a custom metric named `PageVisitTime` in `milliseconds` and is calculated via the Date [now()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now) function (if available) and falls back to (new Date()).[getTime()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime) if now() is unavailable (Internet Explorer 8 or less). Default is false. | boolean<br/>false |
195195
| disableAjaxTracking | If true, Ajax calls aren't autocollected. | boolean<br/> false |
196-
| disableFetchTracking | If true, Fetch requests aren't autocollected.|boolean<br/>true |
196+
| disableFetchTracking | If true, Fetch requests aren't autocollected.|boolean<br/>false |
197197
| overridePageViewDuration | If true, default behavior of trackPageView is changed to record end of page view duration interval when trackPageView is called. If false and no custom duration is provided to trackPageView, the page view performance is calculated by using the navigation timing API. |boolean<br/>
198198
| maxAjaxCallsPerView | Default 500 controls how many Ajax calls will be monitored per page view. Set to -1 to monitor all (unlimited) Ajax calls on the page. | numeric<br/> 500 |
199199
| disableDataLossAnalysis | If false, internal telemetry sender buffers will be checked at startup for items not yet sent. | boolean<br/> true |

articles/azure-monitor/essentials/resource-manager-diagnostic-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ param eventHubAuthorizationRuleId string
588588
@description('The name of the event hub.')
589589
param eventHubName string
590590
591-
resource vault 'Microsoft.KeyVault/managedHSMs@2021-11-01-preview' existing = {
591+
resource vault 'Microsoft.KeyVault/vaults@2021-11-01-preview' existing = {
592592
name: vaultName
593593
}
594594
@@ -664,7 +664,7 @@ resource setting 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = {
664664
{
665665
"type": "Microsoft.Insights/diagnosticSettings",
666666
"apiVersion": "2021-05-01-preview",
667-
"scope": "[format('Microsoft.KeyVault/managedHSMs/{0}', parameters('vaultName'))]",
667+
"scope": "[format('Microsoft.KeyVault/vaults/{0}', parameters('vaultName'))]",
668668
"name": "[parameters('settingName')]",
669669
"properties": {
670670
"workspaceId": "[parameters('workspaceId')]",

articles/azure-vmware/ecosystem-os-vms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ms.date: 04/11/2022
88

99
# Operating system support for Azure VMware Solution virtual machines
1010

11-
Azure VMware Solution supports a wide range of operating systems to be used in the guest virtual machines. Being based on VMware vSphere, currently 6.7 version, all operating systems currently supported by vSphere can be used by any Azure VMware Solution customer for their workloads.
11+
Azure VMware Solution supports a wide range of operating systems to be used in the guest virtual machines. Being based on VMware vSphere, currently 7.0 version, all operating systems currently supported by vSphere can be used by any Azure VMware Solution customer for their workloads.
1212

13-
Check the list of operating systems and configurations supported in the [VMware Compatibility Guide](https://www.vmware.com/resources/compatibility/search.php?deviceCategory=software), create a query for ESXi 6.7 Update 3 and select all operating systems and vendors.
13+
Check the list of operating systems and configurations supported in the [VMware Compatibility Guide](https://www.vmware.com/resources/compatibility/search.php?deviceCategory=software), create a query for ESXi 7.0 Update 3 and select all operating systems and vendors.
1414

1515
Additionally to the supported operating systems by VMware for vSphere, we have worked with Red Hat, SUSE and Canonical to extend the support model currently in place for Azure Virtual Machines to the workloads running on Azure VMware Solution, given that it is a first-party Azure service. You can check the following sites of vendors for more information about the benefits of running their operating system on Azure.
1616

articles/azure-vmware/enable-vmware-cds-with-azure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ To provide access to vNET based Azure resources, each tenant can have their own
3232
As shown in the diagram above, organization 01 has two organization virtual datacenters: VDC1 and VDC2. The virtual datacenter of each organization has its own Azure vNETs connected with their respective organization VDC Edge gateway through IPSEC VPN.
3333
Providers provide public IP addresses to the organization VDC Edge gateway for IPSEC VPN configuration. An ORG VDC Edge gateway firewall blocks all traffic by default, specific allow rules needs to be added on organization Edge gateway firewall.
3434

35-
Organization VDCs can be part of a single organization and still provide isolation between them. For example, JSVM1 hosted in organization VDC1 cannot ping Azure VM JSVM2 for tenant2.
35+
Organization VDCs can be part of a single organization and still provide isolation between them. For example, VM1 hosted in organization VDC1 cannot ping Azure VM JSVM2 for tenant2.
3636

3737
### Prerequisites
3838
- Organization VDC is configured with an Edge gateway and has Public IPs assigned to it to establish IPSEC VPN by provider.
3939
- Tenants have created a routed Organization VDC network in tenant’s virtual datacenter.
40-
- Test JSVM1 and JSVM2 are created in the Organization VDC1 and VDC2 respectively. Both VMs are connected to the routed orgVDC network in their respective VDCs.
40+
- Test VM1 and VM2 are created in the Organization VDC1 and VDC2 respectively. Both VMs are connected to the routed orgVDC network in their respective VDCs.
4141
- Have a dedicated [Azure vNET](tutorial-configure-networking.md#create-a-vnet-manually) configured for each tenant. For this example, we created Tenant1-vNet and Tenant2-vNet for tenant1 and tenant2 respectively.
4242
- Create an [Azure Virtual network gateway](tutorial-configure-networking.md#create-a-virtual-network-gateway) for vNETs created earlier.
4343
- Deploy Azure VMs JSVM1 and JSVM2 for tenant1 and tenant2 for test purposes.

articles/cognitive-services/language-service/text-analytics-for-health/how-to/call-api.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-service
1010
ms.topic: how-to
11-
ms.date: 03/01/2022
11+
ms.date: 09/05/2022
1212
ms.author: aahi
1313
ms.custom: language-service-health, ignite-fall-2021
1414
---
@@ -38,15 +38,20 @@ By default, Text Analytics for health will use the latest available AI model on
3838

3939
| Supported Versions | latest version |
4040
|--|--|
41+
| `2022-03-01` | `2022-03-01` |
4142
| `2021-05-15` | `2021-05-15` |
4243

44+
4345
### Text Analytics for health container
4446

4547
The [Text Analytics for health container](use-containers.md) uses separate model versioning than the REST API and client libraries. Only one model version is available per container image.
4648

4749
| Endpoint | Container Image Tag | Model version |
4850
|---------------------------------|-----------------------------------------|---------------|
49-
| `/entities/health` | `3.0.016230002-onprem-amd64` (latest) | `2021-05-15` |
51+
| `/entities/health` | `3.0.59413252-onprem-amd64` (latest) | `2022-03-01` |
52+
| `/entities/health` | `3.0.59413252-latin-onprem-amd64` (latin) | `2022-08-15-preview` |
53+
| `/entities/health` | `3.0.59413252-semitic-onprem-amd64` (semitic) | `2022-08-15-preview` |
54+
| `/entities/health` | `3.0.016230002-onprem-amd64` | `2021-05-15` |
5055
| `/entities/health` | `3.0.015370001-onprem-amd64` | `2021-03-01` |
5156
| `/entities/health` | `1.1.013530001-amd64-preview` | `2020-09-03` |
5257
| `/entities/health` | `1.1.013150001-amd64-preview` | `2020-07-24` |
@@ -56,7 +61,7 @@ The [Text Analytics for health container](use-containers.md) uses separate model
5661

5762
### Input languages
5863

59-
Currently the Text Analytics for health only [supports](../language-support.md) the English language.
64+
Currently the Text Analytics for health hosted API only [supports](../language-support.md) the English language. Additional languages are currently in preview when deploying the API in a container, as detailed [under Text Analytics for health languages support](../language-support.md).
6065

6166
## Submitting data
6267

articles/cognitive-services/language-service/text-analytics-for-health/how-to/use-containers.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-service
1010
ms.topic: how-to
11-
ms.date: 04/20/2022
11+
ms.date: 09/05/2022
1212
ms.author: aahi
1313
ms.custom: language-service-health, ignite-fall-2021, devx-track-azurecli
1414
ms.devlang: azurecli
@@ -46,13 +46,12 @@ CPU core and memory correspond to the `--cpus` and `--memory` settings, which ar
4646

4747
## Get the container image with `docker pull`
4848

49-
Use the [`docker pull`](https://docs.docker.com/engine/reference/commandline/pull/) command to download this container image from the Microsoft public container registry.
49+
Use the [`docker pull`](https://docs.docker.com/engine/reference/commandline/pull/) command to download this container image from the Microsoft public container registry. You can find the featured tags on the [dockerhub page](https://hub.docker.com/_/microsoft-azure-cognitive-services-textanalytics-healthcare)
5050

5151
```
52-
docker pull mcr.microsoft.com/azure-cognitive-services/textanalytics/healthcare:latest
52+
docker pull mcr.microsoft.com/azure-cognitive-services/textanalytics/healthcare:<tag-name>
5353
```
5454

55-
5655
[!INCLUDE [Tip for using docker list](../../../../../includes/cognitive-services-containers-docker-list-tip.md)]
5756

5857
## Run the container with `docker run`
@@ -84,7 +83,7 @@ To run the container in your own environment after downloading the container ima
8483

8584
```bash
8685
docker run --rm -it -p 5000:5000 --cpus 6 --memory 12g \
87-
mcr.microsoft.com/azure-cognitive-services/textanalytics/healthcare:latest \
86+
mcr.microsoft.com/azure-cognitive-services/textanalytics/healthcare:<tag-name> \
8887
Eula=accept \
8988
rai_terms=accept \
9089
Billing={ENDPOINT_URI} \

articles/cognitive-services/language-service/text-analytics-for-health/language-support.md

Lines changed: 73 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,91 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-service
1010
ms.topic: conceptual
11-
ms.date: 11/02/2021
11+
ms.date: 9/5/2022
1212
ms.author: aahi
1313
ms.custom: language-service-health, ignite-fall-2021
1414
---
1515

1616
# Language support for Text Analytics for health
1717

18-
> [!NOTE]
19-
> * The container uses different model versions than the API endpoints and SDK.
20-
> * Languages are added as new model versions are released. The current [model versions](how-to/call-api.md#specify-the-text-analytics-for-health-model) for Text Analytics for health are:
21-
> * API and SDK: `2021-05-15`
22-
> * Container: `2021-03-01`
23-
2418
Use this article to learn which natural languages are supported by Text Analytics for health and its Docker container.
2519

26-
## REST API and client library
20+
## Hosted API Service
2721

28-
| Language | Language code | Starting with v3 model version: | Notes |
29-
|:---------|:-------------:|:-----------------------------------------:|:-----:|
30-
| English | `en` | API endpoint and client library: 2019-10-01 | |
22+
The hosted API service supports English language, model version 03-01-2022.
3123

3224
## Docker container
3325

34-
| Language | Language code | Starting with v3 model version: | Notes |
35-
|:---------|:-------------:|:-----------------------------------------:|:-----:|
36-
| English | `en` | Container: 2020-04-16 | |
26+
The docker container supports English language, model version 03-01-2022.
27+
Additional languages are also supported when using a docker container to deploy the API: Spanish, French, German Italian, Portuguese and Hebrew. This functionality is currently in preview, model version 2022-08-15-preview.
28+
Full details for deploying the service in a container can be found [here](../text-analytics-for-health/how-to/use-containers.md).
29+
30+
In order to download the new container images from the Microsoft public container registry, use the [docker pull](https://docs.docker.com/engine/reference/commandline/pull/) command, as follows :
31+
32+
For English, Spanish, Italian, French, German and Portuguese:
33+
34+
```
35+
docker pull mcr.microsoft.com/azure-cognitive-services/textanalytics/latin
36+
```
37+
38+
For Hebrew:
39+
40+
```
41+
docker pull mcr.microsoft.com/azure-cognitive-services/textanalytics/semitic
42+
```
43+
44+
45+
When structuring the API request, the relevant language tags must be added for these languages:
46+
47+
```
48+
English – “en”
49+
Spanish – “es”
50+
French - “fr”
51+
German – “de”
52+
Italian – “it”
53+
Portuguese – “pt”
54+
Hebrew – “he”
55+
```
56+
57+
The following json is an example of a JSON file attached to the Language request's POST body, for a Spanish document:
58+
59+
```json
60+
json
61+
62+
{
63+
"analysisInput": {
64+
"documents": [
65+
{
66+
"text": "El médico prescrió 200 mg de ibuprofeno.",
67+
"language": "es",
68+
"id": "1"
69+
}
70+
]
71+
},
72+
"tasks": [
73+
{
74+
"taskName": "analyze 1",
75+
"kind": "Healthcare",
76+
"parameters": {
77+
"fhirVersion": "4.0.1"
78+
}
79+
}
80+
]
81+
}
82+
```
83+
## Details of the supported model versions for each language:
84+
85+
86+
| Language code | model version: | Featured Tag | Specific Tag |
87+
|:--------------------|:-------------:|:-------------------:|:------------------:|
88+
| en | 2022-03-01 | latest | 3.0.59413252-onprem-amd64 |
89+
| en,es,it,fr,de,pt | 2022-08-15-preview | latin | 3.0.59413252-latin-onprem-amd64 |
90+
| he | 2022-08-15-preview | semitic | 3.0.59413252-semitic-onprem-amd64 |
91+
92+
93+
94+
95+
3796

3897
## See also
3998

articles/postgresql/flexible-server/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ One advantage of running your workload in Azure is global reach. The flexible se
9898
| Brazil South | :heavy_check_mark: (v3 only) | :x: | :x: |
9999
| Canada Central | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
100100
| Canada East | :heavy_check_mark: | :x: | :heavy_check_mark: |
101-
| Central India | :heavy_check_mark: | :heavy_check_mark: ** | :heavy_check_mark: |
101+
| Central India | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
102102
| Central US | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
103103
| China East 3 | :heavy_check_mark: | :x: | :x:|
104104
| China North 3 | :heavy_check_mark: | :x: | :x:|

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-availability-zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ When you deploy a scale set, you also have the option to deploy with a single [p
4343
4444
### Zone balancing
4545

46-
Finally, for scale sets deployed across multiple zones, you also have the option of choosing "best effort zone balance" or "strict zone balance". A scale set is considered "balanced" if each zone the same number of VMs or +\\- 1 VM in all other zones for the scale set. For example:
46+
Finally, for scale sets deployed across multiple zones, you also have the option of choosing "best effort zone balance" or "strict zone balance". A scale set is considered "balanced" if each zone has the same number of VMs +\\- 1 VM as all other zones for the scale set. For example:
4747

4848
- A scale set with 2 VMs in zone 1, 3 VMs in zone 2, and 3 VMs in zone 3 is considered balanced. There is only one zone with a different VM count and it is only 1 less than the other zones.
4949
- A scale set with 1 VM in zone 1, 3 VMs in zone 2, and 3 VMs in zone 3 is considered unbalanced. Zone 1 has 2 fewer VMs than zones 2 and 3.

0 commit comments

Comments
 (0)