Merge pull request #234615 from MicrosoftDocs/main

Publish to live, Sunday 4PM PST, 4/16

Author: Stacyrch140

articles/defender-for-cloud/integration-defender-for-endpoint.md

@@ -163,7 +163,7 @@ You'll deploy Defender for Endpoint to your Linux machines in one of these ways,
 - Enable for multiple subscriptions with a PowerShell script
 
 > [!NOTE]
-> When you enable automatic deployment, Defender for Endpoint for Linux installation will abort on machines with pre-existing security solutions using [fanotify](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint-linux#system-requirements).
+> When you enable automatic deployment, Defender for Endpoint for Linux installation will abort on machines with pre-existing running services using [fanotify](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint-linux#system-requirements) and other services that can also cause MDE to malfunction or may be affected by MDE, such as security services.
 > After you validate potential compatibility issues, we recommend that you manually install Defender for Endpoint on these servers.
 
 ##### Existing users with Defender for Cloud's enhanced security features enabled and Microsoft Defender for Endpoint for Windows

articles/sap/automation/plan-deployment.md

@@ -224,7 +224,7 @@ The following table shows the required permissions for the service principals:
 > | Azure CLI                           | Installing [Azure CLI](/cli/azure/install-azure-cli-linux)                                                | Setup of Deployer and during deployments | The firewall requirements for Azure CLI installation are defined here: [Installing Azure CLI](/cli/azure/azure-cli-endpoints) |
 > | PIP                                 | 'bootstrap.pypa.io'                                                                                       | Setup of Deployer                        | See [Installing Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) |
 > | Ansible                             | 'pypi.org', 'pythonhosted.org', 'galaxy.ansible.com'                                                      | Setup of Deployer                        |                                                                                                |
-> | PowerShell Gallery                  | 'onegetcdn.azureedge.net', 'psg-prod-centralus.azureedge.net', 'psg-prod-eastus.azureedge.net'            | Setup of Windows based systems           | See [PowerShell Gallery](/powershell/scripting/gallery/getting-started?#network-access-to-the-powershell-gallery) |
+> | PowerShell Gallery                  | 'onegetcdn.azureedge.net', 'psg-prod-centralus.azureedge.net', 'psg-prod-eastus.azureedge.net'            | Setup of Windows based systems           | See [PowerShell Gallery](/powershell/gallery/gallery/getting-started#network-access-to-the-powershell-gallery) |
 > | Windows components                  | 'download.visualstudio.microsoft.com', 'download.visualstudio.microsoft.com', 'download.visualstudio.com' | Setup of Windows based systems           | See [Visual Studio components](/visualstudio/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server#install-visual-studio) |
 > | SAP Downloads                       | 'softwaredownloads.sap.com'                                                                                    | SAP Software download                    | See [SAP Downloads](https://launchpad.support.sap.com/#/softwarecenter) |
 > | Azure DevOps Agent                  | 'https://vstsagentpackage.azureedge.net'                                                                       | Setup Azure DevOps                       |  |
@@ -302,34 +302,36 @@ The automation framework also supports having the deployment environment and SAP
 
 The deployment environment provides the following services:
 
-- A deployment VM, which does Terraform deployments and Ansible configuration.
+- One or more deployment virtual machines, which perform the infrastructure deployments using Terraform and performs the system configuration and SAP installation using Ansible playbooks.
 - A key vault, which contains service principal identity information for use by Terraform deployments.
 - An Azure Firewall component, which provides outbound internet connectivity.
 
 The deployment configuration file defines the region, environment name, and virtual network information. For example:
 
-```json
-{
-	"infrastructure": {
-		"environment": "MGMT",
-		"region": "westeurope",
-		"vnets": {
-			"management": {
-				"address_space": "0.0.0.0/25",
-				"subnet_mgmt": {
-					"prefix": "0.0.0.0/28"
-				},
-				"subnet_fw": {
-					"prefix": "0.0.0.0/26"
-				}
-			}
-		}
-	},
-	"options": {
-		"enable_deployer_public_ip": true
-	},
-	"firewall_deployment": true
-}
+```terraform
+# The environment value is a mandatory field, it is used for partitioning the environments, for example (PROD and NP)
+environment = "MGMT"
+
+# The location/region value is a mandatory field, it is used to control where the resources are deployed
+location = "westeurope"
+
+# management_network_address_space is the address space for management virtual network
+management_network_address_space = "10.10.20.0/25"
+
+# management_subnet_address_prefix is the address prefix for the management subnet
+management_subnet_address_prefix = "10.10.20.64/28"
+
+# management_firewall_subnet_address_prefix is the address prefix for the firewall subnet
+management_firewall_subnet_address_prefix = "10.10.20.0/26"
+
+# management_bastion_subnet_address_prefix is a mandatory parameter if bastion is deployed and if the subnets are not defined in the workload or if existing subnets are not used
+management_bastion_subnet_address_prefix = "10.10.20.128/26"
+
+deployer_enable_public_ip = false
+
+firewall_deployment = true
+
+bastion_deployment = true
 ```
 
 For more information, see the [in-depth explanation of how to configure the deployer](configure-control-plane.md).