Merge pull request #259111 from MicrosoftDocs/main

11/20/2023 PM Publish

Author: Taojunshen

.openpublishing.redirection.azure-kubernetes-service.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/aks/managed-azure-ad.md",
+            "redirect_url": "/azure/aks/enable-authentication-microsoft-entra-id.md",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/stop-api-upgrade.md",
             "redirect_url": "/azure/aks/upgrade-cluster",

.openpublishing.redirection.json

@@ -10232,6 +10232,11 @@
             "redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/vpn-gateway/tutorial-protect-vpn-gateway.md",
+            "redirect_url": "/azure/vpn-gateway/tutorial-create-gateway-portal",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
             "redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
@@ -10537,6 +10542,11 @@
             "redirect_url": "/azure/bastion/tutorial-create-host-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/bastion/tutorial-protect-bastion-host-ddos.md",
+            "redirect_url": "/azure/bastion/tutorial-create-host-portal",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/bastion/bastion-connect-vm-rdp.md",
             "redirect_url": "/azure/bastion/bastion-connect-vm-rdp-windows",

articles/ai-services/openai/concepts/provisioned-throughput.md

@@ -0,0 +1,57 @@
+---
+title: Azure OpenAI Service provisioned throughput
+description: Learn about provisioned throughput and Azure OpenAI. 
+ms.service: azure-ai-openai
+ms.topic: conceptual 
+ms.date: 11/20/2023
+ms.custom: 
+manager: nitinme
+author: mrbullwinkle #ChrisHMSFT
+ms.author: mbullwin #chrhoder
+recommendations: false
+keywords: 
+---
+
+# What is provisioned throughput?
+
+The provisioned throughput capability allows you to specify the amount of throughput you require for your application. The service then provisions the necessary compute and ensures it is ready for you. Throughput is defined in terms of provisioned throughput units (PTU) which is a normalized way of representing an amount of throughput for your deployment. Each model-versions pair requires different amounts of PTU to deploy and provide different amounts of throughput per PTU.
+
+## What does the provisioned deployment type provide?
+
+- **Predictable performance:** stable max latency and throughput for uniform workloads.
+- **Reserved processing capacity:** A deployment configures the amount of throughput. Once deployed, the throughput is available whether used or not.
+- **Cost savings:** High throughput workloads will result in cost savings vs token-based consumption.
+
+An Azure OpenAI Deployment is a unit of management for a specific OpenAI Model. A deployment provides customer access to a model for inference and integrates additional features like Content Moderation ([See content moderation documentation](content-filter.md)).
+
+> [!NOTE]
+> Provisioned throughput units (PTU) are different from standard quota in Azure OpenAI and are not available by default. To learn more about this offering contact your Microsoft Account Team.
+
+## What do you get?
+
+|Topic | Provisioned|
+|---|---|
+| What is it? | Provides guaranteed throughput at smaller increments than the existing provisioned offer. Deployments will have a consistent max latency for a given model-version |
+| Who is it for? | Customers who want guaranteed throughput with minimal latency variance. |
+| Quota | Provisioned-managed throughput Units |
+| Latency | Max latency constrained |
+| Utilization | Provisioned-managed Utilization measure provided in Azure Monitor |
+| Estimating size | Provided calculator in the studio & load test script |
+
+## Key concepts
+
+### Provisioned throughput units
+
+Provisioned throughput Units (PTU) are units of model processing capacity that customers you can reserve and deploy for processing prompts and generating completions. The minimum PTU deployment, increments, and processing capacity associated with each unit varies by model type & version.
+
+### Deployment types
+
+We introduced a new deployment type called **ProvisionedManaged** which provides smaller increments of PTU per deployment. Both types have their own quota, and you will only see the options you have been enabled for.
+
+### Quota
+
+Provisioned throughput quota represents a specific amount of total throughput you can deploy. Quota in the Azure OpenAI Service is managed at the subscription level meaning that it can be consumed by different resources within that subscription.
+
+Quota is specific to a (deployment type, mode, region) triplet and isn't interchangeable. Meaning you can't use quota for GPT-4 to deploy GPT-35-turbo. Customers can raise a support request to move the quota across deployment types, models, or regions but we can't guarantee that it will be possible.
+
+While we make every attempt to ensure that quota is always deployable, quota does not represent a guarantee that the underlying capacity is available for the customer to use. The service assigns capacity to the customer at deployment time and if capacity is unavailable the deployment will fail with an out of capacity error.

articles/ai-services/openai/includes/chatgpt-dotnet.md

@@ -12,7 +12,7 @@ ms.date: 11/15/2023
 keywords:
 ---
 
-[Source code](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/src) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.OpenAI/) | [Samples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples)| [Enterprise chat app template](/dotnet/azure/ai/get-started-app-chat-template) |
+[Source code](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/src) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.OpenAI/) | [Samples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples)| [Retrieval Augmented Generation (RAG) enterprise chat template](/dotnet/azure/ai/get-started-app-chat-template) |
 
 ## Prerequisites
 

articles/ai-services/openai/includes/chatgpt-java.md

@@ -12,7 +12,7 @@ ms.date: 07/26/2023
 keywords: 
 ---
 
-[Source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai) | [Artifact (Maven)](https://central.sonatype.com/artifact/com.azure/azure-ai-openai/1.0.0-beta.3) | [Samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai/src/samples) | [Enterprise chat app template](/azure/developer/java/quickstarts/get-started-app-chat-template) |
+[Source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai) | [Artifact (Maven)](https://central.sonatype.com/artifact/com.azure/azure-ai-openai/1.0.0-beta.3) | [Samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai/src/samples) | [Retrieval Augmented Generation (RAG) enterprise chat template](/azure/developer/java/quickstarts/get-started-app-chat-template) |
 
 ## Prerequisites
 

articles/ai-services/openai/includes/chatgpt-javascript.md

@@ -12,7 +12,7 @@ ms.date: 07/26/2023
 keywords: 
 ---
 
-[Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/openai/openai) | [Package (npm)](https://www.npmjs.com/package/@azure/openai) | [Samples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples) | [Enterprise chat app template](/azure/developer/javascript/get-started-app-chat-template)|
+[Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/openai/openai) | [Package (npm)](https://www.npmjs.com/package/@azure/openai) | [Samples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples) | [Retrieval Augmented Generation (RAG) enterprise chat template](/azure/developer/javascript/get-started-app-chat-template)|
 
 ## Prerequisites
 

articles/ai-services/openai/includes/chatgpt-python.md

@@ -12,7 +12,7 @@ ms.date: 11/15/2023
 keywords: 
 ---
 
-[Library source code](https://github.com/openai/openai-python?azure-portal=true) | [Package (PyPi)](https://pypi.org/project/openai?azure-portal=true) | [Enterprise chat app template](/azure/developer/python/get-started-app-chat-template) |
+[Library source code](https://github.com/openai/openai-python?azure-portal=true) | [Package (PyPi)](https://pypi.org/project/openai?azure-portal=true) | [Retrieval Augmented Generation (RAG) enterprise chat template](/azure/developer/python/get-started-app-chat-template) |
 
 ## Prerequisites
 

articles/ai-services/openai/toc.yml

@@ -51,6 +51,8 @@ items:
       href: ./concepts/model-versions.md
     - name: Prompt engineering techniques
       href: ./concepts/advanced-prompt-engineering.md
+    - name: Provisioned throughput units (PTU)
+      href: ./concepts/provisioned-throughput.md
     - name: System message templates
       href: ./concepts/system-message.md
     - name: Using your data (preview)
@@ -159,6 +161,23 @@ items:
       href: /rest/api/azureopenai/fine-tuning?view=rest-azureopenai-2023-10-01-preview&preserve-view=true 
     - name: REST API (resource creation & deployment)
       href: /rest/api/cognitiveservices/accountmanagement/deployments/create-or-update?tabs=HTTP
+    - name: Templates
+      items: 
+        - name: Retrieval Augmented Generation (RAG) enterprise chat
+          displayName: RAG, rag
+          items:
+            - name: C#
+              href: /dotnet/azure/ai/get-started-app-chat-template
+              displayName: RAG, rag
+            - name: Java
+              href: /azure/developer/java/quickstarts/get-started-app-chat-template
+              displayName: RAG, rag
+            - name: JavaScript
+              href: /azure/developer/javascript/get-started-app-chat-template
+              displayName: RAG, rag
+            - name: Python
+              href: /azure/developer/python/get-started-app-chat-template
+              displayName: RAG, rag
 - name: Resources
   items: 
     - name: Support and help options

articles/aks/azure-ad-integration-cli.md

@@ -336,5 +336,5 @@ For best practices on identity and resource control, see [Best practices for aut
 [operator-best-practices-identity]: operator-best-practices-identity.md
 [azure-ad-rbac]: azure-ad-rbac.md
 [managed-aad]: managed-azure-ad.md
-[managed-aad-migrate]: managed-azure-ad.md#upgrade-a-legacy-azure-ad-cluster-to-aks-managed-azure-ad-integration
+[managed-aad-migrate]: managed-azure-ad.md#migrate-a-legacy-azure-ad-cluster-to-integration
 [az-aks-show]: /cli/azure/aks#az_aks_show