Merge branch 'virtual-machines-extensions' of https://github.com/ShawnJackson/azure-docs-pr into virtual-machines-extensions

Author: ShawnJackson

articles/virtual-machines/extensions/agent-linux.md

@@ -1,6 +1,6 @@
 ---
-title: Azure Linux Agent overview 
-description: Learn how to install and configure the Azure Linux Agent (waagent) to manage your virtual machine's interaction with the Azure fabric controller.
+title: Azure Linux VM Agent overview 
+description: Learn how to install and configure the Azure Linux VM Agent (waagent) to manage your virtual machine's interaction with the Azure fabric controller.
 ms.topic: article
 ms.service: virtual-machines
 ms.subservice: extensions
@@ -11,11 +11,11 @@ ms.collection: linux
 ms.date: 03/28/2023
 
 ---
-# Azure Linux Agent overview
+# Azure Linux VM Agent overview
 
-The Microsoft Azure Linux Agent (waagent) manages Linux and FreeBSD provisioning, along with virtual machine (VM) interaction with the Azure fabric controller. In addition to the Linux agent providing provisioning functionality, Azure provides the option of using cloud-init for some Linux operating systems.
+The Microsoft Azure Linux VM Agent (waagent) manages Linux and FreeBSD provisioning, along with virtual machine (VM) interaction with the Azure fabric controller. In addition to the Linux agent providing provisioning functionality, Azure provides the option of using cloud-init for some Linux operating systems.
 
-The Linux agent provides the following functionality for Linux and FreeBSD Azure Virtual Machines deployments. For more information, see [Microsoft Azure Linux Agent](https://github.com/Azure/WALinuxAgent/blob/master/README.md).
+The Linux agent provides the following functionality for Linux and FreeBSD Azure Virtual Machines deployments. For more information, see the [Azure Linux VM Agent readme on GitHub](https://github.com/Azure/WALinuxAgent/blob/master/README.md).
 
 ### Image provisioning
 
@@ -24,7 +24,7 @@ The Linux agent provides the following functionality for Linux and FreeBSD Azure
 - Deploys SSH public keys and key pairs
 - Sets the host name
 - Publishes the host name to the platform DNS
-- Reports SSH host key fingerprints to the platform
+- Reports the SSH host key fingerprint to the platform
 - Manages the resource disk
 - Formats and mounts the resource disk
 - Configures swap space
@@ -63,7 +63,7 @@ Information flow from the platform to the agent occurs through two channels:
 
 ## Requirements
 
-Testing has confirmed that the following systems work with the Azure Linux Agent.
+Testing has confirmed that the following systems work with the Azure Linux VM Agent.
 
 > [!NOTE]
 > This list might differ from the [endorsed Linux distributions on Azure](../linux/endorsed-distros.md).
@@ -86,7 +86,7 @@ Testing has confirmed that the following systems work with the Azure Linux Agent
 
 Other supported systems:
 
-- FreeBSD 10+ (Azure Linux Agent v2.0.10+)
+- FreeBSD 10+ (Azure Linux VM Agent v2.0.10+)
 
 The Linux agent depends on these system packages to function properly:
 
@@ -103,9 +103,9 @@ Ensure that your VM has access to IP address 168.63.129.16. For more information
 
 ## Installation
 
-The preferred method of installing and upgrading the Azure Linux Agent uses an RPM or a DEB package from your distribution's package repository. All the [endorsed distribution providers](../linux/endorsed-distros.md) integrate the Azure Linux Agent package into their images and repositories.
+The preferred method of installing and upgrading the Azure Linux VM Agent uses an RPM or a DEB package from your distribution's package repository. All the [endorsed distribution providers](../linux/endorsed-distros.md) integrate the Azure Linux VM Agent package into their images and repositories.
 
-For advanced installation options, such as installing from a source or to custom locations or prefixes, see [Microsoft Azure Linux Agent](https://github.com/Azure/WALinuxAgent).
+For advanced installation options, such as installing from a source or to custom locations or prefixes, see [Microsoft Azure Linux VM Agent](https://github.com/Azure/WALinuxAgent).
 
 ## Command-line options
 
@@ -384,7 +384,7 @@ You can disable this option by editing */etc/waagent.conf*. Update `Logs.Collect
 
 ## Ubuntu Cloud Images
 
-Ubuntu Cloud Images use [cloud-init](https://launchpad.net/ubuntu/+source/cloud-init) to do many configuration tasks that the Azure Linux Agent would otherwise manage. The following differences apply:
+Ubuntu Cloud Images use [cloud-init](https://launchpad.net/ubuntu/+source/cloud-init) to do many configuration tasks that the Azure Linux VM Agent would otherwise manage. The following differences apply:
 
 - `Provisioning.Enabled` defaults to `n` on Ubuntu Cloud Images that use cloud-init to perform provisioning tasks.
 - The following configuration parameters have no effect on Ubuntu Cloud Images that use cloud-init to manage the resource disk and swap space:

articles/virtual-machines/extensions/agent-windows.md

@@ -1,6 +1,6 @@
 ---
-title: Azure Virtual Machine Agent overview 
-description: Learn how to install and detect the Azure Virtual Machine Agent to manage your virtual machine's interaction with the Azure fabric controller.
+title: Azure Windows VM Agent overview 
+description: Learn how to install and detect the Azure Windows VM Agent to manage your virtual machine's interaction with the Azure fabric controller.
 ms.topic: article
 ms.service: virtual-machines
 ms.subservice: extensions
@@ -10,15 +10,15 @@ ms.collection: windows
 ms.date: 02/27/2023 
 ---
 
-# Azure Virtual Machine Agent overview
+# Azure Azure Windows VM Agent overview
 
-The Microsoft Azure Virtual Machine Agent (VM Agent) is a secure, lightweight process that manages virtual machine (VM) interaction with the Azure fabric controller. The VM Agent has a primary role in enabling and executing Azure virtual machine extensions. VM extensions enable post-deployment configuration of VMs, such as installing and configuring software. VM extensions also enable recovery features such as resetting the administrative password of a VM. Without the Azure VM Agent, you can't run VM extensions.
+The Microsoft Azure Windows VM Agent is a secure, lightweight process that manages virtual machine (VM) interaction with the Azure fabric controller. The Azure Windows VM Agent has a primary role in enabling and executing Azure virtual machine extensions. VM extensions enable post-deployment configuration of VMs, such as installing and configuring software. VM extensions also enable recovery features such as resetting the administrative password of a VM. Without the Azure Windows VM Agent, you can't run VM extensions.
 
-This article describes how to install and detect the VM Agent.
+This article describes how to install and detect the Azure Windows VM Agent.
 
 ## Prerequisites
 
-The VM Agent supports the x64 architecture for these Windows operating systems:
+The Azure Windows VM Agent supports the x64 architecture for these Windows operating systems:
 
 - Windows 10
 - Windows 11
@@ -34,24 +34,24 @@ The VM Agent supports the x64 architecture for these Windows operating systems:
 - Windows Server 2022 Core
 
 > [!IMPORTANT]
-> - The Windows VM Agent needs at least Windows Server 2008 SP2 (64-bit) to run, with the .NET Framework 4.0. See [Minimum version support for virtual machine agents in Azure](https://support.microsoft.com/help/4049215/extensions-and-virtual-machine-agent-minimum-version-support).
+> - The Azure Windows VM Agent needs at least Windows Server 2008 SP2 (64-bit) to run, with the .NET Framework 4.0. See [Minimum version support for virtual machine agents in Azure](https://support.microsoft.com/help/4049215/extensions-and-virtual-machine-agent-minimum-version-support).
 >
 > - Ensure that your VM has access to IP address 168.63.129.16. For more information, see [What is IP address 168.63.129.16?](../../virtual-network/what-is-ip-address-168-63-129-16.md).
 >
-> - Ensure that DHCP is enabled inside the guest VM. This is required to get the host or fabric address from DHCP for the IaaS VM Agent and extensions to work. If you need a static private IP address, you should configure it through the Azure portal or PowerShell, and make sure the DHCP option inside the VM is enabled. [Learn more](../../virtual-network/ip-services/virtual-networks-static-private-ip-arm-ps.md) about setting up a static IP address by using PowerShell.
+> - Ensure that DHCP is enabled inside the guest VM. This is required to get the host or fabric address from DHCP for the Azure Windows VM Agent and extensions to work. If you need a static private IP address, you should configure it through the Azure portal or PowerShell, and make sure the DHCP option inside the VM is enabled. [Learn more](../../virtual-network/ip-services/virtual-networks-static-private-ip-arm-ps.md) about setting up a static IP address by using PowerShell.
 >
-> - Running the VM Agent in a nested virtualization VM might lead to unpredictable behavior, so it's not supported in that dev/test scenario.
+> - Running the Azure Windows VM Agent in a nested virtualization VM might lead to unpredictable behavior, so it's not supported in that dev/test scenario.
 
-## Install the VM Agent
+## Install the Azure Windows VM Agent
 
 ### Azure Marketplace image
 
-The Azure VM Agent is installed by default on any Windows VM deployed from an Azure Marketplace image. When you deploy an Azure Marketplace image from the Azure portal, PowerShell, the Azure CLI, or an Azure Resource Manager template, the Azure VM Agent is also installed.
+The Azure Windows VM Agent is installed by default on any Windows VM deployed from an Azure Marketplace image. When you deploy an Azure Marketplace image from the Azure portal, PowerShell, the Azure CLI, or an Azure Resource Manager template, the Azure Windows VM Agent is also installed.
 
-The Windows Guest Agent Package has two parts:
+The Azure Windows VM Agent package has two parts:
 
-- Provisioning Agent (PA)
-- Windows Guest Agent (WinGA)
+- Azure Windows Provisioning Agent (PA)
+- Azure Windows Guest Agent (WinGA)
 
 To boot a VM, you must have the PA installed on the VM. However, the WinGA does not need to be installed. At VM deploy time, you can select not to install the WinGA. The following example shows how to select the `provisionVmAgent` option with an Azure Resource Manager template:
 
@@ -81,23 +81,23 @@ If you don't have the agents installed, you can't use some Azure services, such
 
 ### Manual installation
 
-You can manually install the Windows VM Agent by using a Windows Installer package. Manual installation might be necessary when you create a custom VM image that's deployed to Azure. 
+You can manually install the Azure Windows VM Agent by using a Windows Installer package. Manual installation might be necessary when you create a custom VM image that's deployed to Azure. 
 
-To manually install the Windows VM Agent, [download the VM Agent installer](https://github.com/Azure/WindowsVMAgent) and select the latest release. You can also search a specific version in the [GitHub Windows IaaS VM Agent releases](https://github.com/Azure/WindowsVMAgent/releases). The VM Agent is supported on Windows Server 2008 (64 bit) and later.
+To manually install the Azure Windows VM Agent, [download the installer](https://github.com/Azure/WindowsVMAgent) and select the latest release. You can also search for a specific version in the [GitHub page for Azure Windows VM Agent releases](https://github.com/Azure/WindowsVMAgent/releases). The Azure Windows VM Agent is supported on Windows Server 2008 (64 bit) and later.
 
 > [!NOTE]
-> It's important to update the `AllowExtensionOperations` option after you manually install the VM Agent on a VM that was deployed from image without `ProvisionVMAgent` enabled.
+> It's important to update the `AllowExtensionOperations` option after you manually install the Azure Windows VM Agent on a VM that was deployed from image without `ProvisionVMAgent` enabled.
 
 ```powershell
 $vm.OSProfile.AllowExtensionOperations = $true
 $vm | Update-AzVM
 ```
 
-## Detect the VM Agent
+## Detect the Azure Windows VM Agent
 
 ### PowerShell
 
-You can use the Azure Resource Manager PowerShell module to get information about Azure VMs. To see information about a VM, such as the provisioning state for the Azure VM Agent, use [Get-AzVM](/powershell/module/az.compute/get-azvm):
+You can use the Azure Resource Manager PowerShell module to get information about Azure VMs. To see information about a VM, such as the provisioning state for the Azure Windows VM Agent, use [Get-AzVM](/powershell/module/az.compute/get-azvm):
 
 ```powershell
 Get-AzVM
@@ -114,7 +114,7 @@ OSProfile                  :
     EnableAutomaticUpdates : True
 ```
 
-Use the following script to return a concise list of VM names (running Windows OS) and the state of the VM Agent:
+Use the following script to return a concise list of VM names (running Windows OS) and the state of the Azure Windows VM Agent:
 
 ```powershell
 $vms = Get-AzVM
@@ -125,7 +125,7 @@ foreach ($vm in $vms) {
 }
 ```
 
-Use the following script to return a concise list of VM names (running Linux OS) and the state of the VM Agent:
+Use the following script to return a concise list of VM names (running Linux OS) and the state of the Azure Windows VM Agent:
 
 ```powershell
 $vms = Get-AzVM
@@ -138,21 +138,21 @@ foreach ($vm in $vms) {
 
 ### Manual detection
 
-When you're logged in to a Windows VM, you can use Task Manager to examine running processes. To check for the Azure VM Agent, open Task Manager, select the **Details** tab, and look for a process named *WindowsAzureGuestAgent.exe*. The presence of this process indicates that the VM agent is installed.
+When you're logged in to a Windows VM, you can use Task Manager to examine running processes. To check for the Azure Windows VM Agent, open Task Manager, select the **Details** tab, and look for a process named *WindowsAzureGuestAgent.exe*. The presence of this process indicates that the VM agent is installed.
 
-## Upgrade the VM Agent
+## Upgrade the Azure Windows VM Agent
 
-The Azure VM Agent for Windows is automatically upgraded on images deployed from Azure Marketplace. The new versions are stored in Azure Storage, so ensure that you don't have firewalls blocking access. As new VMs are deployed to Azure, they receive the latest VM agent at VM provision time. If you installed the agent manually or are deploying custom VM images, you need to manually update to include the new VM agent at image creation time.
+The Azure Windows VM Agent for Windows is automatically upgraded on images deployed from Azure Marketplace. The new versions are stored in Azure Storage, so ensure that you don't have firewalls blocking access. As new VMs are deployed to Azure, they receive the latest VM agent at VM provision time. If you installed the agent manually or are deploying custom VM images, you need to manually update to include the new VM agent at image creation time.
 
-## Windows Guest Agent automatic log collection
+## Azure Windows Guest Agent automatic log collection
 
-The Windows Guest Agent has a feature to automatically collect some logs. The *CollectGuestLogs.exe* process controls this feature. It exists for both platform as a service (PaaS) cloud services and infrastructure as a service (IaaS) VMs. Its goal is to quickly and automatically collect diagnostics logs from a VM, so they can be used for offline analysis.
+The Azure Windows Guest Agent has a feature to automatically collect some logs. The *CollectGuestLogs.exe* process controls this feature. It exists for both platform as a service (PaaS) cloud services and infrastructure as a service (IaaS) VMs. Its goal is to quickly and automatically collect diagnostics logs from a VM, so they can be used for offline analysis.
 
 The collected logs are event logs, OS logs, Azure logs, and some registry keys. The agent produces a ZIP file that's transferred to the VM's host. Engineering teams and support professionals can then use this ZIP file to investigate issues on the request of the customer who owns the VM.
 
-## Guest Agent and OSProfile certificates
+## Azure Windows Guest Agent and OSProfile certificates
 
-The Azure VM Agent installs the certificates referenced in the `OSProfile` value of a VM or a virtual machine scale set. If you manually remove these certificates from the Microsoft Management Console (MMC) Certificates snap-in inside the guest VM, the guest agent will add them back. To permanently remove a certificate, you have to remove it from `OSProfile`, and then remove it from within the guest operating system.
+The Azure Windows VM Agent installs the certificates referenced in the `OSProfile` value of a VM or a virtual machine scale set. If you manually remove these certificates from the Microsoft Management Console (MMC) Certificates snap-in inside the guest VM, the Azure Windows Guest Agent will add them back. To permanently remove a certificate, you have to remove it from `OSProfile`, and then remove it from within the guest operating system.
 
 For a virtual machine, use [Remove-AzVMSecret](/powershell/module/az.compute/remove-azvmsecret) to remove certificates from `OSProfile`.