Fix merge conflicts

Author: gitName

.openpublishing.redirection.json

@@ -40,6 +40,78 @@
       "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",

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

learn-pr/azure/azure-command-line-tools-intro/into-to-azure-cli.yml

@@ -1,17 +1,17 @@
-### YamlMime:ModuleUnit
-uid: learn.azure-command-line-tools-intro.intro-to-azure-cli
+### YamlMime:ModuleUnit
+uid: learn.azure-command-line-tools-intro.intro-to-azure-cli
 metadata:
-  title: Introduction to the Azure CLI
-  description: Overview of using the Azure CLI to manage and provision Azure resources
-  ms.published: 02/27/2023
-  ms.date: 04/03/2024
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.custom:
-    - devx-track-azurecli
-title: Introduction to the Azure CLI
-durationInMinutes: 3
-content: |
-  [!include[](includes/intro-to-azure-cli.md)]
-
+  title: Introduction to the Azure CLI
+  description: Overview of using the Azure CLI to manage and provision Azure resources
+  ms.published: 02/27/2023
+  ms.date: 04/03/2024
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.custom:
+    - devx-track-azurecli
+title: Introduction to the Azure CLI
+durationInMinutes: 3
+content: |
+  [!include[](includes/intro-to-azure-cli.md)]
+

learn-pr/azure/control-azure-services-with-cli/1-introduction.yml

@@ -1,16 +1,16 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.1-introduction
-title: Introduction
-metadata:
-  title: Introduction
-  description: Introduction
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.custom:
-    - devx-track-azurecli
-durationInMinutes: 3
-content: |
-  [!include[](includes/1-introduction.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.1-introduction
+title: Introduction
+metadata:
+  title: Introduction
+  description: Introduction
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.custom:
+    - devx-track-azurecli
+durationInMinutes: 3
+content: |
+  [!include[](includes/1-introduction.md)]
+

learn-pr/azure/control-azure-services-with-cli/2-decide-if-azure-clil-is-right-for-your-tasks.yml

@@ -1,16 +1,16 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.2-decide-if-azure-cli-is-right-for-your-tasks
-title: Decide if Azure CLI is the appropriate tool for your tasks
-metadata:
-  title: Decide if Azure CLI is the appropriate tool for your tasks
-  description: Decide if Azure CLI is the appropriate tool for your tasks
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.custom:
-    - devx-track-azurecli
-durationInMinutes: 5
-content: |
-  [!include[](includes/2-decide-if-azure-CLI-is-right-for-your-tasks.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.2-decide-if-azure-cli-is-right-for-your-tasks
+title: Decide if Azure CLI is the appropriate tool for your tasks
+metadata:
+  title: Decide if Azure CLI is the appropriate tool for your tasks
+  description: Decide if Azure CLI is the appropriate tool for your tasks
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.custom:
+    - devx-track-azurecli
+durationInMinutes: 5
+content: |
+  [!include[](includes/2-decide-if-azure-CLI-is-right-for-your-tasks.md)]
+

learn-pr/azure/control-azure-services-with-cli/3-install-azure-cli.yml

@@ -1,17 +1,17 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.3-install-azure-cli
-title: Install Azure CLI
-metadata:
-  title: Install Azure CLI
-  description: Install Azure CLI
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.custom:
-    - devx-track-azurecli
-  zone_pivot_groups: platform
-durationInMinutes: 10
-content: |
-  [!include[](includes/3-install-azure-cli.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.3-install-azure-cli
+title: Install Azure CLI
+metadata:
+  title: Install Azure CLI
+  description: Install Azure CLI
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.custom:
+    - devx-track-azurecli
+  zone_pivot_groups: platform
+durationInMinutes: 10
+content: |
+  [!include[](includes/3-install-azure-cli.md)]
+

learn-pr/azure/control-azure-services-with-cli/4-exercise-install-azure-cli.yml

@@ -1,17 +1,17 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.4-exercise-install-azure-cli
-title: Exercise - Install the Azure CLI
-metadata:
-  title: Work with the Azure CLI
-  description: Learn the command structure and syntax to work with the Azure CLI
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.custom:
-    - devx-track-azurecli
-  zone_pivot_groups: platform
-durationInMinutes: 10
-content: |
-  [!include[](includes/4-exercise-install-azure-cli.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.4-exercise-install-azure-cli
+title: Exercise - Install the Azure CLI
+metadata:
+  title: Work with the Azure CLI
+  description: Learn the command structure and syntax to work with the Azure CLI
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.custom:
+    - devx-track-azurecli
+  zone_pivot_groups: platform
+durationInMinutes: 10
+content: |
+  [!include[](includes/4-exercise-install-azure-cli.md)]
+

learn-pr/azure/control-azure-services-with-cli/5-create-resource-interactively.yml

@@ -1,17 +1,17 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.5-create-resource-interactively
-title: Create an Azure Resource interactively with Azure CLI
-metadata:
-  title: Create an Azure Resource interactively with Azure CLI
-  description: Create an Azure Resource interactively with Azure CLI
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.collection: ce-skilling-ai-copilot
-  ms.custom:
-    - devx-track-azurecli
-durationInMinutes: 5
-content: |
-  [!include[](includes/5-create-resource-interactively.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.5-create-resource-interactively
+title: Create an Azure Resource interactively with Azure CLI
+metadata:
+  title: Create an Azure Resource interactively with Azure CLI
+  description: Create an Azure Resource interactively with Azure CLI
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.collection: ce-skilling-ai-copilot
+  ms.custom:
+    - devx-track-azurecli
+durationInMinutes: 5
+content: |
+  [!include[](includes/5-create-resource-interactively.md)]
+

learn-pr/azure/control-azure-services-with-cli/6-exercise-create-resource-interactively.yml

@@ -1,18 +1,18 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.6-exercise-create-resource-interactively
-title: Exercise - Create an Azure Resource interactively with Azure CLI
-metadata:
-  title: Exercise - Create an Azure Resource interactively with Azure CLI
-  description: Exercise - Create an Azure Resource interactively with Azure CLI
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.collection: ce-skilling-ai-copilot
-  ms.custom:
-    - devx-track-azurecli
-durationInMinutes: 15
-interactive: bash
-azureSandbox: true
-content: |
-  [!include[](includes/6-exercise-create-resource-interactively.md)]
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.6-exercise-create-resource-interactively
+title: Exercise - Create an Azure Resource interactively with Azure CLI
+metadata:
+  title: Exercise - Create an Azure Resource interactively with Azure CLI
+  description: Exercise - Create an Azure Resource interactively with Azure CLI
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.collection: ce-skilling-ai-copilot
+  ms.custom:
+    - devx-track-azurecli
+durationInMinutes: 15
+interactive: bash
+azureSandbox: true
+content: |
+  [!include[](includes/6-exercise-create-resource-interactively.md)]

learn-pr/azure/control-azure-services-with-cli/7-create-resource-using-script.yml

@@ -1,16 +1,16 @@
-### YamlMime:ModuleUnit
-uid: learn.control-azure-services-with-cli.7-create-resource-using-script
-title: Create resources using an Azure CLI script
-metadata:
-  title: Create resources using an Azure CLI script
-  description: Create resources using an Azure CLI script
-  ms.date: 01/09/2025
-  author: dbradish-microsoft
-  ms.author: dbradish
-  ms.topic: unit
-  ms.collection: ce-skilling-ai-copilot
-  ms.custom:
-    - devx-track-azurecli
-durationInMinutes: 10
-content: |
-  [!include[](includes/7-create-resource-using-script.md)]
+### YamlMime:ModuleUnit
+uid: learn.control-azure-services-with-cli.7-create-resource-using-script
+title: Create resources using an Azure CLI script
+metadata:
+  title: Create resources using an Azure CLI script
+  description: Create resources using an Azure CLI script
+  ms.date: 01/09/2025
+  author: mikefrobbins
+  ms.author: mirobb
+  ms.topic: unit
+  ms.collection: ce-skilling-ai-copilot
+  ms.custom:
+    - devx-track-azurecli
+durationInMinutes: 10
+content: |
+  [!include[](includes/7-create-resource-using-script.md)]