Changed include filename and fixed errors

Author: sbreingold-ms

articles/sentinel/feature-availability.md

@@ -6,7 +6,7 @@ ms.author: bagol
 ms.topic: feature-availability
 ms.custom: references_regions
 ms.service: microsoft-sentinel
-ms.date: 06/22/2025
+ms.date: 08/21/2025
 
 
 #Customer intent: As a security operations manager, I want to understand the Microsoft Sentinel's feature availability across different Azure environments so that I can effectively plan and manage our security operations.
@@ -21,7 +21,7 @@ This article describes the features available in Microsoft Sentinel across diffe
 > These lists and tables do not include feature or bundle availability in the Azure Government Secret or Azure Government Top Secret clouds. 
 > For more information about specific availability for air-gapped clouds, please contact your account team.
 
-[!INCLUDE [china-21vianet-retirement](includes/china-21vianet-retirement.md)]
+[!INCLUDE [azure-21vianet-retirement](includes/azure-21vianet-retirement.md)]
 
 ## Experience in the Defender portal 
 
@@ -31,7 +31,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Analytics		
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet   |
 |---------|---------|---------|---------|---------|
 |[Analytics rules health](monitor-analytics-rule-integrity.md) |Public preview |Yes |No |No |
 |[MITRE ATT&CK dashboard](mitre-coverage.md)	|Public preview |Yes |Yes |Yes |
@@ -41,15 +41,15 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Content and content management		
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Content hub](sentinel-solutions.md) and [solutions](sentinel-solutions-catalog.md) |GA |Yes |Yes |Yes |
 |[Repositories](ci-cd.md?tabs=github) |Public preview |Yes |No |No |
 |[Workbooks](monitor-your-data.md) |GA |Yes |Yes |Yes |
 
 ## Data collection
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Amazon Web Services](connect-aws.md?tabs=ct) |GA |Yes |Yes |No |
 |[Amazon Web Services S3](connect-aws.md?tabs=s3) |GA|Yes |Yes |No |
@@ -91,7 +91,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Hunting
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Bookmarks](bookmarks.md) |GA |Yes |Yes |Yes |
 |[Hunts](hunts.md) |Public preview|Yes |No |No |
@@ -102,7 +102,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Incidents
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Add entities to threat intelligence](add-entity-to-threat-intelligence.md?tabs=incidents) |Public preview |Yes |Yes |Yes |
 |[Advanced and/or conditions](add-advanced-conditions-to-automation-rules.md) |GA |Yes |Yes |Yes |
@@ -112,7 +112,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 |[Cross-tenant/Cross-workspace incidents view](multiple-workspace-view.md)     |GA         |Yes |Yes |Yes |
 |[Incident advanced search](investigate-cases.md#search-for-incidents) |GA |Yes |Yes |Yes |
 |[Incident tasks](incident-tasks.md) |GA |Yes |Yes |Yes |
-|[Microsoft 365 Defender incident integration](microsoft-365-defender-sentinel-integration.md#working-with-microsoft-defender-xdr-incidents-in-microsoft-sentinel-and-bi-directional-sync) |GA |Yes |Yes |No |
+|[Microsoft Defender XDR incident integration](microsoft-365-defender-sentinel-integration.md#working-with-microsoft-defender-xdr-incidents-in-microsoft-sentinel-and-bi-directional-sync) |GA |Yes |Yes |No |
 |[Microsoft Teams integrations](collaborate-in-microsoft-teams.md) |Public preview |Yes |Yes |No |
 |[Playbook template gallery](use-playbook-templates.md) |Public preview |Yes |Yes |No |
 |[Run playbooks on entities](respond-threats-during-investigation.md) |GA |Yes |Yes |Yes |
@@ -121,7 +121,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Machine Learning
 
-|Feature  |Feature stage |Azure commercial |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Anomalous RDP login detection - built-in ML detection](configure-connector-login-detection.md) |Public preview |Yes |Yes |No |
 |[Anomalous SSH login detection - built-in ML detection](connect-syslog.md#configure-the-syslog-connector-for-anomalous-ssh-login-detection) |Public preview |Yes |Yes |No |
@@ -132,40 +132,40 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Managing Microsoft Sentinel
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Workspace manager](workspace-manager.md) |Public preview | Yes |Yes |No |
 |[SIEM migration experience](siem-migration.md) | GA | Yes |No |No |
 
 ## Normalization
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Advanced Security Information Model (ASIM)](normalization.md) |Public preview |Yes |Yes |Yes |
 
 ## Notebooks
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Notebooks](notebooks.md) |GA |Yes |Yes  |Yes  |
 |[Notebook integration with Azure Synapse](notebooks-with-synapse.md) |Public preview |Yes |Yes  |Yes  |
 
 ## SOC optimizations
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[SOC optimizations](soc-optimization/soc-optimization-access.md) |Supported for production use|Yes |No |No |
 
 ## SAP
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Threat protection for SAP](sap/deployment-overview.md)</sup> |GA |Yes|Yes |Yes |
 |[Agentless data connector](sap/deployment-overview.md#data-connector) | Limited preview | Yes |No | No |
 
 ## Threat intelligence support		
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[GeoLocation and WhoIs data enrichment](work-with-threat-indicators.md) |Public preview |Yes |No |No |
 |[Import TI from flat file](indicators-bulk-file-import.md) |Public preview |Yes |Yes |Yes |
@@ -180,7 +180,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## UEBA 
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Active Directory sync via MDI](enable-entity-behavior-analytics.md#how-to-enable-user-and-entity-behavior-analytics) |Public preview |Yes |Yes |No |
 |[Azure resource entity pages](entity-pages.md) |Public preview |Yes |Yes |No |
@@ -195,7 +195,7 @@ For more information, see [Microsoft Defender XDR for US Government customers](/
 
 ## Watchlists
 
-|Feature  |Feature stage |Azure commercial  |Azure Government |Azure China 21Vianet  |
+|Feature  |Feature stage |Azure commercial  |Azure Government |Azure operated by 21Vianet  |
 |---------|---------|---------|---------|---------|
 |[Large watchlists from Azure Storage](watchlists.md) |Public preview |Yes |No |No |
 |[Watchlists](watchlists.md) |GA |Yes |Yes |Yes |

articles/sentinel/geographical-availability-data-residency.md

@@ -18,7 +18,7 @@ After your data is collected, stored, and processed, compliance can become an im
 
 This article can help you meet compliance requirements by describing where Microsoft Sentinel data is stored.
 
-[!INCLUDE [china-21vianet-retirement](includes/china-21vianet-retirement.md)]
+[!INCLUDE [azure-21vianet-retirement](includes/azure-21vianet-retirement.md)]
 
 ## Collected data
 
@@ -68,7 +68,7 @@ Regions supported for Microsoft Sentinel raw data, and for processed and configu
 ### Regions supported for Microsoft Sentinel data lake
 
 > [!NOTE]
-> The Microsoft Sentinel data lake is currently in preview. During this time onboarding may be temporarily unavailable in some regions. When onboarding is available in your region, a onboarding banner appears on the Microsoft Defender portal home page to guide you through the process.
+> The Microsoft Sentinel data lake is currently in preview. During this time onboarding may be temporarily unavailable in some regions. When onboarding is available in your region, an onboarding banner appears on the Microsoft Defender portal home page to guide you through the process.
 
 
 | Continent              | Country/Region   | Azure Region                          |

articles/sentinel/includes/azure-21vianet-retirement.md

@@ -0,0 +1,13 @@
+---
+author: sbreingold
+ms.author: v-sreingold
+ms.topic: include
+ms.date: 08/21/2025
+
+---
+
+> [!IMPORTANT]
+>
+>All Microsoft Sentinel features will be officially retired in the Azure operated by 21Vianet region on August 18, 2026, per the [announcement posted by 21Vianet](https://aka.ms/sentinelretirementinchina). Due to this upcoming retirement, customers are no longer able to onboard new subscriptions to the service. 
+>
+>We recommend that customers work with their account representatives for Microsoft Azure operated by 21Vianet to assess the impact of this retirement on their own operations.

articles/sentinel/includes/china-21vianet-retirement.md

@@ -23,7 +23,7 @@ While you can run multiple data connector agents on a single machine, we recomme
 > [!NOTE]
 > This article is relevant only for the data connector agent, and isn't relevant for the [SAP agentless data connector](deployment-overview.md#data-connector) (Limited preview).
 >
-[!INCLUDE [china-21vianet-retirement](../includes/china-21vianet-retirement.md)]
+[!INCLUDE [azure-21vianet-retirement](../includes/azure-21vianet-retirement.md)]
 
 ## Prerequisites