Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vpn-peer-update

Author: asudbring

.openpublishing.redirection.azure-arc-scvmm.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+      {
+          "source_path_from_root": "/articles/azure-arc/system-center-virtual-machine-manager/enable-group-management.md",
+          "redirect_url": "enable-guest-management-at-scale",
+          "redirect_document_id": false
+      }
+    ]
+}

.openpublishing.redirection.json

@@ -1135,6 +1135,11 @@
             "redirect_url": "/azure/container-instances/container-instances-multi-container-group",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/container-instances/container-instances-monitor.md",
+            "redirect_url": "/azure/container-instances/monitor-azure-container-instances",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/cassandra-managed-instance/compare-cosmosdb-managed-instance.md",
             "redirect_url": "/azure/managed-instance-apache-cassandra/compare-cosmosdb-managed-instance",

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

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 06/04/2024
+ms.date: 06/19/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle
@@ -60,11 +60,11 @@ These models are currently available for use in Azure OpenAI Service.
 
 | Model | Version | Retirement date |
 | ---- | ---- | ---- |
-| `gpt-35-turbo` | 0301 | No earlier than August 1, 2024 |
-| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | No earlier than August 1, 2024 |
+| `gpt-35-turbo` | 0301 | No earlier than October 1, 2024 |
+| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | October 1, 2024 |
 | `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2024 |
 | `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` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0613 | No earlier than Sep 30, 2024 |
 | `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later **<sup>1</sup>** |
 | `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later  **<sup>1</sup>**  |
@@ -116,6 +116,12 @@ If you're an existing customer looking for information about these models, see [
 
 ## Retirement and deprecation history
 
+## June 19, 2024
+
+* Updated `gpt-35-turbo` 0301 retirement date to no earlier than October 1, 2024.
+* Updated `gpt-35-turbo` & `gpt-35-turbo-16k`0613 retirement date to October 1, 2024.
+* Updated `gpt-4` & `gpt-4-32k` 0314 deprecation date to October 1, 2024, and retirement date to June 6, 2025.  
+
 ### June 4, 2024
 
 Retirement date for legacy models updated by one month.

articles/ai-services/openai/concepts/models.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the different model capabilities that are available with Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 05/13/2024
+ms.date: 06/19/2024
 ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
 manager: nitinme
 author: mrbullwinkle #ChrisHMSFT
@@ -14,7 +14,7 @@ recommendations: false
 
 # Azure OpenAI Service models
 
-Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region. For GPT-3 and other models retiring in July 2024, see [Azure OpenAI Service legacy models](./legacy-models.md).
+Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region.
 
 | Models | Description |
 |--|--|
@@ -75,9 +75,6 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 > [!CAUTION]
 > We don't recommend using preview models in production. We will upgrade all deployments of preview models to either future preview versions or to the latest stable/GA version. Models designated preview do not follow the standard Azure OpenAI model lifecycle.
 
-> [!NOTE]
-> Version `0314` of `gpt-4` and `gpt-4-32k` will be retired no earlier than July 5, 2024.  Version `0613` of `gpt-4` and `gpt-4-32k` will be retired no earlier than September 30, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
-
 - GPT-4 version 0125-preview is an updated version of the GPT-4 Turbo preview previously released as version 1106-preview.  
 - GPT-4 version 0125-preview completes tasks such as code generation more completely compared to gpt-4-1106-preview. Because of this, depending on the task, customers may find that GPT-4-0125-preview generates more output compared to the gpt-4-1106-preview.  We recommend customers compare the outputs of the new model.  GPT-4-0125-preview also addresses bugs in gpt-4-1106-preview with UTF-8 handling for non-English languages. 
 - GPT-4 version `turbo-2024-04-09` is the latest GA release and replaces `0125-Preview`, `1106-preview`, and `vision-preview`.
@@ -216,9 +213,6 @@ GPT-3.5 Turbo version 0301 is the first version of the model released.  Version
 
 See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-3.5 Turbo deployments.
 
-> [!NOTE]
-> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired no earlier than August 1, 2024. Version `0301` of `gpt-35-turbo` will be retired no earlier than August 1, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
-
 ### GPT-3.5-Turbo model availability
 
 #### Public cloud regions
@@ -316,9 +310,13 @@ For Assistants you need a combination of a supported model, and a supported regi
 | West US |  | ✅ | | | ✅ | | 
 | West US 3 |  |  | | |✅ | | 
 
+## Model retirement
+
+For the latest information on model retirements, refer to the [model retirement guide](./model-retirements.md).
 
 ## Next steps
 
+- [Model retirement and deprecation](./model-retirements.md)
 - [Learn more about working with Azure OpenAI models](../how-to/working-with-models.md)
 - [Learn more about Azure OpenAI](../overview.md)
 - [Learn more about fine-tuning Azure OpenAI models](../how-to/fine-tuning.md)

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

@@ -10,7 +10,7 @@ ms.custom:
   - ignite-2023
   - references_regions
 ms.topic: whats-new
-ms.date: 06/18/2024
+ms.date: 06/19/2024
 recommendations: false
 ---
 
@@ -20,6 +20,14 @@ This article provides a summary of the latest releases and major documentation u
 
 ## June 2024
 
+### Retirement date updates
+
+* Updated `gpt-35-turbo` 0301 retirement date to no earlier than October 1, 2024.
+* Updated `gpt-35-turbo` & `gpt-35-turbo-16k`0613 retirement date to October 1, 2024.
+* Updated `gpt-4` & `gpt-4-32k` 0314 deprecation date to October 1, 2024, and retirement date to June 6, 2025.  
+
+Refer to our [model retirement guide](./concepts/model-retirements.md) for the latest information on model deprecation and retirement.
+
 ### Token based billing for fine-tuning
 
 * Azure OpenAI fine-tuning billing is now based on the number of tokens in your training file – instead of the total elapsed training time. This can result in a significant cost reduction for some training runs, and makes estimating fine-tuning costs much easier. To learn more, you can consult the [official announcement](https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/pricing-update-token-based-billing-for-fine-tuning-training/ba-p/4164465).

articles/aks/azure-cni-powered-by-cilium.md

@@ -57,6 +57,8 @@ Azure CNI powered by Cilium currently has the following limitations:
 
 * Network policies may be enforced on reply packets when a pod connects to itself via service cluster IP ([Cilium issue #19406](https://github.com/cilium/cilium/issues/19406)).
 
+* Network policies are not applied to pods using host networking (`spec.hostNetwork: true`) because these pods use the host identity instead of having individual identities.
+
 ## Prerequisites
 
 * Azure CLI version 2.48.1 or later. Run `az --version` to see the currently installed version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).

articles/api-management/how-to-configure-local-metrics-logs.md

@@ -230,6 +230,12 @@ Here's a sample configuration of local logging:
         telemetry.logs.local.localsyslog.facility: "7"
 ```
 
+### Using local JSON endpoint
+
+#### Known limitations
+
+- We only support up to 3072 bytes of request/response payload for local diagnostics. Anything above, may break JSON format due to chunking.
+
 ### Using local syslog logs
 
 #### Configuring gateway to stream logs