Skip to content

Commit 409507f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into apicteams
2 parents f179db4 + 0f7a820 commit 409507f

File tree

168 files changed

+4053
-2249
lines changed

Some content is hidden

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

168 files changed

+4053
-2249
lines changed

.openpublishing.redirection.json

Lines changed: 70 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,55 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/application-gateway/resource-manager-template-samples.md",
5+
"redirect_url": "/previous-versions/azure/application-gateway/resource-manager-template-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/application-gateway/cli-samples.md",
10+
"redirect_url": "/previous-versions/azure/application-gateway/cli-samples",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/application-gateway/scripts/create-vmss-cli.md",
15+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-cli",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/application-gateway/scripts/create-vmss-powershell.md",
20+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/application-gateway/scripts/waf-custom-rules-powershell.md",
25+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/waf-custom-rules-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/dns/scripts/dns-cli-create-dns-zone-record.md",
30+
"redirect_url": "/previous-versions/azure/dns/scripts/dns-cli-create-dns-zone-record",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/dns/scripts/find-unhealthy-dns-records.md",
35+
"redirect_url": "/previous-versions/azure/dns/scripts/find-unhealthy-dns-records",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/dns/cli-samples.md",
40+
"redirect_url": "/previous-versions/azure/dns/cli-samples",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability.md",
45+
"redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/traffic-manager/cli-samples.md",
50+
"redirect_url": "/previous-versions/azure/traffic-manager/cli-samples",
51+
"redirect_document_id": false
52+
},
353
{
454
"source_path": "articles/expressroute/about-public-peering.md",
555
"redirect_url": "/previous-versions/azure/expressroute/about-public-peering",
@@ -4856,11 +4906,27 @@
48564906
"source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
48574907
"redirect_url": "/azure/reliability/reliability-event-grid",
48584908
"redirect_document_id": false
4909+
},
4910+
{
4911+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-powershell.md",
4912+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4913+
"redirect_document_id": false
4914+
},
4915+
{
4916+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-cli.md",
4917+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4918+
"redirect_document_id": false
4919+
},
4920+
{
4921+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-cli.md",
4922+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4923+
"redirect_document_id": true
4924+
},
4925+
{
4926+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
4927+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4928+
"redirect_document_id": false
48594929
}
48604930

4861-
4862-
4863-
4864-
48654931
]
48664932
}

articles/ai-services/openai/how-to/deployment-types.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Azure OpenAI offers three types of deployments. These provide a varied level of
3535
| **Getting started** | [Model deployment](./create-resource.md) | [Model deployment](./create-resource.md) | [Provisioned onboarding](./provisioned-throughput-onboarding.md) |
3636
| **Cost** | [Global deployment pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | [Regional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | May experience cost savings for consistent usage |
3737
| **What you get** | Easy access to all new models with highest default pay-per-call limits.<br><br> Customers with high volume usage may see higher latency variability | Easy access with [SLA on availability](https://azure.microsoft.com/support/legal/sla/). Optimized for low to medium volume workloads with high burstiness. <br><br>Customers with high consistent volume may experience greater latency variability. | Regional access with very high & predictable throughput. Determine throughput per PTU using the provided [capacity calculator](./provisioned-throughput-onboarding.md#estimate-provisioned-throughput-and-cost) |
38-
| **What you don’t get** | ❌Data residency guarantees | ❌High volume w/consistent low latency | ❌Pay-per-call flexibility |
38+
| **What you don’t get** |❌Data processing guarantee<br> <br> Data might be processed outside of the resource's Azure geography, but data storage remains in its Azure geography. [Learn more about data residency](https://azure.microsoft.com/explore/global-infrastructure/data-residency/) | ❌High volume w/consistent low latency | ❌Pay-per-call flexibility |
3939
| **Per-call Latency** | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time. |
4040
| **Sku Name in code** | `GlobalStandard` | `Standard` | `ProvisionedManaged` |
4141
| **Billing model** | Pay-per-token | Pay-per-token | Monthly Commitments |
@@ -52,6 +52,9 @@ Standard deployments are optimized for low to medium volume workloads with high
5252

5353
## Global standard
5454

55+
> [!IMPORTANT]
56+
> Data might be processed outside of the resource's Azure geography, but data storage remains in its Azure geography. [Learn more about data residency](https://azure.microsoft.com/explore/global-infrastructure/data-residency/).
57+
5558
Global deployments are available in the same Azure OpenAI resources as non-global offers but allow you to leverage Azure's global infrastructure to dynamically route traffic to the data center with best availability for each request. Global standard will provide the highest default quota for new models and eliminates the need to load balance across multiple resources.
5659

5760
The deployment type is optimized for low to medium volume workloads with high burstiness. Customers with high consistent volume may experience greater latency variability. The threshold is set per model. See the [quotas page to learn more](./quota.md).

0 commit comments

Comments
 (0)