Merge pull request #244805 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 7901604b2e35 · 2023-07-14T00:41:58.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory-b2c/custom-policies-series-hello-world.md b/articles/active-directory-b2c/custom-policies-series-hello-world.md
@@ -143,10 +143,10 @@ If you haven't already done so, create the following encryption keys. To automat
 
     ```xml
       <UserJourney Id="HelloWorldJourney">
-  <OrchestrationSteps>
-    <OrchestrationStep Order="1" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="JwtIssuer" />
-  </OrchestrationSteps>
-</UserJourney>
+        <OrchestrationSteps>
+          <OrchestrationStep Order="1" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="JwtIssuer" />
+        </OrchestrationSteps>
+      </UserJourney>
     ```
     
     We've added a [UserJourney](userjourneys.md). The user journey specifies the business logic the end user goes through as Azure AD B2C processes a request. This user journey has only one step that issues a JTW token with the claims that you'll define in the next step.
diff --git a/articles/aks/azure-cni-overlay.md b/articles/aks/azure-cni-overlay.md
@@ -121,6 +121,14 @@ az aks create -n $clusterName -g $resourceGroup --location $location --network-p
 > - Doesn't use the dynamic pod IP allocation feature.
 > - Doesn't have network policies enabled.
 > - Doesn't use any Windows node pools with docker as the container runtime.
+ 
+> [!WARNING]
+> Prior to Windows OS Build 20348.1668, there was a limitation around Windows Overlay pods incorrectly SNATing packets from host network pods, which had a more detrimental effect for clusters upgrading to Overlay. To avoid this issue, **use Windows OS Build greater than or equal to 20348.1668**.
+
+> [!WARNING]
+> If using a custom azure-ip-masq-agent config to include additional IP ranges that should not SNAT packets from pods, upgrading to Azure CNI Overlay may break connectivity to these ranges. Pod IPs from the overlay space will not be reachable by anything outside the cluster nodes.
+> Additionally, for sufficiently old clusters there may be a ConfigMap left over from a previous version of azure-ip-masq-agent. If this ConfigMap, named `azure-ip-masq-agent-config`, exists and is not intetionally in-place it should be deleted before running the update command.
+> If not using a custom ip-masq-agent config, only the `azure-ip-masq-agent-config-reconciled` ConfigMap should exist with respect to Azure ip-masq-agent ConfigMaps and this will be updated automatically during the upgrade process.
 
 The upgrade process triggers each node pool to be re-imaged simultaneously. Upgrading each node pool separately to Overlay isn't supported. Any disruptions to cluster networking are similar to a node image upgrade or Kubernetes version upgrade where each node in a node pool is re-imaged.
 
@@ -139,9 +147,6 @@ az aks update --name $clusterName \
 
 The `--pod-cidr` parameter is required when upgrading from legacy CNI because the pods need to get IPs from a new overlay space, which doesn't overlap with the existing node subnet. The pod CIDR also can't overlap with any VNet address of the node pools. For example, if your VNet address is *10.0.0.0/8*, and your nodes are in the subnet *10.240.0.0/16*, the `--pod-cidr` can't overlap with *10.0.0.0/8* or the existing service CIDR on the cluster.
 
-> [!WARNING]
-> Prior to Windows OS Build 20348.1668, there was a limitation around Windows Overlay pods incorrectly SNATing packets from host network pods, which had a more detrimental effect for clusters upgrading to Overlay. To avoid this issue, **use Windows OS Build 20348.1668**.
-
 ## Install the aks-preview Azure CLI extension - Windows only
 
 [!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
diff --git a/articles/azure-monitor/best-practices-analysis.md b/articles/azure-monitor/best-practices-analysis.md
@@ -19,7 +19,7 @@ This table describes Azure Monitor features that provide analysis of collected d
 |Component  |Description | Required training and/or configuration|
 |---------|---------|--------|
 |Overview page|Most Azure services have an **Overview** page in the Azure portal that includes a **Monitor** section with charts that show recent critical metrics. This information is intended for owners of individual services to quickly assess the performance of the resource. |This page is based on platform metrics that are collected automatically. No configuration is required.         |
-|[Metrics Explorer](essentials/metrics-getting-started.md)|You can use Metrics Explorer to interactively work with metric data and create metric alerts. You need minimal training to use Metrics Explorer, but you must be familiar with the metrics you want to analyze. |- Once data collection is configured, no another configuration is required.<br>- Platform metrics for Azure resources are automatically available.<br>- Guest metrics for virtual machines are available after an Azure Monitor agent is deployed to the virtual machine.<br>- Application metrics are available after Application Insights is configured.         |
+|[Metrics Explorer](essentials/metrics-getting-started.md)|You can use Metrics Explorer to interactively work with metric data and create metric alerts. You need minimal training to use Metrics Explorer, but you must be familiar with the metrics you want to analyze. |- Once data collection is configured, no other configuration is required.<br>- Platform metrics for Azure resources are automatically available.<br>- Guest metrics for virtual machines are available after an Azure Monitor agent is deployed to the virtual machine.<br>- Application metrics are available after Application Insights is configured.         |
 |[Log Analytics](logs/log-analytics-overview.md)|With Log Analytics, you can create log queries to interactively work with log data and create log query alerts.| Some training is required for you to become familiar with the query language, although you can use prebuilt queries for common requirements. You can also add [query packs](logs/query-packs.md) with queries that are unique to your organization. Then if you're familiar with the query language, you can build queries for others in your organization.        |
 
 ## Built-in visualization tools
diff --git a/articles/communication-services/quickstarts/voice-video-calling/includes/raw-media/raw-media-access-javascript.md b/articles/communication-services/quickstarts/voice-video-calling/includes/raw-media/raw-media-access-javascript.md
@@ -364,7 +364,8 @@ bwVideoElem.srcObject = null;
 Use the following code to stop sending a custom screen share stream after it has been set during a call.
 
 ```js
-await call.stopScreenSharing();
+// Stop sending raw screen sharing stream
+await call.stopScreenSharing(localScreenSharingStream);
 ```
 
 ### Access incoming screen share stream from a remote participant
diff --git a/articles/iot-hub-device-update/media/import-update/device-twin-ppr.png b/articles/iot-hub-device-update/media/import-update/device-twin-ppr.png
diff --git a/articles/mariadb/concepts-connectivity-architecture.md b/articles/mariadb/concepts-connectivity-architecture.md
@@ -60,7 +60,7 @@ The following table lists the gateway IP addresses of the Azure Database for Mar
 | Germany West Central | 51.116.152.0 | |
 | India Central | 104.211.96.159     | | |
 | India South | 104.211.224.146     | | |
-| India West | 104.211.160.80     | | |
+| India West |  104.211.144.32   |104.211.160.80  | |
 | Japan East | 40.79.192.23, 40.79.184.8 | 13.78.61.196 | |
 | Japan West | 191.238.68.11, 40.74.96.6, 40.74.96.7     | 104.214.148.156 | |
 | Korea Central | 52.231.17.13     | 52.231.32.42 | |
diff --git a/articles/mysql/concepts-version-policy.md b/articles/mysql/concepts-version-policy.md
@@ -28,7 +28,7 @@ Azure Database for MySQL currently supports the following major and minor versio
 | Version | [Single Server](single-server/overview.md)<br />Current minor version | [Flexible Server](flexible-server/overview.md)<br />Current minor version |
 | :--- | :--- | :--- |
 | MySQL Version 5.7 | [5.7.32](https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-29.html) | [5.7.40](https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-40.html) |
-| MySQL Version 8.0 | [8.0.15](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-15.html) | [8.0.31](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-31.html) |
+| MySQL Version 8.0 | [8.0.15](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-15.html) | [8.0.32](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-32.html) |
 
 > [!NOTE]  
 > In the Single Server deployment option, a gateway redirects the connections to server instances. After the connection is established, the MySQL client displays the version of MySQL set in the gateway, not the actual version running on your MySQL server instance. To determine the version of your MySQL server instance, use the `SELECT VERSION();` command at the MySQL prompt. If your application has a requirement to connect to a specific major version, say v5.7 or v8.0, you can do so by changing the port in your server connection string as explained in our documentation [here.](concepts-supported-versions.md#connect-to-a-gateway-node-that-is-running-a-specific-mysql-version)
diff --git a/articles/mysql/single-server/concepts-connectivity-architecture.md b/articles/mysql/single-server/concepts-connectivity-architecture.md
@@ -66,7 +66,7 @@ The following table lists the gateway IP addresses of the Azure Database for MyS
 |  Germany West Central  |  51.116.152.0                                              |             |                                               |
 |  India Central         |  20.192.96.33                                            |  104.211.96.159                    |                                               |
 |  India South           |  40.78.192.32                                           |  104.211.224.146                   |                                               |
-|  India West            |  104.211.160.80                                            |           |                                               |
+|  India West            |  104.211.144.32                                           |  104.211.160.80          |                                               |
 |  Japan East            |  40.79.192.23, 40.79.184.8                                 |  13.78.61.196           |                                               |
 |  Japan West            |  191.238.68.11, 40.74.96.6,   40.74.96.7, 40.74.96.32                   |  104.214.148.156                |                                               |
 |  Korea Central         |  52.231.17.13                                              |  52.231.32.42                    |                                               |
diff --git a/articles/postgresql/migrate/common-errors-and-special-scenarios-fms.md b/articles/postgresql/migrate/common-errors-and-special-scenarios-fms.md
@@ -47,7 +47,7 @@ This articles explains common errors and special scenarios for PostgreSQL Single
 
 - Mitigation/Resolution
 
-    Customers need to go to the server parameters of the flexible server and allowlist all the extensions they intend to use. At least the ones mentioned in the error message should be allowed to be listed.
+    Customers need to go to the server parameters of the flexible server and allowlist all the extensions they intend to use. At least the ones mentioned in the error message should be allowed to be listed. To add extensions to the allowlist, you can edit the list of the `azure.extensions` parameter in the Server parameters for your flexible server.
 
 ## No pg_hba.conf entry for host
 
diff --git a/articles/virtual-desktop/what-is-app-attach.md b/articles/virtual-desktop/what-is-app-attach.md
@@ -14,7 +14,7 @@ manager: femila
 
 MSIX is a packaging format that offers many features aimed to improve packaging experience for all Windows apps. To learn more about MSIX, see the [MSIX overview](/windows/msix/overview).
 
-MSIX app attach is a way to deliver MSIX applications to both physical and virtual machines. However, MSIX app attach is different from regular MSIX because it's made especially for supported products, such as Azure Virtual Desktop. This article will describe what MSIX app attach is and what it can do for you.
+MSIX app attach is a way to deliver MSIX applications to Azure Virtual Desktop virtual machines. However, MSIX app attach is different from regular MSIX because it's made especially for supported products, such as Azure Virtual Desktop. This article will describe what MSIX app attach is and what it can do for you.
 
 ## Terminology
 
diff --git a/articles/virtual-machines/extensions/key-vault-linux.md b/articles/virtual-machines/extensions/key-vault-linux.md
@@ -26,17 +26,15 @@ The Key Vault VM extension supports these Linux distributions:
 
 > [!NOTE]
 > To get extended security features, prepare to upgrade Ubuntu 16.04 and Debian 9 systems as these versions are reaching their end of designated support period.
-> 
 
 > [!NOTE]
-> The Key Vault VM Extension downloads the certificates in the default location or to the location provided by "certStoreLocation" property in the VM Extension settings. The KeyValut VM Extension updates the folder permission to 700 (drwx------) allowing read, write and execute permission to the owner of the folder only
+> The Key Vault VM Extension downloads the certificates in the default location or to the location provided by "certStoreLocation" property in the VM Extension settings. The Key Vault VM Extension updates the folder permission to 700 (drwx------) allowing read, write and execute permission to the owner of the folder only
 
 ### Supported certificate content types
 
 - PKCS #12
 - PEM
 
-
 ## Prerequisites
   - Key Vault instance with certificate. See [Create a Key Vault](../../key-vault/general/quick-create-portal.md)
   - VM/VMSS must have assigned [managed identity](../../active-directory/managed-identities-azure-resources/overview.md)
@@ -59,7 +57,8 @@ The Key Vault VM extension supports these Linux distributions:
                   }
    `
 ## Key Vault VM extension version
-* Users can chose to upgrade their key vault vm extension version to `V2.0` to use full certificate chain download feature. Issuer certificates (intermediate and root) will be appended to the leaf certificate in the PEM file.
+
+* Users can chose to upgrade their Key Vault vm extension version to `V2.0` to use full certificate chain download feature. Issuer certificates (intermediate and root) will be appended to the leaf certificate in the PEM file.
 
 * If you prefer to upgrade to `v2.0`, you would need to delete `v1.0` first, then install `v2.0`.
 ```azurecli
@@ -70,9 +69,6 @@ The Key Vault VM extension supports these Linux distributions:
 
 * If the VM has certificates downloaded by v1.0, deleting the v1.0 AKVVM extension will NOT delete the downloaded certificates.  After installing v2.0, the existing certificates will NOT be modified.  You would need to delete the certificate files or roll-over the certificate to get the PEM file with full-chain on the VM.
 
-
-
-
 ## Extension schema
 
 The following JSON shows the schema for the Key Vault VM extension. The extension does not require protected settings - all its settings are considered information without security impact. The extension requires a list of monitored secrets, polling frequency, and the destination certificate store. Specifically:  
@@ -120,8 +116,6 @@ The following JSON shows the schema for the Key Vault VM extension. The extensio
 > Also **required** for **Azure Arc-enabled VMs**.
 > Set msiEndpoint to `http://localhost:40342/metadata/identity`.
 
-
-
 ### Property values
 
 | Name | Value / Example | Data Type |
@@ -139,7 +133,6 @@ The following JSON shows the schema for the Key Vault VM extension. The extensio
 | msiEndpoint | http://169.254.169.254/metadata/identity | string |
 | msiClientId | c7373ae5-91c2-4165-8ab6-7381d6e75619 | string |
 
-
 ## Template deployment
 
 Azure VM extensions can be deployed with Azure Resource Manager templates. Templates are ideal when deploying one or more virtual machines that require post deployment refresh of certificates. The extension can be deployed to individual VMs or virtual machine scale sets. The schema and configuration are common to both template types. 
@@ -233,7 +226,6 @@ The Azure PowerShell can be used to deploy the Key Vault VM extension to an exis
 
         # Start the deployment
         Update-AzVmss -ResourceGroupName <ResourceGroupName> -VMScaleSetName <VmssName> -VirtualMachineScaleSet $vmss 
-    
     ```
 
 ## Azure CLI deployment
