Merge pull request #295007 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/backup/backup-azure-troubleshoot-blob-backup.md

@@ -2,7 +2,7 @@
 title: Troubleshoot Blob backup and restore issues
 description: In this article, learn about symptoms, causes, and resolutions of Azure Backup failures related to the Azure Blob backups and restore.
 ms.topic: troubleshooting
-ms.date: 09/16/2024
+ms.date: 02/20/2025
 ms.service: azure-backup
 ms.reviewer: geg
 author: jyothisuri
@@ -153,14 +153,6 @@ This article provides troubleshooting information to address issues you encounte
 
 **Recommendation**: This error may occur if one or more containers included in the scope of protection no longer exist in the protected storage account. We recommend you to re-trigger the operation after modifying the protected container list using the edit backup instance option.
 
-### UserErrorCrossTenantOrsPolicyDisabled
-
-**Error code**: `UserErrorCrossTenantOrsPolicyDisabled`
-
-**Error message**: Cross tenant object replication policy disabled.
-
-**Recommendation**: Enable cross-tenant object replication policy on storage account and trigger the operation again. To check this, go to the *storage account* > **Object replication** > **Advanced settings**, and ensure that the checkbox is enabled.
-
 ### UserErrorPitrRestoreInProgress
 
 **Error code**: `UserErrorPitrRestoreInProgress`
@@ -169,6 +161,30 @@ This article provides troubleshooting information to address issues you encounte
 
 **Recommendation**: You need to retrigger the operation once the in-progress restore completes. 
 
+### UserErrorMaxConcurrentOperationLimitReached
+
+**Error code**: `UserErrorMaxConcurrentOperationLimitReached`
+
+**Error message**: The operation can't start because the number of allowed concurrent operations has reached the maximum limit.
+
+**Cause**: This error appears due to the following reasons:
+
+- A backup job is already in progress and another one is triggered (either scheduled or ad hoc).
+- A long-running backup is in progress; it might be caused by a large account with a high number of blobs and versions. The initial backup (IR) takes longer depending on the account size, number of blobs, and versions.
+
+**Recommended action**: To resolve the error, follow these steps:
+
+- Wait for the ongoing operation(s) to complete before starting a new one.
+- To reduce the backup duration, consider cleaning up older versions using an appropriate Lifecycle Management (LCM) policy.
+
+### UserErrorConflictingFeatureEnabled
+
+**Error code**: `UserErrorConflictingFeatureEnabled`
+
+**Error message**: **Permanent delete** is a conflicting job for point-in-time-restore, which is blocking protection/backup.
+        
+**Recommended action**: Disable the conflicting job (such as **Permanent delete**) on the storage account and retry the operation. 
+
 ## Common errors for Azure Blob vaulted backup
 
 ### UserErrorInvalidParameterInRequest 

articles/backup/blob-backup-configure-tutorial.md

@@ -2,7 +2,7 @@
 title: Tutorial - Configure vaulted backup for Azure Blobs using Azure Backup
 description: In this tutorial, learn how to configure vaulted backup for Azure Blobs.
 ms.topic: tutorial
-ms.date: 02/12/2025
+ms.date: 02/20/2025
 ms.service: azure-backup
 author: jyothisuri
 ms.author: jsuri
@@ -27,7 +27,6 @@ Things to remember before you start configuring blob vaulted backup:
 
 - Vaulted backup of blobs is a managed offsite backup solution that transfers data to the backup vault and retains as per the retention configured in the backup policy. You can retain data for a maximum of *10 years*.
 - Currently, you can use the vaulted backup solution to restore data to a different storage account only. While performing restores, ensure that the target storage account doesn't contain any *containers* with the same name as those backed up in a recovery point. If any conflicts arise due to the same name of containers, the restore operation fails.
-- Storage accounts to be backed up need to have *cross-tenant replication* enabled. To ensure if the checkbox for this setting is enabled, go to the **storage account** > **Object replication** > **Advanced settings**.
 
 For more information about the supported scenarios, limitations, and availability, see the [support matrix](blob-backup-support-matrix.md).
 

articles/defender-for-iot/organizations/architecture.md

@@ -1,13 +1,17 @@
 ---
-title: System architecture for OT/IoT monitoring - Microsoft Defender for IoT
-description: Learn about the Microsoft Defender for IoT system architecture and data flow.
+title: Defender for IoT - OT architecture and components
+description: Discover the OT architecture and data flow of Microsoft Defender for IoT, providing comprehensive coverage and visibility from diverse data sources.
+author: limwainstein
+ms.author: lwainstein
 ms.topic: conceptual
-ms.date: 01/18/2023
+ms.date: 01/30/2025
 ---
 
-# Microsoft Defender for IoT components
+# Microsoft Defender for IoT architecture and components for your OT environment
 
-The Microsoft Defender for IoT system is built to provide broad coverage and visibility from diverse data sources.
+The Microsoft Defender for IoT system is built to provide broad coverage and visibility from diverse data sources. Review this architecture to understand how to plan your OT architecture accordingly.
+
+## OT architecture overview
 
 The following image shows how data can stream into Defender for IoT from network sensors and third-party sources to provide a unified view of IoT/OT security. Defender for IoT in the Azure portal provides asset inventories, vulnerability assessments, and continuous threat monitoring.
 

articles/defender-for-iot/organizations/eiot-defender-for-endpoint.md

@@ -1,17 +1,17 @@
 ---
-title: Get started with enterprise IoT monitoring in Microsoft Defender XDR | Microsoft Defender for IoT
-description: Learn how to get added value for enterprise IoT devices in Microsoft Defender XDR.
+title: Set up enterprise IoT security - Defender for IoT
+description: Enable enterprise IoT security for your IoT devices, using added security value in Microsoft Defender for IoT.
 ms.topic: quickstart
 ms.date: 09/13/2023
 ms.custom: enterprise-iot
-#CustomerIntent: As a Microsoft 365 administrator, I want to understand how to turn on support for enterprise IoT monitoring in Microsoft Defender XDR and where I can find the added security value so that I can keep my EIoT devices safe.
+#CustomerIntent: As a security administrator, I want to understand how to set up enterprise IoT monitoring so that I can keep my EIoT devices safe.
 ---
 
-# Get started with enterprise IoT monitoring in Microsoft Defender XDR
+# Get started with enterprise IoT security monitoring
 
-This article describes how [Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/) customers can monitor enterprise IoT devices in their environment, using added security value in Microsoft Defender XDR.
+This article describes how [Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/) customers can enable enterprise IoT security for their IoT devices, using added security value in Microsoft Defender for IoT.
 
-While IoT device inventory is already available for Defender for Endpoint P2 customers, turning on enterprise IoT security adds alerts, recommendations, and vulnerability data, purpose-built for IoT devices in your enterprise network.
+While the IoT device inventory is already available for Defender for Endpoint P2 customers, turning on enterprise IoT security adds alerts, recommendations, and vulnerability data, purpose-built for IoT devices in your enterprise network.
 
 IoT devices include printers, cameras, VOIP phones, smart TVs, and more. Turning on enterprise IoT security means, for example, that you can use a recommendation in Microsoft Defender XDR to open a single IT ticket for patching vulnerable applications across both servers and printers.
 
@@ -39,7 +39,7 @@ Make sure that you have:
 
     For more information, see [Enterprise IoT security in Microsoft Defender XDR](concept-enterprise.md#enterprise-iot-security-in-microsoft-defender-xdr).
 
-## Turn on enterprise IoT monitoring
+## Turn on enterprise IoT security monitoring
 
 This procedure describes how to turn on enterprise IoT monitoring in Microsoft Defender XDR, and is relevant only for ME5/E5 Security customers.
 

articles/defender-for-iot/organizations/how-to-manage-individual-sensors.md

@@ -79,7 +79,7 @@ For more information, see [Update Defender for IoT OT monitoring software](updat
 
 Each OT sensor is onboarded as a cloud-connected or locally managed OT sensor and activated using a unique activation file. For cloud-connected sensors, the activation file is used to ensure the connection between the sensor and Azure.
 
-You need to upload a new activation file to your sensor if you want to switch sensor management modes, such as moving from a locally managed sensor to a cloud-connected sensor, or if you're [updating from a recent software version](update-ot-software.md?tabs=portal#update-ot-sensors). Uploading a new activation file to your sensor includes deleting your sensor from the Azure portal and onboarding it again.
+You need to upload a new activation file to your sensor if you want to switch sensor management modes, such as moving from a locally managed sensor to a cloud-connected sensor, or if you're [updating from a recent software version](update-ot-software.md?tabs=portal#update-ot-sensors-with-the-latest-ot-monitoring-software). Uploading a new activation file to your sensor includes deleting your sensor from the Azure portal and onboarding it again.
 
 **To add a new activation file:**
 

articles/defender-for-iot/organizations/how-to-manage-sensors-on-the-cloud.md

@@ -144,7 +144,7 @@ This procedure describes how to view sensor health data from the Azure portal. S
     - Sensor fails regular sanity tests
     - No traffic detected by the sensor
     - Sensor software version is no longer supported
-    - A [remote sensor upgrade from the Azure portal](update-ot-software.md#update-ot-sensors) fails
+    - A [remote sensor upgrade from the Azure portal](update-ot-software.md#update-ot-sensors-with-the-latest-ot-monitoring-software) fails
 
     For more information, see our [Sensor health message reference](sensor-health-messages.md).
 

articles/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor.md

@@ -1,11 +1,11 @@
 ---
-title: Install OT network monitoring software on OT sensors - Microsoft Defender for IoT
-description: Learn how to install agentless monitoring software for an OT sensor for Microsoft Defender for IoT. Use this article if you've chosen to install software on your own appliances or when reinstalling software on a preconfigured appliance.
-ms.date: 06/26/2023
+title: Install OT sensor software
+description: Learn how to install agentless monitoring software on an OT sensor for Microsoft Defender for IoT, including initial setup settings.
+ms.date: 01/30/2025
 ms.topic: install-set-up-deploy
 ---
 
-# Install OT monitoring software on OT sensors
+# Install OT sensor monitoring software
 
 This article is one in a series of articles describing the [deployment path](../ot-deploy/ot-deploy-path.md) for OT monitoring with Microsoft Defender for IoT, and describes how to install Defender for IoT software on OT sensors and configure initial setup settings.
 
@@ -15,7 +15,6 @@ Use the procedures in this article when installing Microsoft Defender for IoT so
 
 [!INCLUDE [caution do not use manual configurations](../includes/caution-manual-configurations.md)]
 
-
 ## Prerequisites
 
 Before installing, configuring, and activating your OT sensor, make sure that you have:
@@ -119,8 +118,7 @@ This procedure describes how to install the Defender for IoT software you'd down
     UID: 91F14D56-C1E4-966F-726F-006A527C61D
     ```
 
-Use the default IP address provided to access your sensor for [initial setup and activation](activate-deploy-sensor.md).
-
+Use the default IP address provided to access your sensor for initial setup and activation.
 
 ## Next steps
 
@@ -130,4 +128,4 @@ For more information, see [Troubleshoot the sensor](../how-to-troubleshoot-senso
 > [« Provision OT sensors for cloud management](provision-cloud-management.md)
 
 > [!div class="step-by-step"]
-> [Validate after installing software »](post-install-validation-ot-software.md)
+> [Validate after installing software »](post-install-validation-ot-software.md)

articles/defender-for-iot/organizations/overview.md

@@ -1,12 +1,13 @@
 ---
-title: Overview - Microsoft Defender for IoT for organizations
-description: Learn about Microsoft Defender for IoT's features for end-user organizations and comprehensive IoT security for OT and Enterprise IoT networks.
+title: Enhance your OT security with Defender for IoT
+description: Learn about Microsoft Defender for IoT's features for OT/IoT security for OT and Enterprise IoT networks.
 ms.topic: overview
-ms.date: 04/10/2024
+ms.author: lwainstein
+author: limwainstein
+ms.date: 01/30/2025
 ms.custom: enterprise-iot
 ---
-
-# Welcome to Microsoft Defender for IoT
+# What is Microsoft Defender for IoT?
 
 [!INCLUDE [defender-iot-defender-reference](../includes/defender-for-iot-defender-reference.md)]
 
@@ -20,7 +21,7 @@ Defender for IoT provides agentless, network layer monitoring, and integrates wi
 
 :::image type="content" source="media/overview/end-to-end-coverage.png" alt-text="Diagram showing an example of Defender for IoT's end-to-end coverage solution.":::
 
-## Agentless device monitoring
+## Agentless device monitoring for OT security
 
 If your IoT and OT devices don't have embedded security agents, they might remain unpatched, misconfigured, and invisible to IT and security teams. Unmonitored devices can be soft targets for threat actors looking to pivot deeper into corporate networks.
 

articles/defender-for-iot/organizations/release-notes.md

@@ -369,7 +369,7 @@ This version includes the following new updates and fixes:
 This version includes the following new updates and fixes:
 
 - [Define and view OT sensor settings from the Azure portal](configure-sensor-settings-portal.md)
-- [Update your sensors from the Azure portal](update-ot-software.md#update-ot-sensors)
+- [Update your sensors from the Azure portal](update-ot-software.md#update-ot-sensors-with-the-latest-ot-monitoring-software)
 - [New naming convention for hardware profiles](ot-appliance-sizing.md)
 - [PCAP access from the Azure portal](how-to-manage-cloud-alerts.md)
 - [Bi-directional alert synch between OT sensors and the Azure portal](alerts.md#managing-ot-alerts-in-a-hybrid-environment)

articles/defender-for-iot/organizations/update-ot-software.md

@@ -1,13 +1,15 @@
 ---
-title: Update Defender for IoT OT monitoring software versions
-description: Learn how to update (upgrade) Defender for IoT software on OT sensors.
-ms.date: 12/17/2023
+title: Defender for IoT - Update OT monitoring software
+description: Learn how to update the OT software on your Defender for IoT sensors so that you can manage updates efficiently.
+ms.date: 01/20/2025
 ms.topic: upgrade-and-migration-article
+
+#Customer intent: As an IT admin, I want to update OT sensors remotely via the Azure portal so that I can manage updates efficiently.
 ---
 
-# Update Defender for IoT OT monitoring software
+# Defender for IoT - Update OT monitoring software
 
-This article describes how to update Defender for IoT software versions on OT sensor.
+This article describes how to update the OT software on your Defender for IoT sensors so that you can manage updates and stay up to date with the latest version.
 
 You can purchase pre-configured appliances for your sensors, or install software on your own hardware machines. In either case, you'll need to update software versions to use new features for OT sensors.
 
@@ -24,7 +26,7 @@ To perform the procedures described in this article, make sure that you have:
 
     |Update scenario  |Method details  |
     |---------|---------|
-    |**Cloud-connected sensors**     |  Cloud connected sensors can be updated remotely, directly from the Azure portal, or manually using a downloaded update package.  <br><br>[Remote updates](#update-ot-sensors) require that your OT sensor has version [22.2.3](release-notes.md#2223) or later already installed.       |
+    |**Cloud-connected sensors**     |  Cloud connected sensors can be updated remotely, directly from the Azure portal, or manually using a downloaded update package.  <br><br>[Remote updates](#update-ot-sensors-with-the-latest-ot-monitoring-software) require that your OT sensor has version [22.2.3](release-notes.md#2223) or later already installed.       |
     |**Locally managed sensors**     |  Locally managed sensors can be updated using a downloaded update package directly on an OT sensor console. |
 
 - **Required access permissions**:
@@ -54,7 +56,7 @@ To perform the procedures described in this article, make sure that you have:
 
     For more information, see [Networking requirements](networking-requirements.md) and [Sensor management options from the Azure portal](how-to-manage-sensors-on-the-cloud.md#sensor-management-options-from-the-azure-portal).
 
-## Update OT sensors
+## Update OT sensors with the latest OT monitoring software
 
 This section describes how to update Defender for IoT OT sensors using any of the supported methods.