Skip to content

Commit 51dffc5

Browse files
Merge pull request #7237 from MicrosoftDocs/main
Auto Publish – main to live - 2026-05-01 15:00 UTC
2 parents 4ade908 + ff05b3f commit 51dffc5

7 files changed

Lines changed: 5 additions & 14 deletions

File tree

docs/_bread/toc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
- name: Azure VMware Solution
1414
tocHref: /azure/cloud-adoption-framework/scenarios/azure-vmware/
1515
topicHref: /azure/cloud-adoption-framework/scenarios/azure-vmware
16-
- name: Cloud-scale analytics
17-
tocHref: /azure/cloud-adoption-framework/scenarios/cloud-scale-analytics/
18-
topicHref: /azure/cloud-adoption-framework/scenarios/cloud-scale-analytics
1916
- name: Hybrid and multicloud
2017
tocHref: /azure/cloud-adoption-framework/scenarios/hybrid/
2118
topicHref: /azure/cloud-adoption-framework/scenarios/hybrid

docs/manage/monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ The table provides a near complete list of the monitoring articles for every Azu
254254
| Azure Container Instances | [Monitor Azure Container Instances](/azure/container-instances/monitor-azure-container-instances)<br><br>[Monitoring data reference for Container Instances](/azure/container-instances/monitor-azure-container-instances-reference) | [Configure liveness probes](/azure/container-instances/container-instances-liveness-probe)|
255255
| Azure Container Registry | [Monitor Azure Container Registry](/azure/container-registry/monitor-container-registry)<br><br>[Monitoring Data Reference for Azure Container Registry](/azure/container-registry/monitor-container-registry-reference) | |
256256
| Azure Container Storage | [Enable monitoring for Azure Container Storage](/azure/storage/container-storage/enable-monitoring) | |
257-
| Azure Cosmos DB | [Monitor Azure Cosmos DB](/azure/cosmos-db/monitor)<br><br>[Monitoring data reference for Azure Cosmos DB](/azure/cosmos-db/monitor-reference) | [Azure Cosmos DB insights](/azure/cosmos-db/insights-overview)<br><br>[Monitor and debug with insights in Azure Cosmos DB](/azure/cosmos-db/use-metrics)<br><br>[Monitor throughput or request unit usage of an operation in Azure Cosmos DB](/azure/cosmos-db/monitor-request-unit-usage)<br><br>[Query execution metrics](/azure/cosmos-db/nosql/query-metrics-performance)<br><br>[Index metrics](/azure/cosmos-db/nosql/index-metrics)<br><br>[Explore Azure Monitor in vCore-based Azure Cosmos DB for MongoDB (vCore)](/azure/cosmos-db/mongodb/vcore/monitor-metrics) |
257+
| Azure Cosmos DB | [Monitor Azure Cosmos DB](/azure/cosmos-db/monitor)<br><br>[Monitoring data reference for Azure Cosmos DB](/azure/cosmos-db/monitor-reference) | [Azure Cosmos DB insights](/azure/cosmos-db/insights-overview)<br><br>[Monitor and debug with insights in Azure Cosmos DB](/azure/cosmos-db/use-metrics)<br><br>[Monitor throughput or request unit usage of an operation in Azure Cosmos DB](/azure/cosmos-db/monitor-request-unit-usage)<br><br>[Query execution metrics](/azure/cosmos-db/nosql/query-metrics-performance)<br><br>[Index metrics](/azure/cosmos-db/nosql/index-metrics)<br><br>[Explore Azure Monitor in vCore-based Azure Cosmos DB for MongoDB (vCore)](/azure/documentdb/monitor-metrics) |
258258
| Azure CycleCloud | [Monitor Azure CycleCloud](/azure/cyclecloud/concepts/monitoring) | |
259259
| Azure Data Box | [Track and log Azure Data Box, Azure Data Box Heavy events for import order](/azure/databox/data-box-logs) | |
260260
| Azure Data Explorer | [Monitor Azure Data Explorer](/azure/data-explorer/monitor-data-explorer)<br><br>[Monitoring data reference for Azure Data Explorer](/azure/data-explorer/monitor-data-explorer-reference) | |

docs/overview.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ The Cloud Adoption Framework has specific guidance aligned to common scenarios a
4848
| CAF Scenario | Purpose |
4949
|--------------|-----------------|----------------------------------|
5050
| [Data](data/executive-strategy-unify-data-platform.md) | How to unify your data platform for AI and analytics |
51-
| [AI agents](./ai-agents/index.md) | How and when to adopt AI agents |
5251
| [AI adoption](./scenarios/ai/index.md) | How to adopt AI (generative and nongenerative) |
52+
| [AI agents](./ai-agents/index.md) | How and when to adopt AI agents |
5353
| [Azure Virtual Desktop](./scenarios/azure-virtual-desktop/index.md) | How to adopt Azure Virtual Desktop |
5454
| [Azure VMware Solution](./scenarios/azure-vmware/index.md) | How to adopt Azure VMware Solution |
55-
| [Cloud-Scale Analytics](./scenarios/data-management/index.md) | How to do analytics in the cloud |
5655
| [Oracle on Azure](./scenarios/oracle-on-azure/index.md) | Run Oracle workloads on Azure. |
5756
| [SAP on Azure](./scenarios/sap/strategy.md) | How to run SAP workloads on Azure |

docs/ready/landing-zone/design-area/security-zero-trust.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ For information about deployment objectives for securing data, see [Secure data
129129

130130
For information about logging and managing data resources, see [Azure landing zone implementation options](../implementation-options.md).
131131

132-
A Zero Trust approach involves extensive controls for data. From an implementation standpoint, [Microsoft Purview](/purview/purview) provides tools for data governance, protection, and risk management. You can use Microsoft Purview as part of a [cloud-scale analytics](../../../scenarios/cloud-scale-analytics/index.md) deployment to provide a solution that you can implement at scale.
132+
A Zero Trust approach involves extensive controls for data. From an implementation standpoint, [Microsoft Purview](/purview/purview) provides tools for data governance, protection, and risk management.
133133

134134
#### Data considerations
135135

@@ -143,8 +143,6 @@ A Zero Trust approach involves extensive controls for data. From an implementati
143143

144144
- [Microsoft Purview](/purview/purview) provides tools for data governance, protection, and risk management.
145145

146-
- Implement Microsoft Purview as part of a [cloud-scale analytics](../../../scenarios/cloud-scale-analytics/index.md) deployment to implement your workload at scale.
147-
148146
## Secure infrastructure
149147

150148
For information about deployment objectives for securing infrastructure, see [Secure infrastructure with Zero Trust](/security/zero-trust/deploy/infrastructure). To implement these objectives, you can:

docs/scenarios/sap/sap-lza-data-example-architecture.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ For more information, see the following resources:
6767

6868
- [SAP knowledge center overview](/azure/data-factory/industry-sap-overview)
6969
- [SAP connectors](/azure/data-factory/industry-sap-connectors)
70-
- [SAP ingestion with cloud-scale analytics in Azure](/azure/cloud-adoption-framework/scenarios/cloud-scale-analytics/best-practices/sap-data-ingestion)
7170

7271
#### Data storage
7372

docs/toc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ items:
456456

457457
- name: Scenarios
458458
items:
459-
- name: Data
459+
- name: Data for AI and analytics
460460
href: data/executive-strategy-unify-data-platform.md
461461
- name: General AI
462462
href: ai/index.md
@@ -474,8 +474,6 @@ items:
474474
href: scenarios/sap/index.md
475475
- name: Azure VMware Solution
476476
href: scenarios/azure-vmware/index.md
477-
- name: Cloud-scale analytics (deprecated)
478-
href: scenarios/data-management/index.md
479477

480478

481479
- name: Resources

docs/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The Cloud Adoption Framework provides organization‑level decision guidance. Ar
3333

3434
### Deprecation notice
3535

36-
**Cloud-scale analytics guidance is deprecated.** We replaced this guidance with [Unify your data platform for AI and analytics](./data/executive-strategy-unify-data-platform.md). The deprecation and deletion date is April 30, 2026. To keep a copy of the retired content, navigate to the [content](/azure/cloud-adoption-framework/scenarios/cloud-scale-analytics/) to download a PDF or download the source files from [GitHub](https://github.com/MicrosoftDocs/cloud-adoption-framework/tree/main/docs/scenarios/cloud-scale-analytics).
36+
**Cloud-scale analytics guidance is deprecated.** We replaced this guidance with [Unify your data platform for AI and analytics](./data/executive-strategy-unify-data-platform.md). The deprecation and deletion date was April 30, 2026.
3737

3838
## December 2025
3939

0 commit comments

Comments
 (0)