Merge pull request #113705 from rayne-wiselman/raynemay4

making PM changes

Author: shawnmariejones

articles/migrate/common-questions-discovery-assessment.md

@@ -104,6 +104,11 @@ Data | Source machine server name, process, application name.<br/><br/> Destinat
 Visualization | Dependency map of single server can be viewed over a duration of one hour to 30 days. | Dependency map of a single server.<br/><br/> Map can be viewed over an hour only.<br/><br/> Dependency map of a group of servers.<br/><br/> Add and remove servers in a group from the map view.
 Data export | Can't currently be downloaded in tabular format. | Data can be queried with Log Analytics.
 
+
+## Do I need to deploy the appliance for agentless dependency analysis?
+
+Yes, the [Azure Migrate appliance](migrate-appliance.md) must be deployed.
+
 ## Do I pay for dependency visualization?
 
 No. Learn more about [Azure Migrate pricing](https://azure.microsoft.com/pricing/details/azure-migrate/).

articles/migrate/common-questions-server-migration.md

@@ -1,8 +1,8 @@
 ---
-title: Azure Migrate Server Migration FAQ
+title: Common questions about Azure Migrate Server Migration
 description: Get answers to common questions about using Azure Migrate Server Migration to migrate machines.
 ms.topic: conceptual
-ms.date: 02/17/2020
+ms.date: 05/04/2020
 ---
 
 # Azure Migrate Server Migration: Common questions
@@ -82,6 +82,10 @@ The AppNamePrefix to use in the NetQosPolicy is "GatewayWindowsService.exe". You
 
 New-NetQosPolicy -Name "ThrottleReplication" -AppPathNameMatchCondition "GatewayWindowsService.exe" -ThrottleRateActionBitsPerSecond 1MB
 
+## Can I migrate VMs that are already being replicated to Azure? 
+
+If VMs are already being replicated to Azure by some other means, you can't migrate those machines as VMs with Azure Migrate Server Migration. As a workaround, you can treat the VMs as physical servers, and migrate them in accordance with [supported physical server migration](migrate-support-matrix-physical-migration.md).
+
 ## When do I migrate machines as physical servers?
 
 Migrating machines by treating them as physical servers is useful in a number of scenarios:

articles/migrate/how-to-discover-applications.md

@@ -25,18 +25,48 @@ App discovery using Azure Migrate: Server Assessment is agentless. Nothing is in
 5. Check the [requirements](migrate-appliance.md) for deploying the Azure Migrate appliance.
 6. [Verify support and requirements](migrate-support-matrix-vmware.md#application-discovery) for application discovery.
 
-## Prepare for app discovery
 
-1. [Prepare for appliance deployment](tutorial-prepare-vmware.md). Preparation includes verifying appliance settings, and setting up an account that the appliance will use to access vCenter Server.
-2. Make sure you have a user account (one each for Windows and Linux servers) with administrator permissions for machines on which you want to discover apps, roles, and features.
-3. [Deploy the Azure Migrate appliance](how-to-set-up-appliance-vmware.md) to start discovery. To deploy the appliance, you download and import an OVA template into VMware to create the appliance as a VMware VM. You configure the appliance and then register it with Azure Migrate.
-2. As you deploy the appliance, to start continuous discovery you specify the following:
+
+## Deploy the Azure Migrate appliance
+
+1. [Review](migrate-appliance.md#appliance---vmware) the requirements for deploying the Azure Migrate appliance.
+2. Review the Azure URLs that the appliance will need to access in the [public](migrate-appliance.md#public-cloud-urls) and [government clouds](migrate-appliance.md#government-cloud-urls).
+3. [Review data](migrate-appliance.md#collected-data---vmware) that the appliance collects during discovery and assessment.
+4. [Note](migrate-support-matrix-vmware.md#port-access) port access requirements for the appliance.
+5. [Deploy the Azure Migrate appliance](how-to-set-up-appliance-vmware.md) to start discovery. To deploy the appliance, you download and import an OVA template into VMware to create the appliance as a VMware VM. You configure the appliance and then register it with Azure Migrate.
+6. As you deploy the appliance, to start continuous discovery you specify the following:
     - The name of the vCenter Server to which you want to connect.
     - Credentials that you created for the appliance to connect to vCenter Server.
     - The account credentials you created for the appliance to connect to Windows/Linux VMs.
 
 After the appliance is deployed and you've provided credentials, the appliance starts continuous discovery of VM metadata and performance data, along with and discovery of apps, features, and roles.  The duration of app discovery depends on how many VMs you have. It typically takes an hour for app-discovery of 500 VMs.
 
+## Prepare a user account
+
+Create an account to use for discovery, and add it to the appliance.
+
+### Create a user account for discovery
+
+Set up a user account so that Server Assessment can access the VM for discovery. [Learn](migrate-support-matrix-vmware.md#application-discovery) about account requirements.
+
+
+### Add the user account to the appliance
+
+Add the user account to the appliance.
+
+1. Open the appliance management app. 
+2. Navigate to the **Provide vCenter details** panel.
+3. In **Discover application and dependencies on VMs**, click **Add credentials**
+3. Choose the **Operating system**, provide a friendly name for the account, and the **User name**/**Password**
+6. Click **Save**.
+7. Click **Save and start discovery**.
+
+    ![Add VM user account](./media/how-to-create-group-machine-dependencies-agentless/add-vm-credential.png)
+
+
+
+
+
 ## Review and export the inventory
 
 After discovery ends, if you provided credentials for app discovery, you can review and export the app inventory in the Azure portal.

articles/migrate/migrate-appliance.md

@@ -2,7 +2,7 @@
 title: Azure Migrate appliance 
 description: Provides an overview of the Azure Migrate appliance used in server assessment and migration.
 ms.topic: conceptual
-ms.date: 04/23/2020
+ms.date: 05/04/2020
 ---
 
 
@@ -38,6 +38,7 @@ The following table summarizes the Azure Migrate appliance requirements for VMwa
 
 **Requirement** | **VMware** 
 --- | ---
+**Permissions** | To access the appliance web app locally or remotely, you need to be a domain admin, or local admin on the appliance machine.
 **Appliance components** | The appliance has the following components:<br/><br/> - **Management app**: This is a web app for user input during appliance deployment. Used when assessing machines for migration to Azure.<br/> - **Discovery agent**: The agent gathers machine configuration data. Used when assessing machines for migration to Azure.<br/>- **Assessment agent**: The agent collects performance data. Used when assessing machines for migration to Azure.<br/>- **Auto update service**: Updates appliance components (runs every 24 hours).<br/>- **DRA agent**: Orchestrates VM replication, and coordinates communication between replicated machines and Azure. Used only when replicating VMware VMs to Azure using agentless migration.<br/>- **Gateway**: Sends replicated data to Azure. Used only when replicating VMware VMs to Azure using agentless migration.
 **Supported deployment** | Deploy as VMware VM using OVA template.<br/><br/> Deploy as a VMware VM or physical machine using PowerShell installation script.
 **Project support** |  An appliance can be associated with a single project. <br/> Any number of appliances can be associated with a single project.<br/> 
@@ -57,6 +58,7 @@ The following table summarizes the Azure Migrate appliance requirements for VMwa
 
 **Requirement** | **Hyper-V** 
 --- | ---
+**Permissions** | To access the appliance web app locally or remotely, you need to be a domain admin, or local admin on the appliance machine.
 **Appliance components** | The appliance has the following components:<br/><br/>- **Management app**: This is a web app for user input during appliance deployment. Used when assessing machines for migration to Azure.<br/> - **Discovery agent**: The agent gathers machine configuration data. Used when assessing machines for migration to Azure.<br/>- **Assessment agent**: The agent collects performance data. Used when assessing machines for migration to Azure.<br/>- **Auto update service**: Updates appliance components (runs every 24 hours).
 **Supported deployment** | Deploy as Hyper-V VM using a VHD template.<br/><br/> Deploy as a Hyper-V VM or physical machine using a PowerShell installation script.
 **Project support** |  An appliance can be associated with a single project. <br/> Any number of appliances can be associated with a single project.<br/> 
@@ -73,20 +75,22 @@ The following table summarizes the Azure Migrate appliance requirements for VMwa
 
 **Requirement** | **Physical** 
 --- | ---
+**Permissions** | To access the appliance web app locally or remotely, you need to be a domain admin, or local admin on the appliance machine.
 **Appliance components** | The appliance has the following components: <br/><br/> - **Management app**: This is a web app for user input during appliance deployment. Used when assessing machines for migration to Azure.<br/> - **Discovery agent**: The agent gathers machine configuration data. Used when assessing machines for migration to Azure.<br/>- **Assessment agent**: The agent collects performance data. Used when assessing machines for migration to Azure.<br/>- **Auto update service**: Updates appliance components (runs every 24 hours).
 **Supported deployment** | Deploy as a dedicated physical machine, or a VM, using a PowerShell installation script. The script is available for download from the portal.
 **Project support** |  An appliance can be associated with a single project. <br/> Any number of appliances can be associated with a single project.<br/> 
 **Discovery limits** | An appliance can discover up to 250 physical servers.
 **PowerShell script** | Download the script (AzureMigrateInstaller.ps1) in a zipped folder from the portal. [Learn more](tutorial-assess-physical.md#set-up-the-appliance). Alternatively, [download directly](https://go.microsoft.com/fwlink/?linkid=2105112).<br/><br/> Download size is 59.7 MB.
-**Software/hardware** |  The appliance should run on machine with Windows Server 2016, 32-GB RAM, 8 vCPUs, around 80 GB of disk storage, and an external virtual switch.<br/> The appliance needs a static or dynamic IP address, and requires internet access, either directly or through a proxy.<br/><br/> If you run the appliance on a physical machine, make sure that it's running Windows Server 2016, and meets hardware requirements. 
+**Software/hardware** |  The appliance should run on machine with Windows Server 2016, 32-GB RAM, 8 vCPUs, around 80 GB of disk storage, and an external virtual switch.<br/> The appliance needs a static or dynamic IP address, and requires internet access, either directly or through a proxy.<br/><br/> If you run the appliance on a physical machine, make sure that it's running Windows Server 2016, and meets hardware requirements.<br/> Running the appliance on a machine with Windows Server 2019 isn't supported.
 **Hash value** | [Verify](deploy-appliance-script.md#verify-file-security) the PowerShell script hash values.
 
 ## URL access
 
 The Azure Migrate appliance needs connectivity to the internet.
 
 - When you deploy the appliance, Azure Migrate does a connectivity check to the required URLs.
-- If you're using a URL-based proxy to connect to the internet, you need to allow access to these URLs, making sure that the proxy resolves any CNAME records received while looking up the URLs.
+- You need to allow access to all URLs in the list. If you're doing assessment only, you can skip the URLs that are marked as required for VMware agentless migration only.
+-  If you're using a URL-based proxy to connect to the internet, make sure that the proxy resolves any CNAME records received while looking up the URLs.
 
 ### Public cloud URLs
 
@@ -96,7 +100,7 @@ The Azure Migrate appliance needs connectivity to the internet.
 *.windows.net <br/> *.msftauth.net <br/> *.msauth.net <br/> *.microsoft.com <br/> *.live.com | Sign in to your Azure subscription.
 *.microsoftonline.com <br/> *.microsoftonline-p.com | Create Azure Active Directory (AD) apps for the appliance to communicate with Azure Migrate.
 management.azure.com | Create Azure AD apps for the appliance to communicate with the Azure Migrate service.
-dc.services.visualstudio.com | Upload app logs used for internal monitoring.
+*.services.visualstudio.com | Upload app logs used for internal monitoring.
 *.vault.azure.net | Manage secrets in the Azure Key Vault.
 aka.ms/* | Allow access to aka links. Used for Azure Migrate appliance updates.
 download.microsoft.com/download | Allow downloads from Microsoft download.
@@ -253,7 +257,7 @@ Metadata discovered by the Azure Migrate appliance helps you to figure out wheth
 
 Here's the full list of Hyper-V VM metadata that the appliance collects and sends to Azure.
 
-**DATA* | **WMI CLASS** | **WMI CLASS PROPERTY**
+**DATA** | **WMI CLASS** | **WMI CLASS PROPERTY**
 --- | --- | ---
 **Machine details** | 
 Serial number of BIOS _ Msvm_BIOSElement | BIOSSerialNumber
@@ -295,6 +299,84 @@ Hyper-V Virtual Network Adapter | Bytes Sent/Second | Calculation for VM size
 - Memory utilization is (Current Pressure * Guest Visible Physical Memory) / 100.
 - Disk and network utilization values are collected from the listed Hyper-V performance counters.
 
+
+## Collected data - Physical
+
+The appliance collects metadata, performance data, and dependency analysis data (if agentless [dependency analysis](concepts-dependency-visualization.md) is used).
+
+### Windows metadata
+
+Metadata discovered by the Azure Migrate appliance helps you to figure out whether machines and apps are ready for migration to Azure, right-size machines and apps, plans costs, and analyze application dependencies. Microsoft doesn't use this data in any license compliance audit.
+
+Here's the full list of Windows server metadata that the appliance collects and sends to Azure.
+
+**DATA** | **WMI CLASS** | **WMI CLASS PROPERTY**
+--- | --- | ---
+FQDN | Win32_ComputerSystem | Domain, Name, PartOfDomain
+Processor core count | Win32_PRocessor | NumberOfCores
+Memory allocated | Win32_ComputerSystem | TotalPhysicalMemory
+BIOS serial number | Win32_ComputerSystemProduct | IdentifyingNumber
+BIOS GUID | Win32_ComputerSystemProduct | UUID
+Boot type | Win32_DiskPartition | Check for partition with Type = **GPT:System** for EFI/BIOS
+OS name | Win32_OperatingSystem | Caption
+OS version |Win32_OperatingSystem | Version
+OS architecture | Win32_OperatingSystem | OSArchitecture
+Disk count | Win32_DiskDrive | Model, Size, DeviceID, MediaType, Name
+Disk size | Win32_DiskDrive | Size
+NIC list | Win32_NetworkAdapterConfiguration | Description, Index
+NIC IP address | Win32_NetworkAdapterConfiguration | IPAddress
+NIC MAC address | Win32_NetworkAdapterConfiguration | MACAddress
+
+### Linux metadata
+
+Here's the full list of Linux server metadata that the appliance collects and sends to Azure.
+
+
+**DATA** | **LINUX** 
+--- | --- 
+FQDN | ```cat /proc/sys/kernel/hostname , hostname -f```
+Processor core count | ```cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l```
+Memory allocated | ```cat /proc/meminfo | grep MemTotal | awk '{printf "%.0f", $2/1024}' ```
+BIOS serial number | ```lshw | grep "serial:" | head -n1 | awk '{print $2}' ```<br/> ```/usr/sbin/dmidecode -t 1 | grep 'Serial' | awk '{ $1="" ; $2=""; print}’```
+BIOS GUID | ```cat /sys/class/dmi/id/product_uuid```
+Boot type | ```[ -d /sys/firmware/efi ] && echo EFI || echo BIOS```
+OS name/version | We access these files for the OS version and name:<br/><br/> /etc/os-release<br/> /usr/lib/os-release <br/> /etc/enterprise-release <br/> /etc/redhat-release<br/> /etc/oracle-release<br/>  /etc/SuSE-release<br/>  /etc/lsb-release  <br/> /etc/debian_version
+OS architecture | ```Uname -m```
+Disk count | ```fdisk -l | egrep 'Disk.*bytes' | awk '{print $2}' | cut -f1 -d ':'``` 
+Boot disk | ```df /boot | sed -n 2p | awk '{print $1}'```
+Disk size | ```fdisk -l | egrep 'Disk.*bytes' | egrep $disk: | awk '{print $5}'```
+NIC list | ```ip -o -4 addr show | awk '{print $2}'``` 
+NIC IP address | ```ip addr show $nic | grep inet | awk '{print $2}' | cut -f1 -d "/"``` 
+NIC MAC address | ```ip addr show $nic | grep ether  | awk '{print $2}'``` 
+### Windows performance data
+
+Here's the Windows server performance data that the appliance collects and sends to Azure.
+
+**Data** | **WMI class** | **WMI class property**
+--- | --- | ---
+CPU usage | Win32_PerfFormattedData_PerfOS_Processor | PercentIdleTime
+Memory usage | Win32_PerfFormattedData_PerfOS_Memory | AvailableMBytes
+NIC count | Win32_PerfFormattedData_Tcpip_NetworkInterface | Get the network device count.
+Data received per NIC | Win32_PerfFormattedData_Tcpip_NetworkInterface  | BytesReceivedPerSec
+Data transmitted per NIC | BWin32_PerfFormattedData_Tcpip_NetworkInterface | BytesSentPersec
+Disk count | BWin32_PerfFormattedData_PerfDisk_PhysicalDisk | Count of disks
+Disk details | Win32_PerfFormattedData_PerfDisk_PhysicalDisk | DiskWritesPerSec, DiskWriteBytesPerSec, DiskReadsPerSec, DiskReadBytesPerSec.
+
+### Windows performance data
+
+Here's the Linux server performance data that the appliance collects and sends to Azure.
+
+**Data** | **Linux** 
+--- | --- 
+CPU usage | ```cat /proc/stat|grep 'cpu ' /proc/stat```
+Memory usage | ```free | grep Mem | awk '{print $3/$2 * 100.0}'```
+NIC count | ```lshw -class network | grep eth[0-60] | wc -l```
+Data received per NIC | ```cat /sys/class/net/eth$nic/statistics/rx_bytes```
+Data transmitted per NIC | ```cat /sys/class/net/eth$nic/statistics/tx_bytes```
+Disk count | ```fdisk -l | egrep 'Disk.*bytes' | awk '{print $2}' | cut -f1 -d ':'```
+Disk details | ```cat /proc/diskstats```
+
+
 ## Appliance upgrades
 
 The appliance is upgraded as the Azure Migrate agents running on the appliance are updated. This happens automatically, because auto-update is enabled on the appliance by default. You can change this default setting, to update the appliance services manually.

articles/migrate/migrate-support-matrix-hyper-v.md

@@ -49,7 +49,7 @@ Azure Migrate uses the [Azure Migrate appliance](migrate-appliance.md) for disco
 
 - Learn about [appliance requirements](migrate-appliance.md#appliance---hyper-v) for Hyper-V.
 - Learn about URLs that the appliance needs to access in [public](migrate-appliance.md#public-cloud-urls) and [government](migrate-appliance.md#government-cloud-urls) clouds.
-- In Azure Government, you must deploy the appliance using the script.
+- In Azure Government, you must deploy the appliance [using the script](deploy-appliance-script-government.md).
 
 ## Port access