Merge pull request #280182 from MicrosoftDocs/main

Publish to live, Sunday 4:00PM PDT, 07/07

Author: Stacyrch140

articles/advisor/advisor-reference-performance-recommendations.md

@@ -455,25 +455,25 @@ Learn more about [Azure Database for PostgreSQL flexible server - Upscale Server
 
 Our system shows that you have log_statement enabled, for better performance set it to NONE
 
-Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_statement settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
+Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_statement settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
 
 ### Optimize log_duration settings for PostgreSQL on Azure Database
 
 You may experience potential performance degradation due to logging settings. To optimize these settings, set the log_duration server parameter to OFF.
 
-Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
+Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
 
 ### Optimize log_min_duration settings for PostgreSQL on Azure Database
 
 Your log_min_duration server parameter is set to less than 60,000 ms (1 minute), which can lead to potential performance degradation. You can optimize logging settings by setting the log_min_duration_statement parameter to -1.
 
-Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_min_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
+Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_min_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
 
 ### Optimize log_error_verbosity settings for PostgreSQL on Azure Database
 
 Your server has been configured to output VERBOSE error logs. This can be useful for troubleshooting your database, but it can also result in reduced database performance. To improve performance, we recommend changing the log_error_verbosity server parameter to the DEFAULT setting.
 
-Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_error_verbosity settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
+Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_error_verbosity settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
 
 ### Identify if checkpoints are happening too often to improve PostgreSQL - Flexible Server performance
 

articles/azure-monitor/alerts/alerts-common-schema.md

@@ -108,6 +108,9 @@ For sample alerts that use the common schema, see [Sample alert payloads](alerts
 | firedDateTime | The date and time when the alert instance was fired in Coordinated Universal Time (UTC). |
 | resolvedDateTime | The date and time when the monitor condition for the alert instance is set to **Resolved** in UTC. Currently only applicable for metric alerts.|
 | description | The description, as defined in the alert rule. |
+| alertRuleID | The ID of the alert rule that generated the alert instance.|
+| resourceType | The resource type affected by the alert.|
+| resourceGroupName | Name of the resource group for the impacted resource.|
 |essentialsVersion| The version number for the essentials section.|
 |alertContextVersion | The version number for the `alertContext` section.|
 |investigationLink | Link to investigate the alert in Azure Monitor. Currently requires limited preview registration.|

articles/defender-for-iot/organizations/TOC.yml

@@ -367,8 +367,6 @@
         items:
         - name: HPE ProLiant DL20 Gen11 (4SFF)
           href: appliance-catalog/hpe-proliant-dl20-gen-11.md
-        - name: HPE ProLiant DL20 Gen10 Plus (4SFF)
-          href: appliance-catalog/hpe-proliant-dl20-plus-enterprise.md
         - name: Dell Edge 5200 (Rugged MIL-STD-810G)
           href: appliance-catalog/dell-edge-5200.md
         - name: Dell PowerEdge R350
@@ -377,8 +375,6 @@
         items:
         - name: HPE ProLiant DL20 Gen11 Plus (NHP 2LFF)
           href: appliance-catalog/hpe-proliant-dl20-gen-11-nhp-2lff.md
-        - name: HPE ProLiant DL20 Gen10 Plus (NHP 2LFF)
-          href: appliance-catalog/hpe-proliant-dl20-plus-smb.md
         - name: YS-techsystems YS-FIT2 (Rugged MIL-STD-810G)
           href: appliance-catalog/ys-techsystems-ys-fit2.md
         - name: DELL XE4 SFF
@@ -397,6 +393,10 @@
         items:
         - name: HPE ProLiant DL20 Gen10 (E1800)
           href: appliance-catalog/hpe-proliant-dl20-legacy.md
+        - name: HPE ProLiant DL20 Gen10 Plus (NHP 2LFF)
+          href: appliance-catalog/hpe-proliant-dl20-plus-smb.md
+        - name: HPE ProLiant DL20 Gen10 Plus (4SFF)
+          href: appliance-catalog/hpe-proliant-dl20-plus-enterprise.md
         - name: Dell PowerEdge R340 XL (E1800)
           href: appliance-catalog/dell-poweredge-r340-xl-legacy.md
         - name: HPE Edgeline EL300 (L500 Rugged)

articles/defender-for-iot/organizations/appliance-catalog/dell-poweredge-r340-xl-legacy.md

@@ -156,7 +156,7 @@ Configure the appliance BIOS only if you didn't purchase your appliance from Arr
 
 1. Select **Boot Settings**.
 
-1. For the **Boot Mode** option, select **BIOS**.
+1. For the **Boot Mode** option, select **UEFI**.
 
 1. Select **Back**, and then select **Finish** to exit the BIOS settings.
 

articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-smb.md

@@ -88,7 +88,7 @@ Installation includes:
 
 - Enabling remote access and updating the default administrator password
 - Configuring iLO port on network port 1
-- Configuring BIOS and RAID1 settings
+- Configuring BIOS settings
 - Installing Defender for IoT software
 
 > [!NOTE]
@@ -137,12 +137,6 @@ This procedure describes how to update the HPE BIOS configuration for your OT de
 
 1. Select **Esc** twice to close the **System Configuration** form.
 
-1. Select **Embedded RAID 1: HPE Smart Array E208i-a SR Gen 10** > **Array Configuration** > **Create Array**.
-
-1. Select **Proceed to Next Form**.
-
-1. In the **Set RAID Level** form, set the level to **RAID 1**.
-
 1. Select **Proceed to Next Form**.
 
 1. In the **Logical Drive Label** form, enter **Logical Drive 1**.

articles/defender-for-iot/organizations/appliance-catalog/index.yml

@@ -27,8 +27,6 @@ landingContent:
     linkLists:
       - linkListType: deploy
         links:
-          - text: HPE ProLiant DL20 Gen10 Plus (4SFF)
-            url: hpe-proliant-dl20-plus-enterprise.md
           - text: HPE ProLiant DL20 Gen11 (4SFF)
             url: hpe-proliant-dl20-gen-11.md
           - text: Dell Edge 5200 (Rugged MIL-STD-810G)
@@ -41,8 +39,6 @@ landingContent:
     linkLists:
       - linkListType: deploy
         links:
-          - text: HPE ProLiant DL20 Gen10 Plus (NHP 2LFF)
-            url: hpe-proliant-dl20-plus-smb.md
           - text: HPE ProLiant DL20 Gen11 Plus (NHP 2LFF)
             url: hpe-proliant-dl20-gen-11-nhp-2lff.md
           - text: YS-techsystems YS-FIT2 (Rugged MIL-STD-810G)
@@ -69,15 +65,19 @@ landingContent:
     linkLists:
       - linkListType: deploy
         links:
-          - text: HPE ProLiant DL20 Gen10 
+          - text: HPE ProLiant DL20 Gen10 Plus (NHP 2LFF) (L500)
+            url: hpe-proliant-dl20-plus-smb.md
+          - text: HPE ProLiant DL20 Gen10 Plus (4SFF) (E1800)
+            url: hpe-proliant-dl20-plus-enterprise.md
+          - text: HPE ProLiant DL20 Gen10 (E1800)
             url: hpe-proliant-dl20-legacy.md              
-          - text: Dell PowerEdge R340 XL 
+          - text: Dell PowerEdge R340 XL (E1800)
             url: dell-poweredge-r340-xl-legacy.md            
-          - text: HPE ProLiant DL20 Gen10 (NHP 2LFF) 
+          - text: HPE ProLiant DL20 Gen10 (NHP 2LFF) (L500 Rugged)
             url: hpe-proliant-dl20-smb-legacy.md                  
-          - text: HPE Edgeline EL300 
+          - text: HPE Edgeline EL300 (L500 Rugged)
             url: hpe-edgeline-el300.md
-          - text: Neousys Nuvo-500LP
+          - text: Neousys Nuvo-500LP (L100 Rugged)
             url: neousys-nuvo-5006lp.md
 
       # - linkListType: reference

articles/nat-gateway/nat-metrics.md

@@ -271,7 +271,7 @@ To create the alert, use the following steps:
 1. Select **Create** to create the alert rule.
 
 >[!NOTE]
->SNAT port exhaustion on your NAT gateway resource is uncommon. If you see SNAT port exhaustion, check if NAT gateway's idle timeout timer is set higher than the default amount of 4 minutes. A long idle timeout timer seeting can cause SNAT ports too be in hold down for longer, which results in exhausting SNAT port inventory sooner. You can also scale your NAT gateway with additional public IPs to increase NAT gateway's overall SNAT port inventory. To troubleshoot these kinds of issues, refer to the [NAT gateway connectivity troubleshooting guide](/azure/nat-gateway/troubleshoot-nat-connectivity#snat-exhaustion-due-to-nat-gateway-configuration). 
+>SNAT port exhaustion on your NAT gateway resource is uncommon. If you see SNAT port exhaustion, check if NAT gateway's idle timeout timer is set higher than the default amount of 4 minutes. A long idle timeout timer setting can cause SNAT ports too be in hold down for longer, which results in exhausting SNAT port inventory sooner. You can also scale your NAT gateway with additional public IPs to increase NAT gateway's overall SNAT port inventory. To troubleshoot these kinds of issues, refer to the [NAT gateway connectivity troubleshooting guide](/azure/nat-gateway/troubleshoot-nat-connectivity#snat-exhaustion-due-to-nat-gateway-configuration). 
 
 ### Alerts for NAT gateway resource health