Skip to content

Commit ef5d6d8

Browse files
halkazwinihalkazwini
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-schema
2 parents 2b18cae + 4aac476 commit ef5d6d8

File tree

71 files changed

+555
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+555
-224
lines changed

‎articles/ai-services/openai/includes/model-matrix/provisioned-models.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ ms.topic: include
88
ms.date: 05/18/2024
99
---
1010

11-
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
12-
|:-------------------|:-------------------:|:---------------------------:|:---------------------------:|:-------------------------------:|:-----------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
13-
| australiaeast | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
14-
| brazilsouth | ✅ | ✅ | - | - | | ✅ | ✅ | - |
15-
| canadacentral | ✅ | - | - | - | | ✅ | - | ✅ |
16-
| canadaeast | ✅ | ✅ | - | - | | - | ✅ | - |
17-
| eastus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
18-
| eastus2 | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
19-
| francecentral | ✅ | ✅ | ✅ | - | | ✅ | - | ✅ |
20-
| germanywestcentral | ✅ | ✅ | ✅ | - | | ✅ | ✅ | - |
21-
| japaneast | - | ✅ | ✅ | ✅ | ✅ | - | - | ✅ |
22-
| koreacentral | ✅ | - | - | - | | ✅ | ✅ | - |
23-
| northcentralus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
24-
| norwayeast | ✅ | - | ✅ | - | | ✅ | - | - |
25-
| polandcentral | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
26-
| southafricanorth | ✅ | ✅ | - | - | | ✅ | ✅ | - |
27-
| southcentralus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
28-
| southindia | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
29-
| swedencentral | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
30-
| switzerlandnorth | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
31-
| switzerlandwest | - | - | - | - | | - | - | ✅ |
32-
| uksouth | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
33-
| westus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
34-
| westus3 | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
11+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
12+
|:-------------------|:-------------------:|:---------------------------:|:---------------------------:|:-------------------------------:|:--------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
13+
| australiaeast | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
14+
| brazilsouth | ✅ | ✅ | - | - | | ✅ | ✅ | - |
15+
| canadacentral | ✅ | - | - | - | | ✅ | - | ✅ |
16+
| canadaeast | ✅ | ✅ | - | - | | - | ✅ | - |
17+
| eastus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
18+
| eastus2 | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
19+
| francecentral | ✅ | ✅ | ✅ | - | | ✅ | - | ✅ |
20+
| germanywestcentral | ✅ | ✅ | ✅ | - | | ✅ | ✅ | - |
21+
| japaneast | - | ✅ | ✅ | ✅ | ✅ | - | - | ✅ |
22+
| koreacentral | ✅ | - | - | - | ✅ | ✅ | ✅ | - |
23+
| northcentralus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
24+
| norwayeast | ✅ | - | ✅ | - | | ✅ | - | - |
25+
| polandcentral | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
26+
| southafricanorth | ✅ | ✅ | - | - | | ✅ | ✅ | - |
27+
| southcentralus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
28+
| southindia | ✅ | ✅ | ✅ | - | | ✅ | ✅ | ✅ |
29+
| swedencentral | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
30+
| switzerlandnorth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ | ✅ |
31+
| switzerlandwest | - | - | - | - | | - | - | ✅ |
32+
| uksouth | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
33+
| westus | ✅ | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
34+
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |

‎articles/ai-services/speech-service/captioning-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The following are aspects to consider when using captioning:
2727
* Let your audience know that captions are generated by an automated service.
2828
* Center captions horizontally on the screen, in a large and prominent font.
2929
* Consider whether to use partial results, when to start displaying captions, and how many words to show at a time.
30-
* Learn about captioning protocols such as [SMPTE-TT](https://ieeexplore.ieee.org/document/7291854).
30+
* Learn about captioning protocols such as [SMPTE-TT](https://pub.smpte.org/doc/st2052-1/20101203-pub/st2052-1-2010.pdf).
3131
* Consider output formats such as SRT (SubRip Text) and WebVTT (Web Video Text Tracks). These can be loaded onto most video players such as VLC, automatically adding the captions on to your video.
3232

3333
> [!TIP]

‎articles/ai-studio/how-to/create-azure-ai-resource.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ author: Blackmist
1818

1919
[!INCLUDE [Feature preview](~/reusable-content/ce-skilling/azure/includes/ai-studio/includes/feature-preview.md)]
2020

21-
As an administrator, you can create and manage Azure AI Studio hubs. Hubs provide a hosting environment for the AI Studio projects of a team, and help you as an IT admin centrally set up security settings and govern usage and spend. You can create and manage a hub from the Azure portal or from the AI Studio.
21+
In AI Studio, hubs provide the environment for a team to collaborate and organize work, and help you as a team lead or IT admin centrally set up security settings and govern usage and spend. You can create and manage a hub from the Azure portal or from the AI Studio.
2222

23-
In this article, you learn how to create and manage a hub in AI Studio (for getting started).
23+
In this article, you learn how to create and manage a hub in AI Studio with the default settings so you can get started quickly. Do you need to customize security or the dependent resources of your hub? Then use [Azure Portal](create-secure-ai-hub.md) or [template options](create-azure-ai-hub-template.md).
2424

2525
## Create a hub in AI Studio
2626

‎articles/azure-arc/data/includes/network-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ms.date: 04/18/2022
1010
|**Service**|**Port**|**URL**|**Direction**|**Notes**|
1111
|--|--|--|--|--|
1212
| Helm chart (direct connected mode only) | 443 | `arcdataservicesrow1.azurecr.io` | Outbound |Provisions the Azure Arc data controller bootstrapper and cluster level objects, such as custom resource definitions, cluster roles, and cluster role bindings, is pulled from an Azure Container Registry. |
13-
| Azure monitor APIs <sup>*</sup> | 443 |`*.ods.opinsights.azure.com`<br/>`*.oms.opinsights.azure.com`<br/>`*.monitoring.azure.com` | Outbound | Azure Data Studio and Azure CLI connect to the Azure Resource Manager APIs to send and retrieve data to and from Azure for some features. See [Azure Monitor APIs](#azure-monitor-apis). |
14-
| Azure Arc data processing service <sup>*</sup>| 443 |`*.<region>.arcdataservices.com` <sup>2</sup> | Outbound | |
13+
| Azure monitor APIs <sup>1</sup> | 443 |`*.ods.opinsights.azure.com`<br/>`*.oms.opinsights.azure.com`<br/>`*.monitoring.azure.com` | Outbound | Azure Data Studio and Azure CLI connect to the Azure Resource Manager APIs to send and retrieve data to and from Azure for some features. See [Azure Monitor APIs](#azure-monitor-apis). |
14+
| Azure Arc data processing service <sup>1</sup>| 443 |`*.<region>.arcdataservices.com` <sup>2</sup> | Outbound | |
1515

1616
<sup>1</sup> Requirement depends on deployment mode:
1717

‎articles/azure-arc/network-requirements-consolidated.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Arc network requirements
33
description: A consolidated list of network requirements for Azure Arc features and Azure Arc-enabled services. Lists endpoints, ports, and protocols.
4-
ms.date: 05/22/2024
4+
ms.date: 06/04/2024
55
ms.topic: reference
66
---
77

@@ -58,25 +58,23 @@ This section describes additional networking requirements specific to deploying
5858

5959
For more information, see [Azure Arc resource bridge network requirements](resource-bridge/network-requirements.md).
6060

61-
## Azure Arc-enabled System Center Virtual Machine Manager
61+
## Azure Arc-enabled VMware vSphere
6262

63-
Azure Arc-enabled System Center Virtual Machine Manager (SCVMM) also requires:
63+
Azure Arc-enabled VMware vSphere also requires:
6464

65-
| **Service** | **Port** | **URL** | **Direction** | **Notes**|
66-
| --- | --- | --- | --- | --- |
67-
| SCVMM management Server | 443 | URL of the SCVMM management server | Appliance VM IP and control plane endpoint need outbound connection. | Used by the SCVMM server to communicate with the Appliance VM and the control plane. |
65+
[!INCLUDE [network-requirements](vmware-vsphere/includes/network-requirements.md)]
6866

69-
For more information, see [Overview of Arc-enabled System Center Virtual Machine Manager](system-center-virtual-machine-manager/overview.md).
67+
For more information, see [Support matrix for Azure Arc-enabled VMware vSphere](vmware-vsphere/support-matrix-for-arc-enabled-vmware-vsphere.md).
7068

71-
## Azure Arc-enabled VMware vSphere
69+
## Azure Arc-enabled System Center Virtual Machine Manager
7270

73-
Azure Arc-enabled VMware vSphere also requires:
71+
Azure Arc-enabled System Center Virtual Machine Manager (SCVMM) also requires:
7472

7573
| **Service** | **Port** | **URL** | **Direction** | **Notes**|
7674
| --- | --- | --- | --- | --- |
77-
| vCenter Server | 443 | URL of the vCenter server | Appliance VM IP and control plane endpoint need outbound connection. | Used to by the vCenter server to communicate with the Appliance VM and the control plane.|
75+
| SCVMM management Server | 443 | URL of the SCVMM management server | Appliance VM IP and control plane endpoint need outbound connection. | Used by the SCVMM server to communicate with the Appliance VM and the control plane. |
7876

79-
For more information, see [Support matrix for Azure Arc-enabled VMware vSphere](vmware-vsphere/support-matrix-for-arc-enabled-vmware-vsphere.md).
77+
For more information, see [Overview of Arc-enabled System Center Virtual Machine Manager](system-center-virtual-machine-manager/overview.md).
8078

8179
## Additional endpoints
8280

‎articles/azure-arc/resource-bridge/network-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Arc resource bridge network requirements
33
description: Learn about network requirements for Azure Arc resource bridge including URLs that must be allowlisted.
44
ms.topic: conceptual
5-
ms.date: 05/22/2024
5+
ms.date: 06/04/2024
66
---
77

88
# Azure Arc resource bridge network requirements
@@ -18,7 +18,7 @@ Arc resource bridge communicates outbound securely to Azure Arc over TCP port 44
1818
[!INCLUDE [network-requirements](includes/network-requirements.md)]
1919

2020
> [!NOTE]
21-
> The URLs listed here are required for Arc resource bridge only. Other Arc products (such as Arc-enabled VMware vSphere) may have additional required URLs. For details, see [Azure Arc network requirements](../network-requirements-consolidated.md).
21+
> The URLs listed here are required for Arc resource bridge only. Other Arc products (such as Arc-enabled VMware vSphere) may have additional required URLs. For details, see [Azure Arc network requirements](../network-requirements-consolidated.md#azure-arc-enabled-vmware-vsphere).
2222
2323
## SSL proxy configuration
2424

‎articles/azure-arc/vmware-vsphere/includes/network-requirements.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
ms.topic: include
3+
ms.date: 06/04/2024
4+
---
5+
6+
| **Service** | **Port** | **URL** | **Direction** | **Notes**|
7+
| --- | --- | --- | --- | --- |
8+
| vCenter Server | 443 | URL of the vCenter server | Appliance VM IP and control plane endpoint need outbound connection. | Used to by the vCenter server to communicate with the Appliance VM and the control plane.|
9+
| VMware Cluster Extension | 443 | `azureprivatecloud.azurecr.io` | Appliance VM IPs need outbound connection. | Pull container images for Microsoft.VMWare and Microsoft.AVS Cluster Extension.|
10+
| Azure CLI and Azure CLI Extensions | 443 | `*.blob.core.windows.net` | Management machine needs outbound connection. | Download Azure CLI Installer and Azure CLI extensions.|
11+
| Azure Resource Manager | 443 | `management.azure.com` | Management machine needs outbound connection. | Required to create/update resources in Azure using ARM.|
12+
| Helm Chart for Azure Arc Agents | 443 | `*.dp.kubernetesconfiguration.azure.com` | Management machine needs outbound connection. | Data plane endpoint for downloading the configuration information of Arc agents.|
13+
| Azure CLI | 443 | - `login.microsoftonline.com` <br> <br> - `aka.ms` | Management machine needs outbound connection. | Required to fetch and update Azure Resource Manager tokens.|

0 commit comments

Comments
 (0)