Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us297322-content-curation

asudbring · asudbring · commit 2d03b693ec60 · 2024-08-15T15:42:24.000-05:00
diff --git a/articles/ai-services/openai/how-to/use-web-app.md b/articles/ai-services/openai/how-to/use-web-app.md
diff --git a/articles/ai-services/openai/includes/use-your-data-powershell.md b/articles/ai-services/openai/includes/use-your-data-powershell.md
@@ -80,4 +80,4 @@ The available health plans in the Contoso Electronics plan and benefit packages
 
 ## Chat with your model using a web app
 
-To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#web-app-customization) of the web app by making changes to the source code.
+To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used with Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#customizing-the-application-using-environment-variables) of the web app by making changes to the source code.
diff --git a/articles/ai-services/openai/includes/use-your-data-rest.md b/articles/ai-services/openai/includes/use-your-data-rest.md
@@ -90,4 +90,4 @@ curl -i -X POST $AZURE_OPENAI_ENDPOINT/openai/deployments/$AZURE_OPENAI_DEPLOYME
 
 ## Chat with your model using a web app
 
-To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#web-app-customization) of the web app by making changes to the source code.
+To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used with Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#customizing-the-application-using-environment-variables) of the web app by making changes to the source code.
diff --git a/articles/ai-services/openai/whats-new.md b/articles/ai-services/openai/whats-new.md
@@ -509,7 +509,7 @@ Azure OpenAI Service now supports speech to text APIs powered by OpenAI's Whispe
 - Ability to [filter access to sensitive documents](./concepts/use-your-data.md#document-level-access-control).
 - [Automatically refresh your index on a schedule](./concepts/use-your-data.md#schedule-automatic-index-refreshes).
 - [Vector search and semantic search options](./concepts/use-your-data.md#search-types). 
-- [View your chat history in the deployed web app](./how-to/use-web-app.md#chat-history)
+- [View your chat history in the deployed web app](./how-to/use-web-app.md#enabling-chat-history-using-cosmos-db)
 
 ## July 2023
 
diff --git a/articles/azure-netapp-files/azure-netapp-files-troubleshoot-resource-provider-errors.md b/articles/azure-netapp-files/azure-netapp-files-troubleshoot-resource-provider-errors.md
@@ -5,7 +5,7 @@ services: azure-netapp-files
 author: b-hchen
 ms.service: azure-netapp-files
 ms.topic: troubleshooting
-ms.date: 02/09/2022
+ms.date: 08/15/2024
 ms.author: anfdocs
 ---
 # Troubleshoot Azure NetApp Files Resource Provider errors 
@@ -91,7 +91,7 @@ This error occurs when the export policy isn't defined with a unique index. When
 * Cause:   
 The defined export policy doesn't meet the requirement for export policy rules. You must have one export policy rule at the minimum and five export policy rules at the maximum.
 * Solution:   
-Make sure that the index isn't already used and that it is in the range from 1 to 5.
+Make sure that the index isn't already used and that it's in the range from 1 to 5.
 * Workaround:   
 Use a different index for the rule that you're trying to set.
 
@@ -113,7 +113,7 @@ This error occurs when the file path contains unsupported characters, for exampl
 * Cause:   
 The file path contains unsupported characters, for example, a period ("."), comma (","), underscore ("_"), or dollar sign ("$").
 * Solution:   
-Remove characters that are not alphabetical letters, numbers, or hyphens ("-") from the file path you entered.
+Remove all characters other than alphabetical letters, numbers, or hyphens ("-") from the file path you entered.
 * Workaround:   
 You can replace an underscore with a hyphen or use capitalization instead of spaces to indicate the beginning of new words.  For example, use "NewVolume" instead of "new volume".
 
@@ -261,7 +261,7 @@ Wait a few minutes and check if the problem persists.
 
 ***Not allowed to mix protocol types CIFS and NFS***
 
-This error occurs when you're trying to create a Volume and there are both the CIFS (SMB) and NFS protocol types in the volume properties.
+This error occurs when you're trying to create a volume that has both the CIFS (SMB) and NFS protocol types in the volume properties.
 
 * Cause:   
 Both the CIFS (SMB) and NFS protocol types are used in the volume properties.
@@ -299,7 +299,7 @@ This error indicates that the operation isn't available for the active subscript
 * Cause:   
 The operation isn't available for the subscription or resource.
 * Solution:   
-Make sure that the operation is entered correctly and that it is available for the resource and subscription that you're using.
+Make sure that the operation is entered correctly. The operation should be available for the resource and subscription that you're using.
 
 ***OwnerId cannot be changed***
 
@@ -317,14 +317,14 @@ This error occurs when you try to create a volume and the capacity pool in which
 * Cause:   
 The capacity pool where the volume is being created isn't found.
 * Solution:   
-Most likely the pool was not fully created or was already deleted at the time of the volume creation.
+Most likely the pool wasn't fully created or was already deleted at the time of the volume creation.
 
 ***Patch operation is not supported for this resource type.***
 
 This error occurs when you try to change the mount target or snapshot.
 
 * Cause:   
-The mount target is defined when it is created, and it can't be changed subsequently.
+The mount target is defined when it's created, and it can't be changed subsequently.
 The snapshots don’t contain any properties that can be changed.
 * Solution:   
 None. Those resources don't have any properties that can be changed.
@@ -407,7 +407,7 @@ This error occurs when you try to reference a nonexistent resource, for example,
 * Cause:   
 You're trying to reference a nonexistent resource (for example, a volume or snapshot) that has already been deleted or has a misspelled resource name.
 * Solution:   
-Check the request for spelling errors to make sure that it is correctly referenced.
+Check the request for spelling errors to make sure that it's correctly referenced.
 * Workaround:   
 See the Solution section above.
 
@@ -495,7 +495,7 @@ This error occurs when nonexistent properties are provided for a resource such a
 * Cause:   
 The request has a set of properties that can be used with each resource. You can't include any nonexistent properties in the request.
 * Solution:   
-Make sure that all property names are spelled correctly and that the properties are available for the subscription and resource.
+Make sure all property names are spelled correctly. Make sure the properties are available for the subscription and resource.
 * Workaround:   
 Reduce the number of properties defined in the request to eliminate the property that is causing the error.
 
@@ -534,7 +534,7 @@ See the solution above.
 
 ***Volume is being deleted and cannot be deleted at the moment.***
 
-This error occurs when you try to delete a volume when it is already being deleted.
+This error occurs when you try to delete a volume when it's already being deleted.
 
 * Cause:   
 A volume is already being deleted when you try to delete the volume.
@@ -635,7 +635,7 @@ This error occurs when you try to create an SMB volume, but a DNS server (specif
 * Cause:   
 You're trying to create an SMB volume, but a DNS server (specified in your Active Directory configuration) is unreachable.
 * Solution:   
-Review your Active Directory configuration and make sure that the DNS server IP addresses are correct and reachable.
+Review your Active Directory configuration. Make sure that the DNS server IP addresses are correct and reachable.
 If there’s no issues with the DNS server IP addresses, then verify that no firewalls are blocking the access.
 
 ***Too many concurrent jobs***
diff --git a/articles/openshift/howto-multiple-ips.md b/articles/openshift/howto-multiple-ips.md
@@ -1,5 +1,5 @@
 ---
-title: Configure multiple IP addresses for ARO cluster load balancers (Preview)
+title: Configure multiple IP addresses for ARO cluster load balancers
 description: Discover how to configure multiple IP addresses for ARO cluster load balancers.
 author: johnmarco
 ms.author: johnmarc
@@ -8,12 +8,20 @@ ms.topic: how-to
 ms.date: 03/05/2024
 #Customer intent: As an ARO SRE, I need to configure multiple outbound IP addresses per ARO cluster load balancers
 ---
-# Configure multiple IP addresses per ARO cluster load balancer (Preview)
+# Configure multiple IP addresses per ARO cluster load balancer
 
-ARO public clusters are created with a public load balancer that's used for outbound connectivity from inside the cluster. By default, one public IP address is configured on that public load balancer, and that limits the maximum node count of your cluster to 62. To be able to scale your cluster to the maximum supported number of nodes, you need to assign multiple additional public IP addresses to the load balancer.
+ARO public clusters are created with a public load balancer that's used for outbound connectivity from inside the cluster. By default, one public IP address is configured on that public load balancer, and that limits the maximum node count of your cluster to 65. To be able to scale your cluster to the maximum supported number of 250 nodes, you need to assign multiple additional public IP addresses to the load balancer.
 
 You can configure up to 20 IP addresses per cluster. The outbound rules and frontend IP configurations are adjusted to accommodate the number of IP addresses.
 
+> [!CAUTION]
+> Before deleting a large cluster, descale the cluster to 120 nodes or below.
+> 
+
+> [!NOTE]
+> The [API](/rest/api/openshift/open-shift-clusters/update?view=rest-openshift-2023-11-22&tabs=HTTP) method for using this feature is generally available. General availability for using the CLI for this feature is coming soon. The [preview version](#download-aro-extension-wheel-file-preview-only) of this feature can still be used through the CLI.
+> 
+
 ## Requirements
 
 The multiple public IPs feature is only available on the current network architecture used by ARO; older clusters don't support this feature. If your cluster was created before OpenShift Container Platform (OCP) version 4.5, this feature isn't available even if you upgraded your OCP version since then.
diff --git a/articles/openshift/openshift-faq.yml b/articles/openshift/openshift-faq.yml
@@ -6,7 +6,7 @@ metadata:
   ms.author: johnmarc
   ms.service: azure-redhat-openshift
   ms.topic: faq
-  ms.date: 06/04/2023
+  ms.date: 08/08/2024
 title: Azure Red Hat OpenShift FAQ
 summary: This article answers frequently asked questions (FAQs) about Microsoft Azure Red Hat OpenShift.
 
@@ -31,7 +31,7 @@ sections:
         answer: |
           The actual number of supported pods depends on an application’s memory, CPU, and storage requirements.
                  
-          Azure Red Hat OpenShift 4.x has a 250 pod-per-node limit and a 60 compute node limit. These limits cap the maximum number of pods supported in a cluster to 250&times;60 = 15,000. For a private cluster without any public IPs (for example, created by using [User Defined Routing (UDR)](howto-create-private-cluster-4x.md#create-a-private-cluster-without-a-public-ip-address) and running version 4.11 or higher), the limits are 120 compute nodes and 30,000 pods.
+          Azure Red Hat OpenShift 4.x has a 250 pod-per-node limit and a 250 compute node limit. These limits cap the maximum number of pods supported in a cluster to 250&times;250 = 62,500. These limits are the same for clusters created using [User Defined Routing (UDR)](howto-create-private-cluster-4x.md#create-a-private-cluster-without-a-public-ip-address) and running version 4.11 or higher.
           
       - question: Can a cluster have compute nodes across multiple Azure regions?
         answer: No. All nodes in an Azure Red Hat OpenShift cluster must originate in the same Azure region.
diff --git a/articles/openshift/support-policies-v4.md b/articles/openshift/support-policies-v4.md
@@ -22,6 +22,7 @@ Certain configurations for Azure Red Hat OpenShift 4 clusters can affect your cl
 
 * The cluster must have a minimum of three worker nodes and three master nodes.
 * Don't scale the cluster workers to zero, or attempt a cluster shutdown. Deallocating or powering down any virtual machine in the cluster resource group isn't supported.
+* Don't create more than 250 worker nodes on a cluster. 250 is the maximum number of nodes that can be created on a cluster. See [Configure multiple IP addresses per ARO cluster load balancer](howto-multiple-ips.md) for more information.
 * If you're making use of infrastructure nodes, don't run any undesignated workloads on them as this can affect the Service Level Agreement and cluster stability. Also, it's recommended to have three infrastructure nodes; one in each availability zone. See [Deploy infrastructure nodes in an Azure Red Hat OpenShift (ARO) cluster](howto-infrastructure-nodes.md) for more information.
 * Non-RHCOS compute nodes aren't supported. For example, you can't use an RHEL compute node.
 * Don't attempt to remove, replace, add, or modify a master node. That's a high risk operation that can cause issues with etcd, permanent network loss, and loss of access and manageability by ARO SRE. If you feel that a master node should be replaced or removed, contact support before making any changes.
diff --git a/articles/search/retrieval-augmented-generation-overview.md b/articles/search/retrieval-augmented-generation-overview.md
diff --git a/articles/vpn-gateway/vpn-gateway-vpn-faq.md b/articles/vpn-gateway/vpn-gateway-vpn-faq.md

Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,4 @@ The available health plans in the Contoso Electronics plan and benefit packages`
`80`	`80`
`81`	`81`	`## Chat with your model using a web app`
`82`	`82`
`83`		-To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#web-app-customization) of the web app by making changes to the source code.
	`83`	+To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used with Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#customizing-the-application-using-environment-variables) of the web app by making changes to the source code.
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,4 @@ curl -i -X POST $AZURE_OPENAI_ENDPOINT/openai/deployments/$AZURE_OPENAI_DEPLOYME`
`90`	`90`
`91`	`91`	`## Chat with your model using a web app`
`92`	`92`
`93`		-To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#web-app-customization) of the web app by making changes to the source code.
	`93`	+To start chatting with the Azure OpenAI model that uses your data, you can deploy a web app using [Azure OpenAI studio](../concepts/use-your-data.md#deploy-to-a-copilot-preview-teams-app-preview-or-web-app) or example code we [provide on GitHub](https://go.microsoft.com/fwlink/?linkid=2244395). This app deploys using Azure app service, and provides a user interface for sending queries. This app can be used with Azure OpenAI models that use your data, or models that don't use your data. See the readme file in the repo for instructions on requirements, setup, and deployment. You can optionally customize the [frontend and backend logic](../how-to/use-web-app.md#customizing-the-application-using-environment-variables) of the web app by making changes to the source code.