fixing merge conflict

Author: ShawnJackson

articles/automation/add-user-assigned-identity.md

@@ -120,8 +120,8 @@ PATCH
   "identity": {
     "type": "SystemAssigned, UserAssigned",
     "userAssignedIdentities": {
-      "/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
-      "/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
+      "/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
+      "/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
     }
   }
 }
@@ -130,7 +130,7 @@ PATCH
 The syntax of the API is as follows:
 
 ```http
-https://management.azure.com/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview 
+https://management.azure.com/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview 
 ```
 
 #### Example
@@ -176,15 +176,15 @@ Perform the following steps.
     ```json
     {
     "type": "SystemAssigned, UserAssigned",
-    "principalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
-    "tenantId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
+    "principalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
+    "tenantId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
     "userAssignedIdentities":  {
         "/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI1":  {
-                "PrincipalId":  "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
+                "PrincipalId":  "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
                 "ClientId":  "00001111-aaaa-2222-bbbb-3333cccc4444"
                     },
         "/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI2":  {
-                "PrincipalId":  "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
+                "PrincipalId":  "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
                 "ClientId":  "00001111-aaaa-2222-bbbb-3333cccc4444"
                     }
         }

articles/automation/enable-managed-identity-for-automation.md

@@ -185,8 +185,8 @@ Perform the following steps.
 
     ```json
     {
-        "PrincipalId":  "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
-        "TenantId":  "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
+        "PrincipalId":  "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
+        "TenantId":  "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
         "Type":  0,
         "UserAssignedIdentities":  null
     }

articles/container-apps/metrics.md

@@ -5,7 +5,7 @@ services: container-apps
 author: craigshoemaker
 ms.service: azure-container-apps
 ms.topic: how-to
-ms.date: 11/01/2024
+ms.date: 04/28/2025
 ms.author: cshoe
 ---
 
@@ -26,7 +26,7 @@ Container Apps provides these basic metrics.
 | Network In Bytes | Replica, Revision | Network received bytes | `RxBytes` | Bytes |
 | Network Out Bytes | Replica, Revision | Network transmitted bytes | `TxBytes` | Bytes |
 | Replica count | Revision | Number of active replicas | `Replicas` | Count |
-| Replica Restart Count | Replica, Revision | Restarts count of container app replicas | `RestartCount` | Count |
+| Total Replica Restart Count | Replica, Revision | Total number of restarts since the replica came online | `RestartCount` | Count |
 | Requests | Replica, Revision, Status Code, Status Code Category | Requests processed | `Requests` | Count |
 | Reserved Cores | Revision | Number of reserved cores for container app revisions | `CoresQuotaUsed` | Count |
 | Resiliency Connection Timeouts | Revision | Total connection timeouts | `ResiliencyConnectTimeouts` | Count |
@@ -42,9 +42,6 @@ Container Apps provides these basic metrics.
 
 The metrics namespace is `Microsoft.App/containerapps`.
 
-> [!NOTE]
-> Replica restart count is the aggregate restart count over the specified time range, not the number of restarts that occurred at a point in time.
-
 Container Apps environments provides this basic metric. You can only view this metric in [Azure Monitor metrics](https://ms.portal.azure.com/?feature.allrts=true#view/Microsoft_Azure_Monitoring/AzureMonitoringBrowseBlade/~/metrics). 
 
 | Title | Dimensions | Description | Metric ID | Unit |

articles/devtest-labs/devtest-lab-add-vm.md

@@ -39,7 +39,7 @@ This article describes how to create Azure virtual machines (VMs) in Azure DevTe
    - **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select a different size. For more information about default VM sizes, see [Default VM sizes](#default-vm-sizes).
    - **Allow hibernation**: Select this option to enable hibernation for the virtual machine.
      >[!NOTE]
-     >If you enable hibernation, you must also select **Public IP** in **Advanced Settings**. **Private** and **Shared** IPs aren't supported if hibernation is enabled.
+     >If you enable hibernation, you must also select either **Public IP** or **Private IP** in **Advanced Settings**. Hibernation for **Shared IPs** isn't currently supported.
    - **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
    - **Security type**: You can select **Trusted launch** to enable trusted launch for Generation 2 VMs. If you select **Trusted launch**, select the **Enable secure boot**, **Enable vTPM**, and **Integrity monitoring** checkboxes as needed. For more information, see [Trusted Launch for Azure virtual machines](/azure/virtual-machines/trusted-launch).
    - **Artifacts**: Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM. For instructions, see [Add artifacts](#add-artifacts).

articles/devtest-labs/devtest-lab-gen2-vm.md

@@ -45,7 +45,7 @@ You need at least [user](devtest-lab-add-devtest-user.md#devtest-labs-user) acce
    - **Password**: If you don't choose to use a secret, enter a VM password between 8 and 123 characters long.
    - **Save as default password**: Select this checkbox to save the password in the Key Vault associated with the lab.
    - **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select different sizes.
-   - **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select **Public IP** in the Advanced settings as Private and Shared IP are currently not supported if Hibernation is enabled.
+   - **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select either **Public IP** or **Private IP** in the Advanced settings. Hibernation for **Shared IPs** isn't currently supported.
    - **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
    - **Security type**: Select **Trusted Launch** to enable it for Generation 2 VMs. On selecting Trusted Launch, the options Secure boot, vTPM, and Integrity Monitoring will appear. Based on your needs, select the appropriate options among them for your deployment. For more information, see [Trusted Launch-enabled security features](/azure/virtual-machines/trusted-launch#secure-boot).
    - **Artifacts**: This field shows the number of artifacts already configured for this VM base. Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM.

articles/devtest-labs/devtest-lab-hibernate-vm.md

@@ -55,7 +55,7 @@ You need at least [user](devtest-lab-add-devtest-user.md#devtest-labs-user) acce
    - **Password**: If you don't choose to use a secret, enter a VM password between 8 and 123 characters long.
    - **Save as default password**: Select this checkbox to save the password in the Key Vault associated with the lab.
    - **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select different sizes.
-   - **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select **Public IP** in the Advanced settings as Private and Shared IP are currently not supported if Hibernation is enabled.
+   - **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select either **Public IP** or **Private IP** in the Advanced settings. Hibernation for **Shared IPs** isn't currently supported.
    - **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
    - **Security type**: Select **Trusted Launch** to enable it for Gen2 VMs. On selecting Trusted Launch When the options Secure boot, vTPM, and Integrity Monitoring appear, select the appropriate options for your deployment. For more information, see [Trusted Launch-enabled security features](/azure/virtual-machines/trusted-launch#secure-boot).
    - **Artifacts**: This field shows the number of artifacts already configured for this VM base. Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM.

articles/devtest-labs/devtest-lab-trusted-launch.md

@@ -45,7 +45,7 @@ You need at least [user](devtest-lab-add-devtest-user.md#devtest-labs-user) acce
    - **Password**: If you don't choose to use a secret, enter a VM password between 8 and 123 characters long.
    - **Save as default password**: Select this checkbox to save the password in the Key Vault associated with the lab.
    - **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select different sizes.
-   - **Allow hibernation**: Select this option to enable hibernation for this virtual machine. If you enable Hibernation, you also must select **Public IP** in the Advanced settings as Private and Shared IP are currently not supported if Hibernation is enabled.
+   - **Allow hibernation**: Select this option to enable hibernation for this virtual machine. If you enable Hibernation, you also must select either **Public IP** or **Private IP** in the Advanced settings. Hibernation for **Shared IPs** isn't currently supported.
    - **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
    - **Security type**: Select **Trusted Launch** to enable it for Generation 2 VMs. On selecting Trusted Launch, the options Secure boot, vTPM, and Integrity Monitoring will appear. Based on your needs, select the appropriate options among them for your deployment. For more information, see [Trusted Launch-enabled security features](/azure/virtual-machines/trusted-launch#secure-boot).
    - **Artifacts**: This field shows the number of artifacts already configured for this VM base. Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM.

articles/devtest-labs/tutorial-create-custom-lab.md

@@ -80,7 +80,7 @@ To add a VM to the lab, follow these steps. For more information, see [Create la
    - **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select a different size.
    - **Allow hibernation**: You can select this checkbox to enable hibernation for this VM. For this tutorial, keep the checkbox deselected.
      >[!NOTE]
-     >If you enable hibernation, you must also select **Public** for **IP Address** in the **Advanced settings**, because **Private** and **Shared** IPs aren't supported if hibernation is enabled.
+     >If you enable hibernation, you must also select either **Public** or **Private** for **IP Address** in the **Advanced settings**, because hibernation for **Shared** IPs isn't currently supported.
    - **OS disk type**: You can select a disk type from the dropdown list. For this tutorial, keep the default value.
    - **Artifacts**: You can select **Add or Remove Artifacts** to select and configure artifacts to add to the VM. For more information, see [Add artifacts](devtest-lab-add-vm.md#add-optional-artifacts).
 

articles/event-hubs/compare-tiers.md

@@ -2,7 +2,7 @@
 title: Compare Azure Event Hubs tiers
 description: This article compares supported tiers of Azure Event Hubs.
 ms.topic: article
-ms.date: 02/15/2024
+ms.date: 04/29/2025
 ---
 
 # Compare Azure Event Hubs tiers

articles/event-hubs/event-hubs-quickstart-powershell.md

@@ -43,7 +43,7 @@ Run the following command to create an Event Hubs namespace in the resource grou
 
 ```azurepowershell-interactive
 $namespaceName="myNamespace$(Get-Random)"
-New-AzEventHubNamespace -ResourceGroupName $rgName -NamespaceName $namespaceName -Location $region
+New-AzEventHubNamespace -ResourceGroupName $rgName -Name $namespaceName -Location $region
 ```
 
 You see the output similar to the following one. You see the name of the namespace in the `Name` field.