Merge pull request #279242 from MicrosoftDocs/main

6/25/2024 PM Publish

Author: Taojunshen

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-text.md

@@ -38,7 +38,7 @@ curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-versio
   "text": "I hate you",
   "categories": [
    "Hate","Sexual","SelfHarm","Violence"
-  ]
+  ],
    "blocklistNames": [
       "string"
     ],

articles/ai-services/openai/concepts/content-filter.md

@@ -6,7 +6,7 @@ author: mrbullwinkle
 ms.author: mbullwin
 ms.service: azure-ai-openai
 ms.topic: conceptual 
-ms.date: 11/06/2023
+ms.date: 06/25/2023
 ms.custom: template-concept, devx-track-python
 manager: nitinme
 ---
@@ -70,10 +70,14 @@ The default content filtering configuration for the GPT model series is set to f
 
 <sup>1</sup> For Azure OpenAI models, only customers who have been approved for modified content filtering have full content filtering control and can turn content filters off. Apply for modified content filters via this form: [Azure OpenAI Limited Access Review: Modified Content Filters](https://ncv.microsoft.com/uEfCgnITdR) For Azure Government customers, please apply for modified content filters via this form: [Azure Government - Request Modified Content Filtering for Azure OpenAI Service](https://aka.ms/AOAIGovModifyContentFilter).
 
-This preview feature is available for the following Azure OpenAI models:
-* GPT model series (text) 
-* GPT-4 Turbo Vision 2024-04-09 (multi-modal text/image)
-* DALL-E 2 and 3 (image)
+Configurable content filters for inputs (prompts) and outputs (completions) are available for the following Azure OpenAI models:
+
+* GPT model series
+* GPT-4 Turbo Vision GA<sup>*</sup> (turbo-2024-04-09)
+* GPT-4o 
+* DALL-E 2 and 3
+
+<sup>*</sup>Only available for GPT-4 Turbo Vision GA, does not apply to GPT-4 Turbo Vision preview 
 
 Content filtering configurations are created within a Resource in Azure AI Studio, and can be associated with Deployments. [Learn more about configurability here](../how-to/content-filters.md).  
 
@@ -847,7 +851,7 @@ To enable Asynchronous Filter in Azure OpenAI Studio, follow the [Content filter
 |Status |GA |Public Preview |
 | Eligibility |All customers |Customers approved for modified content filtering |
 | How to enable | Enabled by default, no action needed |Customers approved for modified content filtering can configure it directly in Azure OpenAI Studio (as part of a content filtering configuration, applied at the deployment level) |
-|Modality and availability |Text; all GPT models |Text; all GPT models except gpt-4-vision |
+|Modality and availability |Text; all GPT models |Text; all GPT models |
 |Streaming experience |Content is buffered and returned in chunks |Zero latency (no buffering, filters run asynchronously) |
 |Content filtering signal |Immediate filtering signal |Delayed filtering signal (in up to ~1,000-character increments) |
 |Content filtering configurations |Supports default and any customer-defined filter setting (including optional models) |Supports default and any customer-defined filter setting (including optional models) |

articles/ai-services/openai/how-to/managed-identity.md

@@ -1,17 +1,17 @@
 ---
-title: How to configure Azure OpenAI Service with managed identities
+title: How to configure Azure OpenAI Service with Microsoft Entra ID authentication
 titleSuffix: Azure OpenAI
 description: Provides guidance on how to set managed identity with Microsoft Entra ID
 ms.service: azure-ai-openai
 ms.topic: how-to 
-ms.date: 04/03/2024
+ms.date: 06/25/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
 ms.custom: devx-track-azurecli
 ---
 
-# How to configure Azure OpenAI Service with managed identities
+# How to configure Azure OpenAI Service with Microsoft Entra ID authentication
 
 More complex security scenarios require Azure role-based access control (Azure RBAC). This document covers how to authenticate to your OpenAI resource using Microsoft Entra ID.
 

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

@@ -110,7 +110,7 @@ dependencies {
         public static void main(String[] args) {
             String azureOpenaiKey = System.getenv("AZURE_OPENAI_API_KEY");;
             String endpoint = System.getenv("AZURE_OPENAI_ENDPOINT");;
-            String deploymentOrModelId = "gpt-35-turbo";
+            String deploymentOrModelId = "gpt-35-turbo"; //Change to match your deployment name
     
           OpenAIClient client = new OpenAIClientBuilder()
                 .endpoint(endpoint)

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

@@ -17,7 +17,7 @@ ms.date: 11/27/2023
   Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI Service by completing the form at [https://aka.ms/oai/access](https://aka.ms/oai/access?azure-portal=true).
 - The current version of the [Java Development Kit (JDK)](https://www.microsoft.com/openjdk)
 - The [Spring Boot CLI tool](https://docs.spring.io/spring-boot/docs/current/reference/html/getting-started.html#getting-started.installing.cli)
-- An Azure OpenAI Service resource with the `gpt-35-turbo` model deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
+- An Azure OpenAI Service resource with the `gpt-35-turbo` model deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md). This example assumes that your deployment name matches the model name `gpt-35-turbo`
 
 > [!div class="nextstepaction"]
 > [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=SPRING&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)

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

@@ -98,7 +98,7 @@ For more information, see the [deployment types guide](https://aka.ms/aoai/docs/
 
 ### DALL-E and GPT-4 Turbo Vision GA configurable content filters
 
-Create custom content filters for your DALL-E 2 and 3 and GPT-4 Turbo with Vision GA (gpt-4-turbo-2024-04-09) deployments. [Content filtering](/azure/ai-services/openai/concepts/content-filter?tabs=warning%2Cpython-new#configurability-preview)
+Create custom content filters for your DALL-E 2 and 3, GPT-4 Turbo with Vision GA (gpt-4-turbo-2024-04-09) and GPT-4o deployments. [Content filtering](/azure/ai-services/openai/concepts/content-filter?tabs=warning%2Cpython-new#configurability-preview)
 
 ### Asynchronous Filter available for all Azure OpenAI customers
 

articles/aks/app-routing-nginx-configuration.md

@@ -551,3 +551,4 @@ Learn about monitoring the ingress-nginx controller metrics included with the ap
 [azure-dns-overview]: ../dns/dns-overview.md
 [az-keyvault-certificate-show]: /cli/azure/keyvault/certificate#az-keyvault-certificate-show
 [prometheus-in-grafana]: app-routing-nginx-prometheus.md
+[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create

articles/aks/istio-upgrade.md

@@ -6,6 +6,7 @@ ms.service: azure-kubernetes-service
 ms.date: 05/04/2023
 ms.author: shasb
 author: shashankbarsin
+ms.custom: devx-track-azurecli
 ---
 
 # Upgrade Istio-based service mesh add-on for Azure Kubernetes Service
@@ -20,27 +21,27 @@ Istio add-on allows upgrading the minor revision using [canary upgrade process][
 
 If the cluster is currently using a supported minor revision of Istio, upgrades are only allowed one minor revision at a time. If the cluster is using an unsupported revision of Istio, you must upgrade to the lowest supported minor revision of Istio for that Kubernetes version. After that, upgrades can again be done one minor revision at a time.
 
-The following example illustrates how to upgrade from revision `asm-1-18` to `asm-1-19`. The steps are the same for all minor upgrades.
+The following example illustrates how to upgrade from revision `asm-1-20` to `asm-1-21`. The steps are the same for all minor upgrades.
 
 1. Use the [az aks mesh get-upgrades](/cli/azure/aks/mesh#az-aks-mesh-get-upgrades) command to check which revisions are available for the cluster as upgrade targets:
 
-    ```bash
+    ```azurecli-interactive
     az aks mesh get-upgrades --resource-group $RESOURCE_GROUP --name $CLUSTER
     ```
 
     If you expect to see a newer revision not returned by this command, you may need to upgrade your AKS cluster first so that it's compatible with the newest revision.
 
 1. If you've set up [mesh configuration][meshconfig] for the existing mesh revision on your cluster, you need to create a separate ConfigMap corresponding to the new revision in the `aks-istio-system` namespace **before initiating the canary upgrade** in the next step. This configuration is applicable the moment the new revision's control plane is deployed on cluster. More details can be found [here][meshconfig-canary-upgrade].
 
-1. Initiate a canary upgrade from revision `asm-1-18` to `asm-1-19` using [az aks mesh upgrade start](/cli/azure/aks/mesh#az-aks-mesh-upgrade-start):
+1. Initiate a canary upgrade from revision `asm-1-20` to `asm-1-21` using [az aks mesh upgrade start](/cli/azure/aks/mesh/upgrade#az-aks-mesh-upgrade-start):
 
-    ```bash
-    az aks mesh upgrade start --resource-group $RESOURCE_GROUP --name $CLUSTER --revision asm-1-19
+    ```azurecli-interactive
+    az aks mesh upgrade start --resource-group $RESOURCE_GROUP --name $CLUSTER --revision asm-1-21
     ```
 
-    A canary upgrade means the 1.18 control plane is deployed alongside the 1.17 control plane. They continue to coexist until you either complete or roll back the upgrade.
+    A canary upgrade means the 1.20 control plane is deployed alongside the 1.21 control plane. They continue to coexist until you either complete or roll back the upgrade.
 
-1. Verify control plane pods corresponding to both `asm-1-18` and `asm-1-19` exist:
+1. Verify control plane pods corresponding to both `asm-1-20` and `asm-1-21` exist:
 
     * Verify `istiod` pods:
 
@@ -52,10 +53,10 @@ The following example illustrates how to upgrade from revision `asm-1-18` to `as
 
         ```
         NAME                                        READY   STATUS    RESTARTS   AGE
-        istiod-asm-1-18-55fccf84c8-dbzlt            1/1     Running   0          58m
-        istiod-asm-1-18-55fccf84c8-fg8zh            1/1     Running   0          58m
-        istiod-asm-1-19-f85f46bf5-7rwg4             1/1     Running   0          51m
-        istiod-asm-1-19-f85f46bf5-8p9qx             1/1     Running   0          51m
+        istiod-asm-1-20-55fccf84c8-dbzlt            1/1     Running   0          58m
+        istiod-asm-1-20-55fccf84c8-fg8zh            1/1     Running   0          58m
+        istiod-asm-1-21-f85f46bf5-7rwg4             1/1     Running   0          51m
+        istiod-asm-1-21-f85f46bf5-8p9qx             1/1     Running   0          51m
         ```
 
     * If ingress is enabled, verify ingress pods:
@@ -68,22 +69,22 @@ The following example illustrates how to upgrade from revision `asm-1-18` to `as
 
         ```
         NAME                                                          READY   STATUS    RESTARTS   AGE
-        aks-istio-ingressgateway-external-asm-1-18-58f889f99d-qkvq2   1/1     Running   0          59m
-        aks-istio-ingressgateway-external-asm-1-18-58f889f99d-vhtd5   1/1     Running   0          58m
-        aks-istio-ingressgateway-external-asm-1-19-7466f77bb9-ft9c8   1/1     Running   0          51m
-        aks-istio-ingressgateway-external-asm-1-19-7466f77bb9-wcb6s   1/1     Running   0          51m
-        aks-istio-ingressgateway-internal-asm-1-18-579c5d8d4b-4cc2l   1/1     Running   0          58m
-        aks-istio-ingressgateway-internal-asm-1-18-579c5d8d4b-jjc7m   1/1     Running   0          59m
-        aks-istio-ingressgateway-internal-asm-1-19-757d9b5545-g89s4   1/1     Running   0          51m
-        aks-istio-ingressgateway-internal-asm-1-19-757d9b5545-krq9w   1/1     Running   0          51m
+        aks-istio-ingressgateway-external-asm-1-20-58f889f99d-qkvq2   1/1     Running   0          59m
+        aks-istio-ingressgateway-external-asm-1-20-58f889f99d-vhtd5   1/1     Running   0          58m
+        aks-istio-ingressgateway-external-asm-1-21-7466f77bb9-ft9c8   1/1     Running   0          51m
+        aks-istio-ingressgateway-external-asm-1-21-7466f77bb9-wcb6s   1/1     Running   0          51m
+        aks-istio-ingressgateway-internal-asm-1-20-579c5d8d4b-4cc2l   1/1     Running   0          58m
+        aks-istio-ingressgateway-internal-asm-1-20-579c5d8d4b-jjc7m   1/1     Running   0          59m
+        aks-istio-ingressgateway-internal-asm-1-21-757d9b5545-g89s4   1/1     Running   0          51m
+        aks-istio-ingressgateway-internal-asm-1-21-757d9b5545-krq9w   1/1     Running   0          51m
         ```
 
         Observe that ingress gateway pods of both revisions are deployed side-by-side. However, the service and its IP remain immutable.
 
 1. Relabel the namespace so that any new pods get the Istio sidecar associated with the new revision and its control plane:
 
     ```bash
-    kubectl label namespace default istio.io/rev=asm-1-19 --overwrite
+    kubectl label namespace default istio.io/rev=asm-1-21 --overwrite
     ```
 
     Relabeling doesn't affect your workloads until they're restarted.
@@ -98,7 +99,7 @@ The following example illustrates how to upgrade from revision `asm-1-18` to `as
 
     * **Complete the canary upgrade**: If you're satisfied that the workloads are all running in a healthy state as expected, you can complete the canary upgrade. Completion of the upgrade removes the previous revision's control plane and leaves behind the new revision's control plane on the cluster. Run the following command to complete the canary upgrade:
 
-      ```bash
+      ```azurecli-interactive
       az aks mesh upgrade complete --resource-group $RESOURCE_GROUP --name $CLUSTER
       ```
 
@@ -107,7 +108,7 @@ The following example illustrates how to upgrade from revision `asm-1-18` to `as
       * Relabel the namespace to the previous revision:
 
           ```bash
-          kubectl label namespace default istio.io/rev=asm-1-18 --overwrite
+          kubectl label namespace default istio.io/rev=asm-1-20 --overwrite
           ```
 
       * Roll back the workloads to use the sidecar corresponding to the previous Istio revision by restarting these workloads again:
@@ -118,7 +119,7 @@ The following example illustrates how to upgrade from revision `asm-1-18` to `as
 
       * Roll back the control plane to the previous revision:
 
-          ```
+          ```azurecli-interactive
           az aks mesh upgrade rollback --resource-group $RESOURCE_GROUP --name $CLUSTER
           ```
 
@@ -147,8 +148,8 @@ Thus, during the canary upgrade, when two revisions exist simultaneously on the
     Example output:
 
     ```bash
-    "image": "mcr.microsoft.com/oss/istio/proxyv2:1.18.2-distroless",
-    "image": "mcr.microsoft.com/oss/istio/proxyv2:1.18.2-distroless"
+    "image": "mcr.microsoft.com/oss/istio/proxyv2:1.20.6-distroless",
+    "image": "mcr.microsoft.com/oss/istio/proxyv2:1.20.6-distroless"
     ```
 
   * Check the Istio proxy image version for all pods in a namespace:
@@ -162,7 +163,7 @@ Thus, during the canary upgrade, when two revisions exist simultaneously on the
     Example output:
 
     ```bash
-    productpage-v1-979d4d9fc-p4764:	docker.io/istio/examples-bookinfo-productpage-v1:1.18.0, mcr.microsoft.com/oss/istio/proxyv2:1.18.1-distroless
+    productpage-v1-979d4d9fc-p4764:	docker.io/istio/examples-bookinfo-productpage-v1:1.20.0, mcr.microsoft.com/oss/istio/proxyv2:1.20.6-distroless
     ```
 
   * To trigger reinjection, restart the workloads. For example:
@@ -182,11 +183,15 @@ Thus, during the canary upgrade, when two revisions exist simultaneously on the
     Example output:
 
     ```bash
-    productpage-v1-979d4d9fc-p4764:	docker.io/istio/examples-bookinfo-productpage-v1:1.18.0, mcr.microsoft.com/oss/istio/proxyv2:1.18.2-distroless
+    productpage-v1-979d4d9fc-p4764:	docker.io/istio/examples-bookinfo-productpage-v1:1.20.0, mcr.microsoft.com/oss/istio/proxyv2:1.20.7-distroless
     ```
 
+> [!NOTE]
+> In case of any issues encountered during upgrades, refer to [article on troubleshooting mesh revision upgrades][upgrade-istio-service-mesh-tsg]
+
 [aks-release-notes]: https://github.com/Azure/AKS/releases
 [istio-canary-upstream]: https://istio.io/latest/docs/setup/upgrade/canary/
 [meshconfig]: ./istio-meshconfig.md
 [meshconfig-canary-upgrade]: ./istio-meshconfig.md#mesh-configuration-and-upgrades
+[upgrade-istio-service-mesh-tsg]: /troubleshoot/azure/azure-kubernetes/extensions/istio-add-on-minor-revision-upgrade