Merge pull request #268820 from MicrosoftDocs/main

3/12 OOB publish at 12PM

Author: huypub

articles/ai-services/openai/concepts/model-retirements.md

@@ -0,0 +1,128 @@
+---
+title: Azure OpenAI Service model retirements
+titleSuffix: Azure OpenAI
+description: Learn about the model deprecations and retirements in Azure OpenAI.
+ms.service: azure-ai-openai
+ms.topic: conceptual
+ms.date: 03/13/2024
+ms.custom: 
+manager: nitinme
+author: mrbullwinkle
+ms.author: mbullwin 
+recommendations: false
+---
+
+# Azure OpenAI Service model deprecations and retirements
+
+## Overview
+
+Azure OpenAI Service models are continually refreshed with newer and more capable models. As part of this process, we deprecate and retire older models. This document provides information about the models that are currently available, deprecated, and retired.
+
+### Terminology
+
+* Retirement
+	* When a model is retired, it's no longer available for use. Azure OpenAI Service deployments of a retired model always return error responses.
+* Deprecation
+	* When a model is deprecated, it's no longer available for new customers. It continues to be available for use by customers with existing deployments until the model is retired.
+
+## Preretirement notification
+
+Azure OpenAI notifies customers of active Azure OpenAI Service deployments for models with upcoming retirements. We notify customers of upcoming retirements as follows for each deployment:
+
+* At least 60 days before retirement 
+* At least 30 days before retirement 
+* At retirement
+
+Retirements are done on a rolling basis, region by region.
+
+### Who is notified of upcoming retirements
+
+Azure OpenAI notifies those who are members of the following roles for each subscription with a deployment of a model with an upcoming retirement.
+
+* Owner
+* Contributor
+* Reader
+* Monitoring contributor
+* Monitoring reader
+
+## How to get ready for model retirements and version upgrades
+
+To prepare for model retirements and version upgrades, we recommend that customers evaluate their applications with the new models and versions and evaluate their behavior. We also recommend that customers update their applications to use the new models and versions before the retirement date.
+
+For more information, see [How to upgrade to a new model or version](./model-versions.md).
+
+## Current models
+
+These models are currently available for use in Azure OpenAI Service.
+
+| Model | Version | Retirement date |
+| ---- | ---- | ---- |
+| `gpt-35-turbo` | 0301 | No earlier than June 13, 2024 |
+| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | No earlier than July 13, 2024 |
+| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2025 |
+| `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
+| `gpt-4`<br>`gpt-4-32k` | 0314 | No earlier than July 13, 2024 |
+| `gpt-4`<br>`gpt-4-32k` | 0613 | No earlier than Sep 30, 2024 |
+| `gpt-4` | 1106-preview | To be upgraded to a stable version with date to be announced |
+| `gpt-4` | 0125-preview | To be upgraded to a stable version with date to be announced |
+| `gpt-4` | vision-preview | To be upgraded to a stable version with date to be announced |
+| `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |
+| `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 |
+| `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 |
+| `text-embedding-3-small` | | No earlier than Feb 2, 2025 |
+| `text-embedding-3-large` | | No earlier than Feb 2, 2025 |
+
+
+## Deprecated models
+
+These models were deprecated on July 6, 2023 and will be retired on July 5, 2024. These models are no longer available for new deployments. Deployments created before July 6, 2023 remain available to customers until July 5, 2024. We recommend customers migrate their applications to deployments of replacement models before the July 5, 2024 retirement.
+
+If you're an existing customer looking for information about these models, see [Legacy models](./legacy-models.md).
+
+| Model | Deprecation date | Retirement date | Suggested replacement |
+| --------- | --------------------- | ------------------- | -------------------- | 
+| ada | July 6, 2023 | July 5, 2024 | babbage-002 |
+| babbage | July 6, 2023 | July 5, 2024 | babbage-002 |
+| curie | July 6, 2023 | July 5, 2024 | davinci-002 |
+| davinci | July 6, 2023 | July 5, 2024 | davinci-002 |
+| text-ada-001 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| text-babbage-001 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| text-curie-001 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| text-davinci-002 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| text-davinci-003 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| code-cushman-001 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| code-davinci-002 | July 6, 2023 | July 5, 2024 | gpt-35-turbo-instruct |
+| text-similarity-ada-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-similarity-babbage-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-similarity-curie-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-similarity-davinci-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-ada-doc-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-ada-query-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-babbage-doc-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-babbage-query-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-curie-doc-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-curie-query-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-davinci-doc-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| text-search-davinci-query-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| code-search-ada-code-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| code-search-ada-text-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| code-search-babbage-code-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+| code-search-babbage-text-001 | July 6, 2023 | July 5, 2024 | text-embedding-3-small |
+
+## Retirement and deprecation history
+
+### March 13, 2024
+
+We published this document to provide information about the current models, deprecated models, and upcoming retirements.
+
+### February 23, 2024
+
+We announced the upcoming in-place upgrade of `gpt-4` version `1106-preview` to `0125-preview` to start no earlier than March 8, 2024.
+
+### November 30, 2023
+
+The default version of `gpt-4` and `gpt-3-32k` was updated from `0314` to `0613` starting on November 30, 2023. The upgrade of `0314` deployments set for autoupgrade to `0613` was completed on December 3, 2023.
+
+### July 6, 2023
+
+We announced the deprecation of models with upcoming retirement on July 5, 2024.

articles/ai-services/openai/references/azure-search.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI on your Azure Search data Python & RE
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/14/2024
+ms.date: 03/12/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -14,7 +14,7 @@ ms.custom: devx-track-python
 
 # Data source - Azure AI Search
 
-The configurable options of Azure AI Search when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-15-preview`.
+The configurable options of Azure AI Search when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-01`.
 
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
@@ -141,7 +141,7 @@ token_provider = get_bearer_token_provider(DefaultAzureCredential(), "https://co
 client = AzureOpenAI(
     azure_endpoint=endpoint,
     azure_ad_token_provider=token_provider,
-    api_version="2024-02-15-preview",
+    api_version="2024-02-01",
 )
 
 completion = client.chat.completions.create(
@@ -176,7 +176,7 @@ print(completion.model_dump_json(indent=2))
 
 ```bash
 az rest --method POST \
- --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-15-preview \
+ --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-01 \
  --resource https://cognitiveservices.azure.com/ \
  --body \
 '

articles/ai-services/openai/references/cosmos-db.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI on your Azure Cosmos DB data Python &
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/14/2024
+ms.date: 03/12/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -14,7 +14,7 @@ ms.custom: devx-track-python
 
 # Data source - Azure Cosmos DB for MongoDB vCore
 
-The configurable options of Azure Cosmos DB for MongoDB vCore when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-15-preview`.
+The configurable options of Azure Cosmos DB for MongoDB vCore when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-01`.
 
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
@@ -127,7 +127,7 @@ token_provider = get_bearer_token_provider(
 client = AzureOpenAI(
     azure_endpoint=endpoint,
     azure_ad_token_provider=token_provider,
-    api_version="2024-02-15-preview",
+    api_version="2024-02-01",
 )
 
 completion = client.chat.completions.create(
@@ -178,7 +178,7 @@ print(completion.model_dump_json(indent=2))
 ```bash
 
 az rest --method POST \
- --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-15-preview \
+ --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-01 \
  --resource https://cognitiveservices.azure.com/ \
  --body \
 '

articles/ai-services/openai/references/on-your-data.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI On Your Data Python & REST API.
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/14/2024
+ms.date: 03/12/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -14,10 +14,10 @@ ms.custom: devx-track-python
 
 # Azure OpenAI On Your Data API Reference
 
-This article provides reference documentation for Python and REST for the new Azure OpenAI On Your Data API. The latest preview api-version is `2024-02-15-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2024-02-15-preview/inference.json).
+This article provides reference documentation for Python and REST for the new Azure OpenAI On Your Data API. The latest API version is `2024-02-01` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/stable/2024-02-01).
 
 > [!NOTE]
-> Since `2024-02-15-preview` we introduced the following breaking changes comparing to earlier API versions:
+> Since API version `2024-02-15-preview` we introduced the following breaking changes comparing to earlier API versions:
 > * The API path is changed from `/extensions/chat/completions` to `/chat/completions`.
 > * The naming convention of property keys and enum values is changed from camel casing to snake casing. Example: `deploymentName` is changed to `deployment_name`.
 > * The data source type `AzureCognitiveSearch` is changed to `azure_search`.
@@ -27,6 +27,13 @@ This article provides reference documentation for Python and REST for the new Az
 POST {endpoint}/openai/deployments/{deployment-id}/chat/completions?api-version={api-version}
 ```
 
+**Supported versions**
+* `2024-02-15-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2024-02-15-preview/inference.json)
+* `2024-02-01` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/stable/2024-02-01).
+
+> [!NOTE]
+> [Azure Machine learning indexes](./azure-machine-learning.md), [Pinecone](./pinecone.md), and [Elasticsearch](./elasticsearch.md) are only supported in the `2024-02-15-preview` API version.
+
 ## URI parameters
 
 |Name               | In   | Type     | Required | Description                                                                           |
@@ -118,7 +125,7 @@ token_provider = get_bearer_token_provider(DefaultAzureCredential(), "https://co
 client = AzureOpenAI(
     azure_endpoint=endpoint,
     azure_ad_token_provider=token_provider,
-    api_version="2024-02-15-preview",
+    api_version="2024-02-01",
 )
 
 completion = client.chat.completions.create(
@@ -164,7 +171,7 @@ print(completion.model_dump_json(indent=2))
 
 ```bash
 az rest --method POST \
- --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-15-preview \
+ --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-01 \
  --resource https://cognitiveservices.azure.com/ \
  --body \
 '

articles/ai-services/openai/toc.yml

@@ -10,8 +10,8 @@ items:
       href: quotas-limits.md
     - name: Models
       href: ./concepts/models.md
-    - name: Legacy models
-      href: ./concepts/legacy-models.md
+    - name: Model retirements
+      href: ./concepts/model-retirements.md
     - name: Pricing
       href: https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/
     - name: What's new
@@ -74,6 +74,8 @@ items:
       href: ./concepts/use-your-data.md
     - name: Using your data - image (preview)
       href: ./concepts/use-your-image-data.md
+    - name: Legacy models
+      href: ./concepts/legacy-models.md
 - name: How-to 
   items:
   - name: API version lifecycle

articles/ai-services/openai/whats-new.md

@@ -18,6 +18,10 @@ recommendations: false
 
 ## March 2024
 
+### Model deprecations and retirements
+
+We have added a page to track [model deprecations and retirements](./concepts/model-retirements.md) in Azure OpenAI Service. This page provides information about the models that are currently available, deprecated, and retired.
+
 ### 2024-03-01-preview API released
 
 `2024-03-01-preview` has all the same functionality as `2024-02-15-preview` and adds two new parameters for embeddings:

articles/application-gateway/mutual-authentication-overview.md

@@ -4,7 +4,7 @@ description: This article is an overview of mutual authentication on Application
 services: application-gateway
 author: greg-lindsay
 ms.service: application-gateway
-ms.date: 07/29/2023
+ms.date: 03/12/2024
 ms.topic: conceptual 
 ms.author: greglin
 
@@ -32,7 +32,8 @@ If you're uploading a certificate chain with root CA and intermediate CA certifi
 Each SSL profile can support up to 100 trusted client CA certificate chains.  A single Application Gateway can support a total of 200 trusted client CA certificate chains.
 
 > [!NOTE] 
-> Mutual authentication is only available on Standard_v2 and WAF_v2 SKUs. 
+> * Mutual authentication is only available on Standard_v2 and WAF_v2 SKUs.
+> * Configuration of Mutual authentication for [TLS protocol listeners (preview)](tcp-tls-proxy-overview.md) is currently available through REST API, PowerShell, and CLI. Azure Portal support is coming soon.
 
 ### Certificates supported for mutual authentication
 

articles/application-gateway/tcp-tls-proxy-overview.md

@@ -5,7 +5,7 @@ services: application-gateway
 author: greg-lindsay
 ms.service: application-gateway
 ms.topic: conceptual
-ms.date: 03/01/2024
+ms.date: 03/12/2024
 ms.author: greglin
 ---
 
@@ -46,6 +46,7 @@ Process flow:
 
 - A WAF v2 SKU gateway allows the creation of TLS or TCP listeners and backends to support HTTP and non-HTTP traffic through the same resource. However, it does not inspect traffic on TLS and TCP listeners for exploits and vulnerabilities. 
 - The default [draining timeout](configuration-http-settings.md#connection-draining) value for backend servers is 30 seconds. At present, a user-defined draining value is not supported.
+- Client IP preservation is currently not supported.
 
 ## Next steps
 

articles/azure-arc/data/validation-program.md

@@ -84,10 +84,11 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
 
 ### Red Hat
 
-|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
+|Solution and version |Kubernetes version |Azure Arc-enabled data services version |SQL engine version |PostgreSQL server version|
 |-----|-----|-----|-----|-----|
-| [OpenShift 4.13.4](https://docs.openshift.com/container-platform/4.13/release_notes/ocp-4-13-release-notes.html) | 1.26.5 | 1.21.0_2023-07-11 | 16.0.5100.7242 |  14.5 (Ubuntu 20.04) |
-| OpenShift 4.10.16 | 1.23.5 | 1.11.0_2022-09-13 | 16.0.312.4243 |  12.3 (Ubuntu 12.3-1)|
+|[OpenShift 4.15.0](https://docs.openshift.com/container-platform/4.15/release_notes/ocp-4-15-release-notes.html)|1.28.6|1.27.0_2024-02-13|16.0.5100.7246|Not validated|
+|[OpenShift 4.13.4](https://docs.openshift.com/container-platform/4.13/release_notes/ocp-4-13-release-notes.html) |1.26.5 |1.21.0_2023-07-11 |16.0.5100.7242 |14.5 (Ubuntu 20.04) |
+|OpenShift 4.10.16 |1.23.5 |1.11.0_2022-09-13 |16.0.312.4243 |12.3 (Ubuntu 12.3-1)|
 
 ### VMware
 

articles/azure-arc/kubernetes/validation-program.md

@@ -27,7 +27,7 @@ The following providers and their corresponding Kubernetes distributions have su
 
 | Provider name | Distribution name | Version |
 | ------------ | ----------------- | ------- |
-| RedHat       | [OpenShift Container Platform](https://www.openshift.com/products/container-platform) | [4.9.43](https://docs.openshift.com/container-platform/4.9/release_notes/ocp-4-9-release-notes.html), [4.10.23](https://docs.openshift.com/container-platform/4.10/release_notes/ocp-4-10-release-notes.html), 4.11.0-rc.6, [4.13.4](https://docs.openshift.com/container-platform/4.13/release_notes/ocp-4-13-release-notes.html) |
+| RedHat       | [OpenShift Container Platform](https://www.openshift.com/products/container-platform) |[4.10.23](https://docs.openshift.com/container-platform/4.10/release_notes/ocp-4-10-release-notes.html), 4.11.0-rc.6, [4.13.4](https://docs.openshift.com/container-platform/4.13/release_notes/ocp-4-13-release-notes.html), [4.15.0](https://docs.openshift.com/container-platform/4.15/release_notes/ocp-4-15-release-notes.html)|
 | VMware       | [Tanzu Kubernetes Grid](https://tanzu.vmware.com/kubernetes-grid) |TKGs 2.2; upstream K8s 1.25.7+vmware.3<br>TKGm 2.3; upstream K8s v1.26.5+vmware.2<br>TKGm 2.2; upstream K8s v1.25.7+vmware.2 <br>TKGm 2.1.0; upstream K8s v1.24.9+vmware.1|
 | Canonical    | [Charmed Kubernetes](https://ubuntu.com/kubernetes)|[1.24](https://ubuntu.com/kubernetes/docs/1.24/components), [1.28](https://ubuntu.com/kubernetes/docs/1.28/components) |
 | SUSE Rancher      | [Rancher Kubernetes Engine](https://rancher.com/products/rke/) | RKE CLI version: [v1.3.13](https://github.com/rancher/rke/releases/tag/v1.3.13); Kubernetes versions: 1.24.2, 1.23.8  |