Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

articles/azure-resource-manager/management/manage-resource-groups-cli.md

@@ -8,7 +8,7 @@ ms.author: jgao
 ms.custom: devx-track-azurecli
 ---
 
-# Manage Azure Resource Manager resource groups by using Azure CLI
+# Manage Azure Resource Groups by using Azure CLI
 
 Learn how to use Azure CLI with [Azure Resource Manager](overview.md) to manage your Azure resource groups. For managing Azure resources, see [Manage Azure resources by using Azure CLI](manage-resources-cli.md).
 
@@ -114,4 +114,4 @@ To manage access to a resource group, use [Azure role-based access control (Azur
 ## Next steps
 
 - To learn Azure Resource Manager, see [Azure Resource Manager overview](overview.md).
-- To learn the Resource Manager template syntax, see [Understand the structure and syntax of Azure Resource Manager templates](../templates/syntax.md).
+- To learn the Resource Manager template syntax, see [Understand the structure and syntax of Azure Resource Manager templates](../templates/syntax.md).

articles/azure-resource-manager/management/manage-resource-groups-powershell.md

@@ -8,7 +8,7 @@ ms.author: jgao
 ms.custom: devx-track-azurepowershell
 
 ---
-# Manage Azure Resource Manager resource groups by using Azure PowerShell
+# Manage Azure Resource Groups by using Azure PowerShell
 
 Learn how to use Azure PowerShell with [Azure Resource Manager](overview.md) to manage your Azure resource groups. For managing Azure resources, see [Manage Azure resources by using Azure PowerShell](manage-resources-powershell.md).
 

articles/data-factory/tutorial-managed-virtual-network-on-premise-sql-server.md

@@ -212,15 +212,11 @@ the page.
 
 ## Creating Forwarding Rule to Endpoint
 
-1. Login and download the port forwarding script [ip_fwd.sh](https://github.com/sajitsasi/az-ip-fwd/blob/main/ip_fwd.sh) to your backend server VMs. 
+1. Login and copy script [ip_fwd.sh](https://github.com/sajitsasi/az-ip-fwd/blob/main/ip_fwd.sh) to your backend server VMs. 
 2. Run the script on with the following options:<br/>
-    **sudo chmod +x ip_fwd.sh**<br/>
     **sudo ./ip_fwd.sh -i eth0 -f 1433 -a <FQDN/IP> -b 1433**<br/>
     <FQDN/IP> is your target SQL Server IP.<br/>
 
-    > [!Note] 
-    > The above script runs only once. In order to ensure that that port forwarding is enabled every time the machine starts, it should be configured as a startup service.
-    
     > [!Note] 
     > FQDN doesn't work for on-premises SQL Server unless you add a record in Azure DNS zone.
     
@@ -269,6 +265,9 @@ data factory from the resources list.
 
     :::image type="content" source="./media/tutorial-managed-virtual-network/linked-service-3.png" alt-text="Screenshot that shows the SQL server linked service creation page.":::
 
+> [!Note] 
+> If you have more than one SQL Server and need to define multiple load balancer rules and IP table records with different ports, make sure you explicitly add the port name after the FQDN when you edit Linked Service. The NAT VM will handle the port translation. If it's not explicitly specified, the connection will always time-out.
+
 ## Troubleshooting
 
 Go to the backend server VM, confirm telnet the SQL Server works: **telnet **<**FQDN**>** 1433**.

articles/defender-for-cloud/alerts-reference.md

@@ -258,7 +258,7 @@ At the bottom of this page, there's a table describing the Microsoft Defender fo
 | **An IP that connected to your Azure App Service FTP Interface was found in Threat Intelligence**<br>(AppServices_IncomingTiClientIpFtp) | Azure App Service FTP log indicates a connection from a source address that was found in the threat intelligence feed. During this connection, a user accessed the pages listed.<br>(Applies to: App Service on Windows and App Service on Linux)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Initial Access                                                     | Medium   |
 | **Attempt to run high privilege command detected**<br>(AppServices_HighPrivilegeCommand)                                                 | Analysis of App Service processes detected an attempt to run a command that requires high privileges.<br>The command ran in the web application context. While this behavior can be legitimate, in web applications this behavior is also observed in malicious activities.<br>(Applies to: App Service on Windows)                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | -                                                                  | Medium   |
 | **Communication with suspicious domain identified by threat intelligence**<br>(AzureDNS_ThreatIntelSuspectDomain) | Communication with suspicious domain was detected by analyzing DNS transactions from your resource and comparing against known malicious domains identified by threat intelligence feeds. Communication to malicious domains is frequently performed by attackers and could imply that your resource is compromised.                                                                            | Initial Access, Persistence, Execution, Command And Control, Exploitation              | Medium   |
-| **Connection to web page from anomalous IP address detected**<br>(AppServices_AnomalousPageAccess)                                       | Azure App Service activity log indicates an anomalous connection to a sensitive web page from the listed source IP address. This might indicate that someone is attempting a brute force attack into your web app administration pages. It might also be the result of a new IP address being used by a legitimate user. If the source IP address is trusted, you can safely suppress this alert for this resource. To learn how to suppress security alerts, see [Suppress alerts from Microsoft Defender for Cloud](alerts-suppression-rules.md). <br>(Applies to: App Service on Windows and App Service on Linux)                                                                                                                                                                        | Initial Access                                                     | Medium   |
+| **Connection to web page from anomalous IP address detected**<br>(AppServices_AnomalousPageAccess)                                       | Azure App Service activity log indicates an anomalous connection to a sensitive web page from the listed source IP address. This might indicate that someone is attempting a brute force attack into your web app administration pages. It might also be the result of a new IP address being used by a legitimate user. If the source IP address is trusted, you can safely suppress this alert for this resource. To learn how to suppress security alerts, see [Suppress alerts from Microsoft Defender for Cloud](alerts-suppression-rules.md). <br>(Applies to: App Service on Windows and App Service on Linux)                                                                                                                                                                        | Initial Access                                                     | Low   |
 | **Dangling DNS record for an App Service resource detected**<br>(AppServices_DanglingDomain)                                             | A DNS record that points to a recently deleted App Service resource (also known as "dangling DNS" entry) has been detected. This leaves you susceptible to a subdomain takeover. Subdomain takeovers enable malicious actors to redirect traffic intended for an organization’s domain to a site performing malicious activity.<br>(Applies to: App Service on Windows and App Service on Linux)                                                                                                                                                                                                                                                                                                                                                                                             | -                                                                  | High     |
 | **Detected encoded executable in command line data**<br>(AppServices_Base64EncodedExecutableInCommandLineParams)                         | Analysis of host data on {Compromised host} detected a base-64 encoded executable. This has previously been associated with attackers attempting to construct executables on-the-fly through a sequence of commands, and attempting to evade intrusion detection systems by ensuring that no individual command would trigger an alert. This could be legitimate activity, or an indication of a compromised host.<br>(Applies to: App Service on Windows)                                                                                                                                                                                                                                                                                                                                   | Defense Evasion, Execution                                         | High     |
 | **Detected file download from a known malicious source**<br>(AppServices_SuspectDownload)                                                | Analysis of host data has detected the download of a file from a known malware source on your host.<br>(Applies to: App Service on Linux)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Privilege Escalation, Execution, Exfiltration, Command and Control | Medium   |

articles/expressroute/expressroute-monitoring-metrics-alerts.md

@@ -112,6 +112,10 @@ You can view near to real-time availability of BGP (Layer-3 connectivity) across
 
 :::image type="content" source="./media/expressroute-monitoring-metrics-alerts/erBgpAvailabilityMetrics.jpg" alt-text="BGP availability per peer":::
 
+>[!NOTE]
+>During maintenance between the Microsoft edge and core network, BGP availability will appear down even if the BGP session between the customer edge and Microsoft edge remains up. For information about maintenance between the Microsoft edge and core network, make sure to have your [maintenance alerts turned on and configured](./maintenance-alerts.md).
+>
+
 ### <a name = "arp"></a>ARP Availability - Split by Peering  
 
 Aggregation type: *Avg*

articles/expressroute/expressroute-network-insights.md

@@ -52,6 +52,10 @@ The *Availability* tab tracks ARP and BGP availability, plotting the data for bo
 
 :::image type="content" source="./media/expressroute-network-insights/arp-bgp-availability.png" alt-text="Screenshot of availability metric graphs." lightbox="./media/expressroute-network-insights/arp-bgp-availability-expanded.png":::
 
+>[!NOTE]
+>During maintenance between the Microsoft edge and core network, BGP availability will appear down even if the BGP session between the customer edge and Microsoft edge remains up. For information about maintenance between the Microsoft edge and core network, make sure to have your [maintenance alerts turned on and configured](./maintenance-alerts.md).
+>
+
 ### Throughput
 
 Similarly, the *Throughput* tab plots the total throughput of ingress and egress traffic for the circuit in bits/second. You can also view throughput for individual connections and each type of configured peering.

articles/expressroute/maintenance-alerts.md

@@ -16,6 +16,7 @@ ExpressRoute uses Azure Service Health to notify you of planned and upcoming Exp
 > [!NOTE]
 > * During a maintenance activity or in case of unplanned events impacting one of the connection, Microsoft will prefer to use AS path prepending to drain traffic over to the healthy connection. You will need to ensure the traffic is able to route over the healthy path when path prepend is configured from Microsoft and required route advertisements are configured appropriately to avoid any service disruption. 
 > * Terminating ExpressRoute BGP connections on stateful devices can cause issues with failover during planned or unplanned maintenances by Microsoft or your ExpressRoute Provider. You should test your set up to ensure your traffic will failover properly, and when possible, terminate BGP sessions on stateless devices.
+> * During maintenance between the Microsoft edge and core network, BGP availability will appear down even if the BGP session between the customer edge and Microsoft edge remains up. For information about maintenance between the Microsoft edge and core network, make sure to have your maintenance alerts turned on and configured correctly using the guidance below.
 >
 
 ## View planned maintenance

articles/expressroute/monitor-expressroute.md

@@ -141,6 +141,10 @@ The following table lists common and recommended alert rules for ExpressRoute.
 | ARP availability down | Dimension name: Peering Type, Aggregation type: Avg, Operator: Less than, Threshold value: 100% | When ARP availability is down for a peering type. |
 | BGP availability down | Dimension name: Peer, Aggregation type: Avg, Operator: Less than, Threshold value: 100% | When BGP availability is down for a peer. |
 
+>[!NOTE]
+>During maintenance between the Microsoft edge and core network, BGP availability will appear down even if the BGP session between the customer edge and Microsoft edge remains up. For information about maintenance between the Microsoft edge and core network, make sure to have your [maintenance alerts turned on and configured](./maintenance-alerts.md).
+>
+
 ### Alerts for ExpressRoute gateway connections
 
 1. To configure alerts, navigate to **Azure Monitor**, then select **Alerts**.

articles/hdinsight/hdinsight-for-vscode.md

@@ -164,7 +164,7 @@ With Spark & Hive Tools for Visual Studio Code, you can submit interactive Hive
 
    - **MESSAGES** panel: When you select a **Line** number, it jumps to the first line of the running script.
 
-## Submit interactive PySpark queries
+## Submit interactive PySpark queries (Not supported Synapse PySpark interactive anymore)
 
 Users can perform PySpark interactive in the following ways:
 
@@ -260,7 +260,8 @@ The tool also supports the **Spark SQL** query:
 
 > [!NOTE]
 >
-> [ms-toolsai.jupyter >2021.3.684299474 version is not supported on this extension](#known-issues) is a known issue. Please using Synapse kernel by sticking to Microsoft Jupyter 2021.3.684299474.
+> [For Synapse PySpark installation error](#known-issues), since its dependency will not be maintained anymore by other team, this will not be maintained anymore as well. If you trying to use Synapse Pyspark interactive, please switch to use [Azure Synapse Analytics](https://ms.web.azuresynapse.net/en-us/) instead. And it's a long term change.
+>
 
 ## Submit PySpark batch job
 
@@ -311,7 +312,7 @@ You can follow the normal steps to sign in to Azure subscription to connect to y
 
 For run a hive job, you can follow the normal steps to submit job to HDInsight ESP cluster with ID Broker (HIB). Refer to [Submit interactive Hive queries and Hive batch scripts](#submit-interactive-hive-queries-and-hive-batch-scripts) for more instructions.
 
-For run a interactive PySpark job, you can follow the normal steps to submit job to HDInsight ESP cluster with ID Broker (HIB). Refer to [Submit interactive PySpark queries](#submit-interactive-pyspark-queries) for more instructions.
+For run an interactive PySpark job, you can follow the normal steps to submit job to HDInsight ESP cluster with ID Broker (HIB). Refer to Submit interactive PySpark queries.
 
 For run a PySpark batch job, you can follow the normal steps to submit job to HDInsight ESP cluster with ID Broker (HIB). Refer to [Submit PySpark batch job](#submit-pyspark-batch-job) for more instructions.
 
@@ -483,17 +484,11 @@ From the menu bar, go to **View** > **Command Palette**, and then enter **Azure:
 
 ## Known Issues 
 
- ms-toolsai.jupyter >2021.3.684299474 version is not supported on this extension, please using Synapse kernel by sticking to Microsoft Jupyter 2021.3.684299474.
-
- 1. Disable auto updating extension.
-
-      ![disable auto updating extension](./media/hdinsight-for-vscode/disable-auto-updating-extension.png)
-
-2. Install a selected version of Microsoft Jupyter.
+### Synapse PySpark installation error.
 
-      ![selected version of microsoft jupyter](./media/hdinsight-for-vscode/selected-version-of-microsoft-jupyter.png)
+ For Synapse PySpark installation error, since its dependency will not be maintained anymore by other team, it will not be maintained anymore. If you trying to use Synapse Pyspark interactive, please use [Azure Synapse Analytics](https://ms.web.azuresynapse.net/) instead. And it's a long term change.
 
-3. Install  Microsoft Jupyter version 2021.3.684299474
+   ![synapse pyspark installation error](./media/hdinsight-for-vscode/known-issue.png)
 
 
 ## Next steps