Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-marketplace

Author: PatAltimore

articles/aks/manage-abort-operations.md

@@ -28,6 +28,31 @@ This command provides you with a percentage that indicates how close the operati
   "status": "InProgress"
 ```
 
+There is also a cli command equivalent for the above that shows the status of the most recent operation in the cluster. 
+```azurecli-interactive
+az aks operation show-latest --resource-group myResourceGroup --name myCluster
+```
+The following is an example output -
+```azurecli-interactive
+{
+  "endTime": null,
+  "error": null,
+  "id": "/subscriptions/3368aba5-673c-452f-96b8-71326a289646/resourcegroups/testkaar/providers/Microsoft.ContainerService/managedClusters/contoso/operations/94e04d66-5b57-4c2b-bf3e-e026f1067dd1",
+  "name": "94e04d66-5b57-4c2b-bf3e-e026f1067dd1",
+  "operations": null,
+  "percentComplete": 1.0,
+  "resourceGroup": "testkaar",
+  "resourceId": null,
+  "startTime": "2024-06-12T18:16:21+00:00",
+  "status": "InProgress"
+}
+```
+You can also run this command using the operation-id available from the above output.  The `Id` parameter denotes the operation-id to use example:
+
+```azurecli-interactive
+az aks operation show --resource-group myResourceGroup --name myCluster --operation-id "94e04d66-5b57-4c2b-bf3e-e026f1067dd1"
+```
+
 While it's important to allow operations to gracefully terminate when they're no longer needed, there are circumstances where you need to release control of node pools and clusters with long running operations using an *abort* command.
 
 AKS support for aborting long running operations is now generally available. This feature allows you to take back control and run another operation seamlessly. This design is supported using the [Azure REST API](/rest/api/azure/) or the [Azure CLI](/cli/azure/).

articles/aks/manage-azure-rbac.md

@@ -13,10 +13,11 @@ author: palma21
 
 # Use Azure role-based access control for Kubernetes Authorization
 
-When you leverage [integrated authentication between Microsoft Entra ID and AKS](managed-azure-ad.md), you can use Microsoft Entra users, groups, or service principals as subjects in [Kubernetes role-based access control (Kubernetes RBAC)][kubernetes-rbac]. This feature frees you from having to separately manage user identities and credentials for Kubernetes. However, you still have to set up and manage Azure RBAC and Kubernetes RBAC separately.
-
 This article covers how to use Azure RBAC for Kubernetes Authorization, which allows for the unified management and access control across Azure resources, AKS, and Kubernetes resources. For more information, see [Azure RBAC for Kubernetes Authorization][kubernetes-rbac].
 
+> [!NOTE]
+> When you leverage [integrated authentication between Microsoft Entra ID and AKS](managed-azure-ad.md), you can use Microsoft Entra users, groups, or service principals as subjects in [Kubernetes role-based access control (Kubernetes RBAC)][kubernetes-rbac]. This feature frees you from having to separately manage user identities and credentials for Kubernetes. However, you still have to set up and manage Azure RBAC and Kubernetes RBAC separately.
+
 ## Before you begin
 
 * You need the Azure CLI version 2.24.0 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].

articles/automation/automation-linux-hrw-install.md

@@ -229,15 +229,13 @@ sudo python /opt/microsoft/omsconfig/modules/nxOMSAutomationWorker/DSCResources/
 
 ## <a name="remove-linux-hybrid-runbook-worker"></a>Remove the Hybrid Runbook Worker
 
-Run the following commands as root on the agent-based Linux Hybrid Worker:
+1. Run the following commands as root on the agent-based Linux Hybrid Worker:
 
-1. ```bash
-      sudo bash
+   ```bash
+   sudo bash
+   rm -r /home/nxautomation
    ```
 
-1. ```bash
-      rm -r /home/nxautomation
-   ```
 1. Under **Process Automation**, select **Hybrid worker groups** and then your hybrid worker group to go to the **Hybrid Worker Group** page.
 1. Under **Hybrid worker group**, select **Hybrid Workers**.
 1. Select the checkbox next to the machine(s) you want to delete from the hybrid worker group.

articles/automation/migrate-existing-agent-based-hybrid-worker-to-extension-based-workers.md

@@ -914,15 +914,13 @@ New-AzConnectedMachineExtension -ResourceGroupName <VMResourceGroupName> -Locati
 
 #### [Linux Hybrid Worker](#tab/lin-hrw)
 
-Run the following commands on agent-based Linux Hybrid Worker:
+1. Run the following commands on agent-based Linux Hybrid Worker:
 
-1. ```bash
-      sudo bash
+   ```bash
+   sudo bash
+   rm -r /home/nxautomation
    ```
 
-1. ```bash
-      rm -r /home/nxautomation
-   ```
 1. Under **Process Automation**, select **Hybrid worker groups** and then your hybrid worker group to go to the **Hybrid Worker Group** page.
 1. Under **Hybrid worker group**, select **Hybrid Workers**.
 1. Select the checkbox next to the machine(s) you want to delete from the hybrid worker group.

articles/azure-vmware/includes/add-network-segment-steps.md

@@ -1,27 +1,27 @@
 ---
-title: Add an NSX-T network segment
-description: Steps to add an NSX-T network segment for Azure VMware Solution in NSX-T Manager.
+title: Add an NSX network segment
+description: Steps to add an NSX network segment for Azure VMware Solution in NSX Manager.
 ms.topic: include
 ms.service: azure-vmware
-ms.date: 01/03/2024
+ms.date: 6/12/2024
 author: suzizuber
 ms.author: v-szuber
 ms.custom: engagement-fy23
 ---
 
 <!-- Used in configure-dhcp-azure-vmware-solution.md and tutorial-nsx-t-network-segment.md -->
 
-1. In NSX-T Manager, select **Networking** > **Segments**, and then select **Add Segment**. 
+1. In NSX Manager, select **Networking** > **Segments**, and then select **Add Segment**. 
 
-   :::image type="content" source="../media/nsxt/nsxt-segments-overview.png" alt-text="Screenshot showing how to add a new segment in NSX-T Manager.":::
+   :::image type="content" source="../media/nsxt/nsxt-segments-overview.png" alt-text="Screenshot showing how to add a new segment in NSX Manager.":::
 
 1. Enter a name for the segment.
 
 1. Select the Tier-1 Gateway (TNTxx-T1) as the **Connected Gateway** and leave the **Type** as Flexible.
 
 1. Select the preconfigured overlay **Transport Zone** (TNTxx-OVERLAY-TZ) and then select **Set Subnets**. 
 
-   :::image type="content" source="../media/nsxt/nsxt-create-segment-specs.png" alt-text="Screenshot showing the Segments details for adding a new NSX-T network segment.":::
+   :::image type="content" source="../media/nsxt/nsxt-create-segment-specs.png" alt-text="Screenshot showing the Segments details for adding a new NSX network segment.":::
 
 1. Enter the gateway IP address and then select **Add**. 
 
@@ -33,5 +33,3 @@ ms.custom: engagement-fy23
 1. Select **Apply** and then **Save**.
 
 1. Select **No** to decline the option to continue configuring the segment. 
-
-

articles/azure-vmware/includes/create-nsxt-segment-azure-portal-steps.md

@@ -1,9 +1,9 @@
 ---
-title: Add an NSX-T Data Center network segment using Azure VMware Solution
-description: Steps to add an NSX-T Data Center network segment for Azure VMware Solution in the Azure portal.
+title: Add an NSX network segment using Azure VMware Solution
+description: Steps to add an NSX network segment for Azure VMware Solution in the Azure portal.
 ms.topic: include
 ms.service: azure-vmware
-ms.date: 1/03/2024
+ms.date: 6/12/2024
 author: suzizuber
 ms.author: v-szuber
 ms.custom: engagement-fy23
@@ -13,13 +13,13 @@ ms.custom: engagement-fy23
 
 
 >[!NOTE]
->If you plan to use DHCP, you'll need to [configure a DHCP server or DHCP relay](../configure-dhcp-azure-vmware-solution.md) before you can configure an NSX-T Data Center network segment. 
+>If you plan to use DHCP, you'll need to [configure a DHCP server or DHCP relay](../configure-dhcp-azure-vmware-solution.md) before you can configure an NSX network segment. 
 
 1. In your Azure VMware Solution private cloud, under **Workload Networking**, select **Segments** > **Add**. 
 
 2. Provide the details for the new logical segment and select **OK**.
 
-   :::image type="content" source="../media/networking/add-new-nsxt-segment.png" alt-text="Screenshot showing how to add a new NSX-T Data Center segment in the Azure portal.":::
+   :::image type="content" source="../media/networking/add-new-nsxt-segment.png" alt-text="Screenshot showing how to add a new NSX segment in the Azure portal.":::
 
    - **Segment name** - Name of the segment that is visible in vCenter Server.
 
@@ -30,8 +30,8 @@ ms.custom: engagement-fy23
    >[!NOTE]
    >The **Connected gateway** is selected by default and is read-only.  It shows Tier-1 Gateway and type of segment information. 
    >
-   >- **T1** - Name of the Tier-1 Gateway in NSX-T Manager. A private cloud comes with an NSX-T Tier-0 Gateway in Active/Active mode and a default NSX-T Tier-1 Gateway in Active/Standby mode.  Segments created through the Azure VMware Solution console only connect to the default Tier-1 Gateway, and the workloads of these segments get East-West and North-South connectivity. You can only create more Tier-1 Gateways through NSX-T Manager. Tier-1 Gateways created from the NSX-T Manager console are not visible in the Azure VMware Solution console. 
+   >- **T1** - Name of the Tier-1 Gateway in NSX Manager. A private cloud comes with an NSX Tier-0 Gateway in Active/Active mode and a default NSX Tier-1 Gateway in Active/Standby mode.  Segments created through the Azure VMware Solution console only connect to the default Tier-1 Gateway, and the workloads of these segments get East-West and North-South connectivity. You can only create more Tier-1 Gateways through NSX Manager. Tier-1 Gateways created from the NSX Manager console are not visible in the Azure VMware Solution console. 
    >
    >- **Type** - Overlay segment supported by Azure VMware Solution.
 
-The segment is now visible in Azure VMware Solution, NSX-T Manager, and vCenter Server.
+The segment is now visible in Azure VMware Solution, NSX Manager, and vCenter Server.

articles/azure-vmware/tutorial-configure-networking.md

@@ -4,7 +4,7 @@ description: Learn to create and configure the networking needed to deploy your
 ms.topic: tutorial
 ms.custom: engagement-fy23
 ms.service: azure-vmware
-ms.date: 12/19/2023
+ms.date: 6/12/2024
 ---
 
 # Tutorial: Configure networking for your VMware private cloud in Azure
@@ -22,65 +22,65 @@ In this tutorial, you learn how to:
 > * Connect your ExpressRoute circuit to the gateway
 
 >[!NOTE]
->Before you create a new virtual  network (vNet), evaluate if you already have an existing vNet in Azure and plan to use it to connect to Azure VMware Solution; or whether to create a new vNet entirely.  
->* To use an existing vNet in same Azure subscription as Azure VMware Solution, use the **[Azure vNet connect](#select-an-existing-vnet)** tab under **Connectivity**. 
->* To use an existing vNet in a different Azure subscription than Azure VMware Solution, use the guidance on **[Connect to the private cloud manually](#connect-to-the-private-cloud-manually)**. 
->* To create a new vNet in same Azure subscription as Azure VMware Solution, use the **[Azure vNet connect](#create-a-new-vnet)** tab or create one [manually](#create-a-vnet-manually).
+>Before you create a new virtual  network (VNet), evaluate if you already have an existing VNet in Azure and plan to use it to connect to Azure VMware Solution; or whether to create a new VNet entirely.  
+>* To use an existing VNet in same Azure subscription as Azure VMware Solution, use the **[Azure VNet connect](#select-an-existing-vnet)** tab under **Connectivity**. 
+>* To use an existing VNet in a different Azure subscription than Azure VMware Solution, use the guidance on **[Connect to the private cloud manually](#connect-to-the-private-cloud-manually)**. 
+>* To create a new VNet in same Azure subscription as Azure VMware Solution, use the **[Azure VNet connect](#create-a-new-vnet)** tab or create one [manually](#create-a-vnet-manually).
 
-## Connect with the Azure vNet connect feature
+## Connect with the Azure VNet connect feature
 
-You can use the **Azure vNet connect** feature to use an existing vNet or create a new vNet to connect to Azure VMware Solution. **Azure vNet connect** is a function to configure vNet connectivity, it doesn't record configuration state; browse the Azure portal to check what settings are already configured.
+You can use the **Azure VNet connect** feature to use an existing VNet or create a new VNet to connect to Azure VMware Solution. **Azure VNet connect** is a function to configure VNet connectivity, it doesn't record configuration state; browse the Azure portal to check what settings are already configured.
 
 >[!NOTE]
->Address space in the vNet cannot overlap with the Azure VMware Solution private cloud CIDR.
+>Address space in the VNet cannot overlap with the Azure VMware Solution private cloud CIDR.
 
 ### Prerequisites
 
-Before you select an existing vNet, there are specific requirements that must be met.
+Before you select an existing VNet, there are specific requirements that must be met.
 
-1. vNet must contain a gateway subnet.
+1. VNet must contain a gateway subnet.
 1. Be in the same region as Azure VMware Solution private cloud.
 1. Be in the same resource group as Azure VMware Solution private cloud.
-1. vNet must contain an address space that doesn't overlap with Azure VMware Solution.
+1. VNet must contain an address space that doesn't overlap with Azure VMware Solution.
 1. Validate solution design is within Azure VMware Solution limits (Microsoft technical documentation/azure/azure-resource-manager/management/azure-subscription-service-limits).
 
-### Select an existing vNet
+### Select an existing VNet
 
-When you select an existing vNet, the Azure Resource Manager (ARM) template that creates the vNet and other resources gets redeployed. The resources, in this case, are the public IP, gateway, gateway connection, and ExpressRoute authorization key. If everything is set up, the deployment doesn't change anything. However, if anything is missing, it gets created automatically. For example, if the GatewaySubnet is missing, then it gets added during the deployment.
+When you select an existing VNet, the Azure Resource Manager (ARM) template that creates the VNet and other resources gets redeployed. The resources, in this case, are the public IP, gateway, gateway connection, and ExpressRoute authorization key. If everything is set up, the deployment doesn't change anything. However, if anything is missing, it gets created automatically. For example, if the GatewaySubnet is missing, then it gets added during the deployment.
 
 1. In your Azure VMware Solution private cloud, under **Manage**, select **Connectivity**.
 
-2. Select the **Azure vNet connect** tab and then select the existing vNet.
+2. Select the **Azure VNet connect** tab and then select the existing VNet.
 
-   :::image type="content" source="media/networking/azure-vnet-connect-tab.png" alt-text="Screenshot showing the Azure vNet connect tab under Connectivity with an existing vNet selected.":::
+   :::image type="content" source="media/networking/azure-vnet-connect-tab.png" alt-text="Screenshot showing the Azure VNet connect tab under Connectivity with an existing VNet selected.":::
 
 3. Select **Save**.
 
-   At this point, the vNet validates if overlapping IP address spaces between Azure VMware Solution and vNet are detected. If detected, change the network address of either the private cloud or the vNet so they don't overlap. 
+   At this point, the VNet validates if overlapping IP address spaces between Azure VMware Solution and VNet are detected. If detected, change the network address of either the private cloud or the VNet so they don't overlap. 
 
 
-### Create a new vNet
+### Create a new VNet
 
-When you create a new vNet, the required components to connect to Azure VMware Solution are automatically created.
+When you create a new VNet, the required components to connect to Azure VMware Solution are automatically created.
 
 1. In your Azure VMware Solution private cloud, under **Manage**, select **Connectivity**.
 
-2. Select the **Azure vNet connect** tab and then select **Create new**.
+2. Select the **Azure VNet connect** tab and then select **Create new**.
 
-   :::image type="content" source="media/networking/azure-vnet-connect-tab-create-new.png" alt-text="Screenshot showing the Azure vNet connect tab under Connectivity.":::
+   :::image type="content" source="media/networking/azure-vnet-connect-tab-create-new.png" alt-text="Screenshot showing the Azure VNet connect tab under Connectivity.":::
 
-3. Provide or update the information for the new vNet and then select **OK**.
+3. Provide or update the information for the new VNet and then select **OK**.
 
-   At this point, the vNet validates if overlapping IP address spaces between Azure VMware Solution and vNet are detected. If detected, change the private cloud or vNet's network address so they don't overlap. 
+   At this point, the VNet validates if overlapping IP address spaces between Azure VMware Solution and VNet are detected. If detected, change the private cloud or VNet's network address so they don't overlap. 
 
    :::image type="content" source="media/networking/create-new-virtual-network.png" alt-text="Screenshot showing the Create virtual network window.":::
 
-The vNet with the provided address range and GatewaySubnet is created in your subscription and resource group.  
+The VNet with the provided address range and GatewaySubnet is created in your subscription and resource group.  
 
 
 ## Connect to the private cloud manually
 
-### Create a vNet manually
+### Create a VNet manually
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 
@@ -154,13 +154,13 @@ Now that you deployed a virtual network gateway, add a connection between it and
 In this tutorial, you learned how to:
 
 > [!div class="checklist"]
-> * Create a Virtual Network using the vNet Connect Feature
+> * Create a Virtual Network using the VNet Connect Feature
 > * Create a Virtual Network Manually
 > * Create a Virtual Network gateway
 > * Connect your ExpressRoute circuit to the gateway
 
 
-Continue to the next tutorial to learn how to create the NSX-T network segments used for VMs in vCenter Server.
+Continue to the next tutorial to learn how to create the NSX network segments used for VMs in vCenter Server.
 
 > [!div class="nextstepaction"]
-> [Create an NSX-T network segment](./tutorial-nsx-t-network-segment.md)
+> [Create an NSX network segment](./tutorial-nsx-t-network-segment.md)

articles/backup/backup-dpm-automation.md

@@ -319,12 +319,12 @@ Set-DPMPolicySchedule -ProtectionGroup $MPG -Schedule $onlineSch[3] -TimesOfDay
 Set-DPMProtectionGroup -ProtectionGroup $MPG
 ```
 
-In the example above, ```$onlineSch``` is an array with four elements that contains the existing online protection schedule for the Protection Group in the GFS scheme:
+In the example above, `$onlineSch` is an array with four elements that contains the existing online protection schedule for the Protection Group in the GFS scheme:
 
-1. ```$onlineSch[0]``` contains the daily schedule
-2. ```$onlineSch[1]``` contains the weekly schedule
-3. ```$onlineSch[2]``` contains the monthly schedule
-4. ```$onlineSch[3]``` contains the yearly schedule
+1. `$onlineSch[0]` contains the daily schedule
+2. `$onlineSch[1]` contains the weekly schedule
+3. `$onlineSch[2]` contains the monthly schedule
+4. `$onlineSch[3]` contains the yearly schedule
 
 So if you need to modify the weekly schedule, you need to refer to the ```$onlineSch[1]```.
 

articles/data-factory/tutorial-data-flow-delta-lake.md

@@ -104,7 +104,7 @@ You will generate two data flows in this tutorial. The first data flow is a simp
 
    :::image type="content" source="media/data-flow/data-flow-tutorial-2.png" alt-text="Derived column":::
 
-1. ```Update, insert, delete, and upsert``` policies are created in the alter Row transform. Add an alter row transformation after your derived column.
+1. `Update, insert, delete, and upsert` policies are created in the alter Row transform. Add an alter row transformation after your derived column.
 1. Your alter row policies should look like this.
 
    :::image type="content" source="media/data-flow/data-flow-tutorial-3.png" alt-text="Alter row":::