diff --git a/content/en/datadog_cloudcraft/_index.md b/content/en/datadog_cloudcraft/_index.md
index 7dbec195b38..0379e8797a3 100644
--- a/content/en/datadog_cloudcraft/_index.md
+++ b/content/en/datadog_cloudcraft/_index.md
@@ -1,6 +1,6 @@
---
title: Cloudcraft in Datadog
-description: "Visualize and analyze AWS, Azure, and GCP cloud infrastructure with live Cloudcraft diagrams in Datadog for troubleshooting, security analysis, and cost optimization."
+description: "Visualize and analyze AWS, Azure, GCP, OCI, and vSphere infrastructure with live Cloudcraft diagrams in Datadog for troubleshooting, security analysis, and cost optimization."
further_reading:
- link: "https://www.datadoghq.com/blog/cloud-architecture-diagrams-cost-compliance-cloudcraft-datadog/"
tag: "Blog"
@@ -19,7 +19,7 @@ Cloudcraft offers a powerful, live read-only visualization tool for cloud archit
The account name in the {{< ui >}}Account{{< /ui >}} dropdown comes from your AWS account tags in the AWS integration tile. For Azure, the {{< ui >}}Subscription{{< /ui >}} name comes from the subscription name in your Azure integration tile's list of managed subscriptions. For GCP, the {{< ui >}}Project{{< /ui >}} dropdown lists your GCP project IDs from the Google Cloud integration tile.
+
Provider account names in the dropdowns come from their respective integration tiles:
+
+- AWS: The {{< ui >}}Account{{< /ui >}} name comes from your AWS account tags in the AWS integration tile.
+- Azure: The {{< ui >}}Subscription{{< /ui >}} name comes from the subscription name in your Azure integration tile's list of managed subscriptions.
+- GCP: The {{< ui >}}Project{{< /ui >}} dropdown lists your GCP project IDs from the Google Cloud integration tile.
+- OCI: The {{< ui >}}Tenancy{{< /ui >}} name comes from your tenancy in the Oracle Cloud Infrastructure integration tile.
+
### Group By
@@ -128,7 +159,7 @@ Enable the {{< ui >}}Show All Controls{{< /ui >}} toggle to display the availabl
You can group resources by AWS and Azure tags, such as app, service, team, or cost center, to organize your view by team or workload. When grouping by tags, color-coded labels are displayed on each group. When grouping by the `service` tag, a raised block is displayed to visually indicate the service grouping.
-**Note**: Grouping by tags is supported for AWS tags, Azure tags, and GCP labels (for example, `Project`). Tags from the Datadog Agent (for example, locally configured `env` or `team` tags) are not supported.
+**Note**: Grouping by tags is supported for AWS tags, Azure tags, GCP labels, OCI tags, and vSphere tags. Tags from the Datadog Agent (for example, locally configured `env` or `team` tags) are not supported.
{{< img src="datadog_cloudcraft/cloudcraft_group_by_with_team_tags_2.png" alt="Cloudcraft landing page with Group by highlighted, and grouping by Team" >}}
diff --git a/content/en/datadog_cloudcraft/overlays/ccm.md b/content/en/datadog_cloudcraft/overlays/ccm.md
index 3ce8e0c4f9c..993d634137c 100644
--- a/content/en/datadog_cloudcraft/overlays/ccm.md
+++ b/content/en/datadog_cloudcraft/overlays/ccm.md
@@ -18,9 +18,11 @@ further_reading:
## Overview
+
The Cloud Cost Management overlay is not available for vSphere accounts.
+
The Cloud Cost overlay helps you visualize resource-level costs and identify savings opportunities within your cloud architecture diagrams. This overlay provides two views: [{{< ui >}}Cost{{< /ui >}}](#cost-view) and [{{< ui >}}Recommendations{{< /ui >}}](#recommendations-view).
-**Note**: The Cost view is not available for GCP accounts. The Recommendations view is supported for GCP.
+**Note**: For GCP and OCI accounts, only the Recommendations view is available.
## Cost view
diff --git a/content/en/datadog_cloudcraft/overlays/infrastructure.md b/content/en/datadog_cloudcraft/overlays/infrastructure.md
index c5208b048f1..f03f20911d4 100644
--- a/content/en/datadog_cloudcraft/overlays/infrastructure.md
+++ b/content/en/datadog_cloudcraft/overlays/infrastructure.md
@@ -1,6 +1,6 @@
---
title: Infrastructure
-description: "Use the Infrastructure overlay in Cloudcraft to view resources grouped by Account, Region, and VPC for architecture diagrams and troubleshooting."
+description: "Use the Infrastructure overlay in Cloudcraft to view resources grouped by a provider-specific hierarchy for architecture diagrams and troubleshooting."
further_reading:
- link: "/datadog_cloudcraft/overlays/observability/"
tag: "Documentation"
@@ -15,7 +15,7 @@ further_reading:
## Overview
-The Infrastructure overlay provides a broad overview of your cloud environment by grouping resources into Account, Region, and VPC. This is the default view when opening a Cloudcraft diagram.
+The Infrastructure overlay provides a broad overview of your cloud environment by grouping resources into a provider-specific hierarchy. This is the default view when opening a Cloudcraft diagram.
{{< img src="datadog_cloudcraft/infra_overlay_5.png" alt="Infrastructure overlay in Cloudcraft." style="width:100%;" >}}
@@ -30,15 +30,7 @@ The Infrastructure overlay is ideal for:
## Resource grouping
-Resources are organized in a hierarchical structure. The grouping labels vary by provider:
-
-| Level | AWS | Azure | GCP |
-|-------|-----|-------|-----|
-| Top-level | Account | Subscription | Project |
-| Geographic | Region | Region | Region |
-| Network | VPC | Virtual Network | VPC |
-
-This hierarchy helps you understand how resources are distributed across your cloud infrastructure.
+Resources are grouped by a provider-specific hierarchy. Use the **Group by** controls at the top of the diagram to customize the grouping.
## Interact with resources
diff --git a/content/en/datadog_cloudcraft/overlays/monitors.md b/content/en/datadog_cloudcraft/overlays/monitors.md
index a34db09ed5f..60afc17668e 100644
--- a/content/en/datadog_cloudcraft/overlays/monitors.md
+++ b/content/en/datadog_cloudcraft/overlays/monitors.md
@@ -14,7 +14,7 @@ The Monitors overlay is in Preview.
## Overview
-The Monitors overlay shows monitors associated with your AWS and Azure resources and services, along with their current state (`Alert`, `Warn`, or `OK`). Use this overlay to identify and investigate production issues directly in your infrastructure diagram.
+The Monitors overlay shows monitors associated with your cloud resources and services, along with their current state (`Alert`, `Warn`, or `OK`). Use this overlay to identify and investigate production issues directly in your infrastructure diagram.
## View monitor status
diff --git a/content/en/datadog_cloudcraft/overlays/observability.md b/content/en/datadog_cloudcraft/overlays/observability.md
index 29d3ad909bd..a6adb1c9456 100644
--- a/content/en/datadog_cloudcraft/overlays/observability.md
+++ b/content/en/datadog_cloudcraft/overlays/observability.md
@@ -18,6 +18,8 @@ further_reading:
## Overview
+
The Observability overlay is not available for vSphere accounts.
+
The Observability overlay shows where the Datadog Agent is installed and what features are enabled per host, such as Application Performance Monitoring (APM), Cloud Network Monitoring (CNM), Log Management, and more. This helps you to assess visibility gaps across your environment.
## Take action on resources
diff --git a/content/en/datadog_cloudcraft/overlays/security.md b/content/en/datadog_cloudcraft/overlays/security.md
index 261752658b0..66c9d114131 100644
--- a/content/en/datadog_cloudcraft/overlays/security.md
+++ b/content/en/datadog_cloudcraft/overlays/security.md
@@ -18,6 +18,8 @@ further_reading:
## Overview
+
The Security overlay is not available for vSphere accounts.
+
The Security overlay highlights potential security exposures in your architecture, grouping resources by Region, VPC, and Security Group. It displays security findings detected by Cloud Security, helping you:
- Identify security issues directly in infrastructure diagrams