Merge pull request #261234 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Taojunshen

articles/automation/change-tracking/overview-monitoring-agent.md

@@ -23,11 +23,11 @@ This article explains on the latest version of change tracking support using Azu
 
 ## Key benefits
 
-- **Compatibility with the unified monitoring agent** - Compatible with the [Azure Monitor Agent (Preview)](../../azure-monitor/agents/agents-overview.md) that enhances security, reliability, and facilitates multi-homing experience to store data.
+- **Compatibility with the unified monitoring agent** - Compatible with the [Azure Monitor Agent](../../azure-monitor/agents/agents-overview.md) that enhances security, reliability, and facilitates multi-homing experience to store data.
 - **Compatibility with tracking tool**- Compatible with the Change tracking (CT) extension deployed through the Azure Policy on the client's virtual machine. You can switch to Azure Monitor Agent (AMA), and then the CT extension pushes the software, files, and registry to AMA.
 - **Multi-homing experience** – Provides standardization of management from one central workspace. You can [transition from Log Analytics (LA) to AMA](../../azure-monitor/agents/azure-monitor-agent-migration.md)
 so that all VMs point to a single workspace for data collection and maintenance.
-- **Rules management** – Uses [Data Collection Rules](https://azure.microsoft.com/updates/azure-monitor-agent-and-data-collection-rules-public-preview/) to configure or customize various aspects of data collection. For example, you can change the frequency of file collection.
+- **Rules management** – Uses [Data Collection Rules](../../azure-monitor/essentials/data-collection-rule-overview.md) to configure or customize various aspects of data collection. For example, you can change the frequency of file collection.
 
 ## Current limitations
 

articles/azure-arc/servers/run-command.md

@@ -20,7 +20,7 @@ Run Command on Azure Arc-enabled servers (Public Preview) uses the Connected Mac
 - **Cost:** Run Command is free of charge, however storage of scripts in Azure may incur billing.
 
 - **Configuration:** Run Command doesn't require more configuration or the deployment of any extensions. The
-Connected Machine agent version must be or higher. 
+Connected Machine agent version must be 1.37 or higher. 
 
 ## Run Command operations
 
@@ -45,7 +45,7 @@ Start off by creating a Run Command script to provide endpoint access to the `mi
 To directly provide the script in line, use the following operation:
 
 ```
-PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand
+PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
 
 {
   "location": "eastus2",
@@ -85,7 +85,7 @@ PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaa
 To instead link to the script file, you can use the Run Command operation’s ScriptURI option. For this it's assumed you have prepared a `newnetfirewallrule.ps1` file containing the in-line script and uploaded this script to blob storage.
 
 ```
-PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand
+PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
 
 {
   "location": "eastus2",
@@ -131,7 +131,7 @@ Output and error blobs must be the AppendBlob type and their SAS URLs must provi
 To verify that you've correctly provisioned the Run Command, use the GET command to retrieve details on the provisioned Run Command:
 
 ```
-GET https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand
+GET https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
 ```
 
 ### Example 3: Update the Run Command
@@ -140,7 +140,7 @@ Let’s suppose you want to open up access to an additional endpoint `*.waconazu
 
 
 ```
-PATCH https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand
+PATCH https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
 
 {
   "location": "eastus2",
@@ -190,6 +190,6 @@ LIST https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaa
 If you no longer need the Run Command extension, you can delete it using the following command:
 
 ```
-DELETE https://management.azure.com/subscriptions/ aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand
+DELETE https://management.azure.com/subscriptions/ aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
 ```
 

articles/cosmos-db/how-to-configure-firewall.md

@@ -30,7 +30,7 @@ You can secure the data stored in your Azure Cosmos DB account by using IP firew
 
 ## <a id="configure-ip-policy"></a> Configure an IP firewall by using the Azure portal
 
-To set the IP access control policy in the Azure portal, go to the Azure Cosmos DB account page and select **Firewall and virtual networks** on the navigation menu. Change the **Allow access from** value to **Selected networks**, and then select **Save**.
+To set the IP access control policy in the Azure portal, go to the Azure Cosmos DB account page and select **Firewall and virtual networks** on the navigation menu. Change the **Allow access from** value to **Selected networks**, and then select **Save**. If you change the public access network settings, either by disabling it or allowing it for all networks, you will lose the firewall IP that you may have set up before. 
 
 :::image type="content" source="./media/how-to-configure-firewall/azure-portal-firewall.png" alt-text="Screenshot showing how to open the Firewall page in the Azure portal" border="true":::
 

articles/migrate/tutorial-app-containerization-java-kubernetes.md

@@ -58,7 +58,7 @@ Before you begin this tutorial, you should:
 --- | ---
 **Identify a machine to install the tool** | A Windows machine to install and run the Azure Migrate: App Containerization tool. The Windows machine could be a server (Windows Server 2016 or later) or client (Windows 10) operating system, meaning that the tool can run on your desktop as well. <br/><br/> The Windows machine running the tool should have network connectivity to the servers/virtual machines hosting the Java web applications to be containerized.<br/><br/> Ensure that 6-GB space is available on the Windows machine running the Azure Migrate: App Containerization tool for storing application artifacts. <br/><br/> The Windows machine should have internet access, directly or via a proxy.
 **Application servers** | - Enable Secure Shell (SSH) connection on port 22 on the server(s) running the Java application(s) to be containerized. <br/>
-**Java web application** | The tool currently supports <br/><br/> - Applications running on Tomcat 8 or later.<br/> - Application servers on Ubuntu Linux 16.04/18.04/20.04, Debian 7/8, CentOS 6/7, Red Hat Enterprise Linux 5/6/7. <br/> - Applications using Java version 7 or later.  <br/><br/> The tool currently doesn't support <br/><br/> - Applications servers running multiple Tomcat instances <br/>  
+**Java web application** | The tool currently supports <br/><br/> - Applications running on Tomcat 8 or Tomcat 9.<br/> - Application servers on Ubuntu Linux 16.04/18.04/20.04, Debian 7/8, CentOS 6/7, Red Hat Enterprise Linux 5/6/7. <br/> - Applications using Java 7 or Java 8. <br/> If you have version outside of this,  find an image that supports your required versions and modify the dockerfile to replace image <br/><br/> The tool currently doesn't support <br/><br/> - Applications servers running multiple Tomcat instances <br/>  
 
 
 ## Prepare an Azure user account

articles/operator-service-manager/best-practices-onboard-deploy.md

@@ -38,7 +38,7 @@ NFDG represents the smallest component that you plan to reuse independently acro
 
 For Containerized Network Function Definition Versions (CNF NFDVs), the networkFunctionApplications list can only contain helm packages. It's reasonable to include multiple helm packages if they're always deployed and deleted together.
 
-For Virtualized Network Function Definition Versions (VNF NFDVs), the networkFunctionApplications list must contain one VhdImageFile and one ARM template. The ARM template should deploy a single VM. To deploy multiple VMs for a single VNF, make sure to use separate ARM templates for each VM. 
+For Virtualized Network Function Definition Versions (VNF NFDVs), the networkFunctionApplications list must contain at least one VhdImageFile and one ARM template. The ARM template should deploy a single VM. To deploy multiple VMs for a single VNF, make sure to use separate ARM templates for each VM. 
 
 The ARM template can only deploy ARM resources from the following Resource Providers:
 
@@ -50,6 +50,9 @@ The ARM template can only deploy ARM resources from the following Resource Provi
 - Microsoft.Authorization
 - Microsoft.ManagedIdentity
 
+>[!NOTE] 
+> For ARM templates containing anything beyond the above list, all PUT calls and Re-PUT on the VNF will result in validation error. 
+
 ### Common use cases that trigger Network Function Design Version minor or major version update
 
 - Updating CGS / CGV for an existing release that triggers changing the deployParametersMappingRuleProfile.

articles/private-link/tutorial-private-endpoint-sql-cli.md

@@ -20,7 +20,7 @@ In this tutorial, you learn how to:
 > [!div class="checklist"]
 > * Create a virtual network and bastion host.
 > * Create a virtual machine.
-> * Create a Azure SQL server and private endpoint.
+> * Create an Azure SQL server and private endpoint.
 > * Test connectivity to the SQL server private endpoint.
 
 ## Prerequisites

articles/vpn-gateway/about-site-to-site-tunneling.md

@@ -25,7 +25,7 @@ There are a few different ways that you can configure forced tunneling.
 
 ### Configure using BGP
 
-You can configure forced tunneling for VPN Gateway via BGP. You  need to advertise a default rout of 0.0.0.0/0 via BGP from your on-premises location to Azure so that all your Azure traffic is sent via the VPN Gateway S2S tunnel.
+You can configure forced tunneling for VPN Gateway via BGP. You  need to advertise a default route of 0.0.0.0/0 via BGP from your on-premises location to Azure so that all your Azure traffic is sent via the VPN Gateway S2S tunnel.
 
 ### Configure using Default Site
 
@@ -44,4 +44,4 @@ In some cases, you may want Internet-bound traffic only from certain subnets (bu
 
 * See [How to configure forced tunneling via Default Site for VPN Gateway S2S connections](site-to-site-tunneling.md).
 
-* For more information about virtual network traffic routing, see [VNet traffic routing](../virtual-network/virtual-networks-udr-overview.md).
+* For more information about virtual network traffic routing, see [VNet traffic routing](../virtual-network/virtual-networks-udr-overview.md).

includes/site-recovery-limits.md

@@ -21,7 +21,7 @@ The following limits apply to Azure Site Recovery.
 | Limit identifier | Limit |
 | --- | --- |
 | Number of vaults per subscription |500 |     
-| Number of servers per Recovery Services vault |250 |
+| Number of appliances per Recovery Services vault |250 |
 | Number of protection groups per Recovery Services vault |No limit |
 | Number of recovery plans per Recovery Services vault |No limit |
 | Number of servers per protection group |No limit |