Merge pull request #286823 from RoseHJM/dtl-environments-includes

DTL - Updates to direct customers to ADE

Author: ttorble

articles/devtest-labs/connect-environment-lab-virtual-network.md

@@ -9,7 +9,9 @@ ms.custom: UpdateFrequency2
 ---
 
 # Connect an environment to your lab's virtual network in Azure DevTest Labs
-Azure DevTest Labs makes it easy to create VMs in a lab with [built-in networking](devtest-lab-configure-vnet.md). It has a great deal of flexibility with the ability to [create multi-VM environments](devtest-lab-test-env.md). This article shows you how to connect VMs in an environment to the lab virtual network. One scenario where you use this feature is setting up an N-tier app with a SQL Server data tier that is connected to the lab VNet allowing test VMs in the lab to access it.  
+Azure DevTest Labs makes it easy to create VMs in a lab with [built-in networking](devtest-lab-configure-vnet.md). It has a great deal of flexibility with the ability to [create multi-VM environments](devtest-lab-test-env.md). This article shows you how to connect VMs in an environment to the lab virtual network. One scenario where you use this feature is setting up an N-tier app with a SQL Server data tier that is connected to the lab VNet allowing test VMs in the lab to access it.
+
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
 
 ## Sample environment that uses lab VNet
 Here is a simple environment template that connects the lab's subnet. In this sample, the `DTLSubnetId` parameter represents the ID of the subnet in which the lab exists. It's assigned to: `$(LabSubnetId)`, which is automatically resolved by DevTest Labs to the ID of the lab's subnet. The **subnet** property of the **network interface** of the VM in this definition is set to `DTLSubnetId` so that it joins the same subnet. 

articles/devtest-labs/create-environment-service-fabric-cluster.md

@@ -14,6 +14,8 @@ This article provides information on how to create an environment with a self-co
 ## Overview
 DevTest Labs can create self-contained test environments as defined by Azure Resource Manager templates. These environments contain both IaaS resources, like virtual machines, and PaaS resources, like Service Fabric. DevTest Labs allows you to manage virtual machines in an environment by providing commands to control the virtual machines. These commands give you the ability to start or stop a virtual machine on a schedule. Similarly, DevTest Labs can also help you manage Service Fabric clusters in an environment. You can start or stop a Service Fabric cluster in an environment either manually or via a schedule.
 
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
+
 ## Create a Service Fabric cluster
 Service Fabric clusters are created using environments in DevTest Labs. Each environment is defined by an Azure Resource Manager template in a Git repository. The [public Git repository](https://github.com/Azure/azure-devtestlab/tree/master/Environments/) for DevTest Labs contains the Resource Manager template to create a Service Fabric cluster in the [ServiceFabric-Cluster](https://github.com/Azure/azure-devtestlab/tree/master/Environments/ServiceFabric-LabCluster) folder. 
 

articles/devtest-labs/deploy-nested-template-environments.md

@@ -14,6 +14,9 @@ A nested deployment runs secondary Azure Resource Manager (ARM) templates from w
 
 Decomposing a deployment into a set of targeted, purpose-specific templates provides testing, reuse, and readability benefits. For general information about nested templates, including code samples, see [Using linked and nested templates when deploying Azure resources](../azure-resource-manager/templates/linked-templates.md).
 
+
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
+
 ## Deploy nested templates with Visual Studio
 
 The Azure Resource Group project template in Visual Studio makes it easy to develop and debug ARM templates. When you add a nested template to the main *azuredeploy.json* template file, Visual Studio adds the following items to make the template more flexible:

articles/devtest-labs/devtest-lab-create-environment-from-arm.md

@@ -20,6 +20,8 @@ You can configure Azure DevTest Labs to use ARM templates from a public or priva
 
 :::image type="content" source="./media/devtest-lab-create-environment-from-arm/devtest-labs-create-environment-with-arm.png" alt-text="Diagram that shows how to create an environment with DevTest Labs by using an ARM template in a template repository." border="false" lightbox="./media/devtest-lab-create-environment-from-arm/devtest-labs-create-environment-with-arm.png":::
 
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
+
 ## Prerequisites
 
 - It's helpful to have experience configuring lab environments in DevTest Labs. If you're new to working with labs, start by reviewing the instructions in the [Configure public environment settings](#configure-public-environment-settings) section. You need to understand how to configure template repositories, enable or disable public environments, and select templates to create labs. 

articles/devtest-labs/devtest-lab-overview.md

@@ -1,6 +1,6 @@
 ---
 title: What is Azure DevTest Labs?
-description: Learn how DevTest Labs makes it easy to create, manage, and monitor Azure virtual machines and environments.
+description: Learn how DevTest Labs makes it easy to create, manage, and monitor Azure virtual machines.
 ms.topic: overview
 ms.author: rosemalcolm
 author: RoseHJM
@@ -10,28 +10,27 @@ ms.custom: UpdateFrequency2
 
 # What is Azure DevTest Labs?
 
-[Azure DevTest Labs](https://azure.microsoft.com/services/devtest-lab) is a service for easily creating, using, and managing infrastructure-as-a-service (IaaS) virtual machines (VMs) and platform-as-a-service (PaaS) environments in labs. Labs offer preconfigured bases and artifacts for creating VMs, and Azure Resource Manager (ARM) templates for creating environments like Azure Web Apps or SharePoint farms.
+[Azure DevTest Labs](https://azure.microsoft.com/services/devtest-lab) is a service for easily creating, using, and managing infrastructure-as-a-service (IaaS) virtual machines (VMs) in labs. Labs offer preconfigured bases and artifacts for creating VMs.
 
-Lab owners can create preconfigured VMs that have tools and software lab users need. Lab users can claim preconfigured VMs, or create and configure their own VMs and environments. Lab policies and other methods track and control lab usage and costs.
+Lab owners can create preconfigured VMs that have tools and software lab users need. Lab users can claim preconfigured VMs, or create and configure their own VMs. Lab policies and other methods track and control lab usage and costs.
 
 ### Common DevTest Labs scenarios
 
-Common [DevTest Labs scenarios](devtest-lab-guidance-get-started.md) include development VMs, test environments, and classroom or training labs. DevTest Labs promotes efficiency, consistency, and cost control by keeping all resource usage within the lab context.
+Common [DevTest Labs scenarios](devtest-lab-guidance-get-started.md) include VMs for development, testing, and classroom or training labs. DevTest Labs promotes efficiency, consistency, and cost control by keeping all resource usage within the lab context.
 
 ## Custom VM bases, artifacts, and templates
 
-DevTest Labs can use custom images, formulas, artifacts, and templates to create and manage labs, VMs, and environments. The [DevTest Labs public GitHub repository](https://github.com/Azure/azure-devtestlab) has many ready-to-use VM artifacts and ARM templates for creating labs, environments, or sandbox resource groups. Lab owners can also create [custom images](devtest-lab-create-custom-image-from-vm-using-portal.md), [formulas](devtest-lab-manage-formulas.md), and ARM templates to use for creating and managing labs, [VMs](devtest-lab-use-resource-manager-template.md#view-edit-and-save-arm-templates-for-vms), and [environments](devtest-lab-create-environment-from-arm.md).
+DevTest Labs can use custom images, formulas, artifacts, and templates to create and manage labs, and VMs. The [DevTest Labs public GitHub repository](https://github.com/Azure/azure-devtestlab) has many ready-to-use VM artifacts and ARM templates for creating labs, or sandbox resource groups. Lab owners can also create [custom images](devtest-lab-create-custom-image-from-vm-using-portal.md), [formulas](devtest-lab-manage-formulas.md), and ARM templates to use for creating and managing labs, [VMs](devtest-lab-use-resource-manager-template.md#view-edit-and-save-arm-templates-for-vms).
 
 Lab owners can store artifacts and ARM templates in private Git repositories, and connect the [artifact repositories](add-artifact-repository.md) and [template repositories](devtest-lab-use-resource-manager-template.md#add-template-repositories-to-labs) to their labs so lab users can access them directly from the Azure portal. Add the same repositories to multiple labs in your organization to promote consistency, reuse, and sharing.
 
 ## Development, test, and training scenarios
 
-DevTest Labs users can quickly and easily create [IaaS VMs](devtest-lab-add-vm.md) and [PaaS environments](devtest-lab-create-environment-from-arm.md) from preconfigured bases, artifacts, and templates. Developers, testers, and trainers can:
+DevTest Labs users can quickly and easily create [IaaS VMs](devtest-lab-add-vm.md) from preconfigured bases, artifacts, and templates. Developers, testers, and trainers can:
 
 - Create Windows and Linux training and demo environments, or sandbox resource groups for exploring Azure, by using reusable ARM templates and artifacts.
-- Test app versions and scale up load testing by creating multiple test agents and environments.
-- Create development or testing environments from [continuous integration and deployment (CI/CD)](devtest-lab-integrate-ci-cd.md) tools, integrated development environments (IDEs), or automated release pipelines. Integrate deployment pipelines with DevTest Labs to create environments on demand.
-- Use the [Azure CLI](devtest-lab-vmcli.md) command-line tool to manage VMs and environments.
+- Test app versions and scale up load testing by creating multiple test agents.
+- Use the [Azure CLI](devtest-lab-vmcli.md) command-line tool to manage VMs.
 
 ## Lab policies and procedures to control costs
 

articles/devtest-labs/environment-security-alerts.md

@@ -18,6 +18,9 @@ As a lab user, you can view Microsoft Defender for Cloud alerts for your labs. D
 [Learn more about security alerts in Microsoft Defender for Cloud](../security-center//security-center-alerts-overview.md).
 
 
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
+
+
 ## Prerequisites
 Currently, you can view security alerts only for platform as a service (PaaS) environments deployed into your lab. To test or use this feature, [deploy an environment into your lab](devtest-lab-create-environment-from-arm.md). 
 

articles/devtest-labs/includes/direct-azure-deployment-environments.md

@@ -0,0 +1,13 @@
+---
+author: RoseHJM
+ms.author: rosemalcolm
+ms.date: 09/24/2024
+ms.topic: include
+ms.service: devtest-labs
+ai-usage: ai-assisted
+---
+
+> [!NOTE]
+> Azure Deployment Environments (ADE) is highly recommended for creating environments. ADE empowers developers to rapidly deploy app infrastructure using project-based templates, ensuring consistent and secure environments for your development teams.
+> 
+> To learn more about Azure Deployment Environments, see [Azure Deployment Environments documentation](../../deployment-environments/index.yml).

articles/devtest-labs/index.yml

@@ -49,18 +49,6 @@ landingContent:
             url: devtest-lab-mandatory-artifacts.md 
           - text: Troubleshoot artifact failures
             url: devtest-lab-troubleshoot-artifact-failure.md
-  - title: Environments
-    linkLists:
-      - linkListType: how-to-guide
-        links:
-          - text: Configure & use public environments 
-            url: devtest-lab-configure-use-public-environments.md
-          - text: Create an environment
-            url: devtest-lab-create-environment-from-arm.md
-          - text: Use platform-as-a-service services
-            url: use-paas-services.md 
-          - text: Connect to lab's virtual network
-            url: connect-environment-lab-virtual-network.md  
   - title: Templates
     linkLists:
       - linkListType: concept

articles/devtest-labs/use-managed-identities-environments.md

@@ -10,15 +10,18 @@ ms.custom: UpdateFrequency2
 
 # Use Azure managed identities to deploy environments in a lab 
 
-As a lab owner, you can use a managed identity to deploy environments in a lab. This feature helps in scenarios where the environment contains or has references to Azure resources that are outside the environment’s resource group. These resources include key vaults, shared image galleries, and networks. Managed identities enable creation of sandbox environments that aren't limited to the resource group of that environment. 
+As a lab owner, you can use a managed identity to deploy environments in a lab. This feature helps in scenarios where the environment contains or has references to Azure resources that are outside the environment's resource group. These resources include key vaults, shared image galleries, and networks. Managed identities enable creation of sandbox environments that aren't limited to the resource group of that environment. 
 
-By default, when you create an environment, the lab creates a system-assigned identity while deploying the Azure Resource Manager template (ARM template). The system-assigned identity accesses Azure resources and services on a lab user’s behalf. DevTest Labs creates a system-assigned identity by default the first time it creates the lab environment. Learn more about [why a lab creates a system-assigned identity](configure-lab-identity.md#scenarios-for-using-labs-system-assigned-identity). 
+By default, when you create an environment, the lab creates a system-assigned identity while deploying the Azure Resource Manager template (ARM template). The system-assigned identity accesses Azure resources and services on a lab user's behalf. DevTest Labs creates a system-assigned identity by default the first time it creates the lab environment. Learn more about [why a lab creates a system-assigned identity](configure-lab-identity.md#scenarios-for-using-labs-system-assigned-identity). 
 
-As a lab owner, you can choose to grant the lab’s system-assigned identity permissions to access Azure resources outside the lab. You can also use your user-assigned identity for the scenario. The lab’s system-assigned identity is valid only for the life of the lab. The system-assigned identify is deleted when you delete the lab. When you have environments in multiple labs that need to use an identity, consider using a user-assigned identity.  
+As a lab owner, you can choose to grant the lab's system-assigned identity permissions to access Azure resources outside the lab. You can also use your user-assigned identity for the scenario. The lab's system-assigned identity is valid only for the life of the lab. The system-assigned identify is deleted when you delete the lab. When you have environments in multiple labs that need to use an identity, consider using a user-assigned identity.  
 
-> [!NOTE]
+> [!IMPORTANT]
 > Currently, a single user-assigned identity is supported per lab. 
 
+
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
+
 ## Prerequisites
 
 - [Create, list, delete, or assign a role to a user-assigned managed identity using the Azure portal](../active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal.md). 

articles/devtest-labs/use-paas-services.md

@@ -16,6 +16,8 @@ The following image shows a SharePoint farm created as an environment in a lab.
 
 ![Screenshot of a SharePoint environment in a lab.](media/use-paas-services/environments.png)
 
+[!INCLUDE [direct-azure-deployment-environments](includes/direct-azure-deployment-environments.md)]  
+
 ## PaaS scenarios
 
 DevTest Labs PaaS environments support the following scenarios: