Fix merge conflicts

Author: gitName

.openpublishing.redirection.json

@@ -39,7 +39,79 @@
       "source_path_from_root": "/learn-pr/azure/deploy-java-spring-boot-app-service-mysql/7-summary.yml",
       "redirect_url": "https://learn.microsoft.com/azure/app-service/tutorial-java-spring-cosmosdb",
       "redirect_document_id": false
+    },
+       {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/2-what-is-azure-monitor.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/3-how-azure-monitor-works.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/4-when-to-use-azure-monitor.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/5-knowledge-check.yml",
+       "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/2-what-is-azure-data-explorer.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/3-how-azure-data-explorer-works.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/4-when-to-use-azure-data-explorer.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/5-knowledge-check.yml",
+       "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
+      "redirect_document_id": false
+    },
+
+
     {
       "source_path_from_root": "/learn-pr/achievements/learn.azure.deploy-java-spring-boot-app-service-mysql.badge.yml",
       "redirect_url": "https://learn.microsoft.com/azure/app-service/tutorial-java-spring-cosmosdb",
@@ -51367,6 +51439,11 @@
       "redirect_url": "/training/paths/transform-your-business-with-microsoft-ai/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/paths/evolve-your-devops-practices/index.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/devops/get-started/?view=azure-devops",
+      "redirect_document_id": false
+    },
     {
       "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/index.md",
       "redirect_url": "/training/modules/purview-ediscovery-search/",

learn-pr/achievements.yml

@@ -15,6 +15,16 @@ achievements:
   title: Characterize an unfamiliar dataset with Azure Data Explorer
   summary: Learn how to characterize an unfamiliar dataset using Azure Data Explorer. 
   iconUrl: /training/achievements/azure-data-explore-web.svg
+- uid: learn.intro-to-azure-data-explorer.badge
+  type: badge
+  title: Introduction to Azure Data Explorer
+  summary: Learn to describe the ingestion, query, visualization, and data management features that Azure Data Explorer provides to help you make sense of the data flowing into your business.
+  iconUrl: /training/achievements/intro-to-azure-data-explorer.svg
+- uid: learn.azure.intro-to-azure-monitor.badge
+  type: badge
+  title: Introduction to Azure Monitor
+  summary: Learn how to use Azure Monitor to provide insights into your Azure resource performance and operations.
+  iconUrl: /training/achievements/intro-to-azure-monitor.svg
 - uid: learn.visualize-data-workbooks.badge
   type: badge
   title: Visualize data combined from multiple data sources by using Azure Monitor Workbooks
@@ -6115,6 +6125,11 @@ achievements:
   title: Investigate threats with Content search in Microsoft Purview
   summary: This module examines how to search for content in the Microsoft Purview portal using Content Search functionality, including how to view and export the search results, and configure search permissions filtering.
   iconUrl: /training/achievements/m365-content-compliance.svg
+- uid: learn.azdo.evolve-your-devops-practices.trophy
+  type: trophy
+  title: Get started with Azure DevOps
+  summary: DevOps is the union of people, process, and products to enable continuous delivery of value to your end users. Azure DevOps is a set of services that gives you the tools you need to do just that. With Azure DevOps, you can build, test, and deploy any application, either to the cloud or on premises. DevOps practices that enable transparency, cooperation, continuous delivery and continuous deployment become embedded in your software development lifecycle.
+  iconUrl: /training/achievements/azure-devops/evolve-your-devops-practices.svg
 - uid: learn.wwl.create-implement-application-allowlists-with-adaptive-application-control.badge
   type: badge
   title: Create and implement application allowlists with adaptive application control

learn-pr/azure-devops/choose-an-agile-approach/includes/1-introduction.md

@@ -11,7 +11,7 @@ After completing this module, you'll be able to:
 
 ## Prerequisites
 
-The modules in this learning path form a progression. We recommend you start at the beginning of the [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true) learning path before you work on this module.
+Before you start this module, go through [Introduction to Azure DevOps](/training/modules/get-started-with-devops?azure-portal=true) first to set up your Azure DevOps organization.
 
 ## Meet the team
 

learn-pr/azure-devops/create-a-build-pipeline/includes/1-introduction.md

@@ -1,4 +1,4 @@
-In the [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true) learning path, you helped the Tailspin team start their DevOps journey by evaluating their current processes and technologies, then planning their initial set of tasks on Azure Boards.
+The Tailspin Toys team has just started their DevOps journey. So far, they've evaluated their current processes and technologies and [planned their initial set of tasks on Azure Boards](/azure/devops/boards/get-started/plan-track-work).
 
 In this module, you'll help the team with their first task: setting up a continuous integration (CI) pipeline for their app.
 
@@ -39,15 +39,11 @@ After completing this module, you'll be able to:
 
 ## Configure your environment
 
-The modules in this learning path and previous learning path form a progression.
-
-To follow the progression from the beginning, be sure to first complete the [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true) learning path.
-
 ::: zone pivot="github-codespaces-agent"
 
 To complete this training module using a self-hosted agent with GitHub Codespaces, you must have:
 
-- An [Azure DevOps organization](/azure/devops/pipelines/get-started/pipelines-sign-up). If you don't already have an Azure DevOps organization, create a [free organization](/azure/devops/pipelines/get-started/pipelines-sign-up) before you begin. If you have completed the [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true) learning path prerequisite, use that Azure DevOps organization.
+- An [Azure DevOps organization](/azure/devops/pipelines/get-started/pipelines-sign-up). If you don't already have an Azure DevOps organization, create a [free organization](/azure/devops/pipelines/get-started/pipelines-sign-up) before you begin. 
 - A [GitHub](https://github.com/join?azure-portal=true) account
 
 ::: zone-end

learn-pr/azure-devops/create-a-build-pipeline/includes/5-set-up-environment.md

@@ -2,8 +2,6 @@ In this section, you'll ensure that your Microsoft Azure DevOps organization is
 
 The modules in this learning path form a progression, in which you follow the Tailspin web team through its DevOps journey.
 
-This learning path also builds on the [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true) learning path. There, you used the basic process to set up your Azure DevOps organization and created a task backlog on Azure Boards.
-
 ## Get the Azure DevOps project
 
 Here, you ensure that your Azure DevOps organization is set up to complete the rest of this module. You do this by running a template that creates a project for you in Azure DevOps.

learn-pr/azure-devops/create-multi-stage-pipeline/includes/1-introduction.md

@@ -16,10 +16,7 @@ After completing this module, you should able to:
 
 ## Prerequisites
 
-The modules in this learning path form a progression. To follow the progression from the beginning, be sure to first complete these learning paths:
-
-- [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true)
-- [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true)
+The modules in this learning path form a progression. To follow the progression from the beginning, be sure to first complete the [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true) learning path.
 
 We also recommend you start at the beginning of this learning path: [Deploy applications with Azure DevOps](../../../paths/deploy-applications-with-azure-devops/index.yml?azure-portal=true).
 

learn-pr/azure-devops/create-release-pipeline/includes/1-introduction.md

@@ -21,10 +21,7 @@ If you want to start with this learning path, set up a development environment o
 
 [!include[](../../shared/includes/prerequisites.md)]
 
-To follow the progression from the beginning, complete the following learning paths:
-
-- [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true)
-- [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true)
+To follow the progression from the beginning, be sure to first complete the [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true) learning path.
 
 You can get started with Azure and Azure DevOps for free. You don't need an Azure subscription to work with Azure DevOps, but here you'll use Azure DevOps to deploy to Azure resources in your Azure subscription.
 

learn-pr/azure-devops/deploy-azure-functions/includes/1-introduction.md

@@ -12,10 +12,7 @@ After completing this module, you'll be able to:
 
 ## Prerequisites
 
-The modules in this learning path form a progression:
-
-* [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true)
-* [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true)
+The modules in this learning path form a progression. To follow the progression from the beginning, be sure to first complete the [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true) learning path.
 
 This module also assumes you have basic familiarity with Azure Functions. That knowledge isn't required to complete the module. If you're new to Azure Functions, you can complete the [Create serverless applications](../../../paths/create-serverless-applications/index.yml?azure-portal=true) learning path first.
 

learn-pr/azure-devops/deploy-docker/includes/1-introduction.md

@@ -16,10 +16,7 @@ After completing this module, you'll be able to:
 
 ## Prerequisites
 
-The modules in this learning path form a progression. If you want to follow the progression from the beginning, complete the following learning paths:
-
-- [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true)
-- [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true)
+The modules in this learning path form a progression. To follow the progression from the beginning, be sure to first complete the [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true) learning path.
 
 This module assumes you have basic familiarity with Docker, although that knowledge isn't required to complete it. If you're new to the topic, it's recommended that you complete the [Introduction to Docker containers](/training/modules/intro-to-docker-containers/?azure-portal=true) module first.
 

learn-pr/azure-devops/deploy-kubernetes/includes/1-introduction.md

@@ -21,7 +21,7 @@ After completing this module, you'll be able to:
 
 ## Prerequisites
 
-The modules in this learning path form a progression. To follow the progression of this series from the beginning, complete the [Get started with Azure DevOps](../../../paths/evolve-your-devops-practices/index.yml?azure-portal=true) and [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true) learning paths.
+The modules in this learning path form a progression. To follow the progression of this series from the beginning, complete the [Build applications with Azure DevOps](../../../paths/build-applications-with-azure-devops/index.yml?azure-portal=true) learning path.
 
 To begin this learning path from the start, follow the link here: [Deploy applications with Azure DevOps](../../../paths/deploy-applications-with-azure-devops/index.yml?azure-portal=true). This module picks up where [Automate Docker container deployments with Azure Pipelines](/training/modules/deploy-docker?azure-portal=true) leaves off.