[DOCS-8435] NPM to CNM name change

config/_default/menus/main.en.yaml

@@ -1516,10 +1516,10 @@ menu:
       parent: monitor_types
       identifier: monitor_types_network
       weight: 317
-    - name: Network Performance
-      url: monitors/types/network_performance/
+    - name: Cloud Network Monitoring
+      url: monitors/types/cloud_network_monitoring/
       parent: monitor_types
-      identifier: monitor_types_network_performance
+      identifier: monitor_types_cnm
       weight: 318
     - name: NetFlow
       url: monitors/types/netflow/
@@ -2975,35 +2975,35 @@ menu:
       identifier: nm_parent
       parent: infrastructure_heading
       weight: 40000
-    - name: Network Performance Monitoring
-      url: network_monitoring/performance/
+    - name: Cloud Network Monitoring
+      url: network_monitoring/cloud_network_monitoring/
       parent: nm_parent
-      identifier: npm
+      identifier: cnm
       weight: 1
     - name: Setup
-      url: network_monitoring/performance/setup/
-      parent: npm
-      identifier: npm_setup
+      url: network_monitoring/cloud_network_monitoring/setup/
+      parent: cnm
+      identifier: cnm_setup
       weight: 101
     - name: Overview Page
-      url: network_monitoring/performance/overview_page/
-      parent: npm
-      identifier: npm_overview_page
+      url: network_monitoring/cloud_network_monitoring/overview_page/
+      parent: cnm
+      identifier: cnm_overview_page
       weight: 102
     - name: Network Analytics
-      url: network_monitoring/performance/network_analytics/
-      parent: npm
-      identifier: npm_analytics
+      url: network_monitoring/cloud_network_monitoring/network_analytics/
+      parent: cnm
+      identifier: cnm_analytics
       weight: 103
     - name: Network Map
-      url: network_monitoring/performance/network_map/
-      parent: npm
-      identifier: npm_map
+      url: network_monitoring/cloud_network_monitoring/network_map/
+      parent: cnm
+      identifier: cnm_map
       weight: 104
     - name: Guides
-      url: network_monitoring/performance/guide/
-      identifier: npm_guides
-      parent: npm
+      url: network_monitoring/cloud_network_monitoring/guide/
+      identifier: cnm_guides
+      parent: cnm
       weight: 105
     - name: DNS Monitoring
       url: network_monitoring/dns/

content/en/account_management/billing/pricing.md

@@ -50,11 +50,11 @@ You can put controls in place for both Indexed and Ingested span volumes. For mo
 * A **browser test** is a simulation of a scripted sequence of user actions on a web-based application using a virtualized web browser. Datadog charges per thousand browser tests executed to the Datadog Synthetic Monitoring
  service.
 
-## Network Performance Monitoring
+## Cloud Network Monitoring
 
-* Datadog records the number of **Network Performance Monitoring** (NPM) hosts you are concurrently monitoring with the Datadog NPM service once per hour.
+* Datadog records the number of **Cloud Network Monitoring** (CNM) hosts you are concurrently monitoring with the Datadog CNM service once per hour.
   * The billable count of hosts is calculated at the end of the month using the maximum count (high-water mark) of the lower 99 percent of usage for those hours. Datadog excludes the top 1 percent to reduce the impact of spikes in usage on your bill.
-* Additionally, Datadog measures the total number of flows used by all NPM hosts per month. A **flow** is a record of traffic sent and received between a source (IP:Port) and destination (IP:Port), as measured over a five-minute time period.
+* Additionally, Datadog measures the total number of flows used by all CNM hosts per month. A **flow** is a record of traffic sent and received between a source (IP:Port) and destination (IP:Port), as measured over a five-minute time period.
 
 ## Real User Monitoring
 

content/en/account_management/billing/usage_metrics.md

@@ -44,7 +44,7 @@ Estimated usage metrics are generally available for the following usage types:
 | API test runs                 | `datadog.estimated_usage.synthetics.api_test_runs` | Estimated usage for API tests. |
 | Browser test runs             | `datadog.estimated_usage.synthetics.browser_test_runs`| Estimated usage for browser tests. |
 | Parallel Testing Slots        | `datadog.estimated_usage.synthetics.parallel_testing_slots` | Estimated usage for parallel testing slots. |
-| Network Hosts                 | `datadog.estimated_usage.network.hosts`, `datadog.estimated_usage.network.hosts.by_tag` | Unique NPM hosts seen in the last hour. |
+| Network Hosts                 | `datadog.estimated_usage.network.hosts`, `datadog.estimated_usage.network.hosts.by_tag` | Unique CNM hosts seen in the last hour. |
 | Network Devices               | `datadog.estimated_usage.network.devices`, `datadog.estimated_usage.network.devices.by_tag` | Unique NDM devices seen in the last hour. |
 | Profiled Hosts                | `datadog.estimated_usage.profiling.hosts`, `datadog.estimated_usage.profiling.hosts.by_tag` | Unique profiling hosts seen in the last hour. |
 | Profiled Containers           | `datadog.estimated_usage.profiling.containers`, `datadog.estimated_usage.profiling.containers.by_tag` | Unique profiling containers seen in last 5 minutes. |

content/en/administrators_guide/plan.md

@@ -209,9 +209,9 @@ Use [Live processes][26] to view all of your running processes in one place. For
 
 Web server operations depend on the network availability of ports, the validity of SSL certificates, and low latencies. Install the [HTTP_Check][25] to monitor local or remote HTTP endpoints, detect bad response codes (such as 404), and use Synthetic API tests to identify soon-to-expire [SSL certificates][71].
 
-### Network Monitoring
+### Cloud Network Monitoring
 
-Web servers are almost always inter-connected with other services through a network fabric that is vulnerable to drops and can result in re-transmits. Use Datadog's [network integration][28] and enable [Network Performance Monitoring][29] to gain visibility into your network traffic between services, containers, availability zones, and other tags on your infrastructure.
+Web servers are almost always inter-connected with other services through a network fabric that is vulnerable to drops and can result in re-transmits. Use Datadog's [network integration][28] and enable [Cloud Network Monitoring][29] to gain visibility into your network traffic between services, containers, availability zones, and other tags on your infrastructure.
 
 ## Platform services
 
@@ -344,7 +344,7 @@ Create a detailed roll-out methodology in the [build][41] phase by focusing on t
 [26]: /infrastructure/process/?tab=linuxwindows
 [27]: /infrastructure/process/?tab=linuxwindows\#installation
 [28]: /integrations/network/
-[29]: /network_monitoring/performance/
+[29]: /network_monitoring/cloud_network_monitoring/
 [30]: /service_catalog/
 [31]: /service_management/events/
 [32]: /error_tracking/

content/en/agent/basic_agent_usage/aix.md

@@ -98,7 +98,7 @@ Additionally, the following integrations can be enabled to collect further metri
 
 Enable the above integrations by copying and editing the sample configuration files provided. These are found in `/etc/datadog-agent/conf.d`. The name of the YAML configuration file should match that of the integration: `/etc/datadog-agent/conf.d/<INTEGRATION_NAME>.d/conf.yaml` enables the integration `<INTEGRATION_NAME>`, and set its configuration. Example configuration files can be found at `/etc/datadog-agent/conf.d/<INTEGRATION_NAME>.d/conf.yaml.example`
 
-**Note**: Some of the available metrics differ between the integrations for the Unix Agent and the integrations for Linux, Windows and MacOS. Although it is possible to monitor processes and network metrics with the Unix Agent, the Live Process Monitoring and Network Performance Monitoring capabilities aren't available. Log Management is also not available with the Unix Agent.
+**Note**: Some of the available metrics differ between the integrations for the Unix Agent and the integrations for Linux, Windows and MacOS. Although it is possible to monitor processes and network metrics with the Unix Agent, the Live Process Monitoring and Cloud Network Monitoring capabilities aren't available. Log Management is also not available with the Unix Agent.
 
 <div class="alert alert-info">The Unix Agent has no trace-agent component, so APM tracing and profiling is not supported.</div>
 

content/en/agent/basic_agent_usage/windows.md

@@ -191,7 +191,7 @@ Each of the following configuration options can be added as a property to the co
 | `PROXY_USER`                                | String  | (If using a proxy) sets your proxy user. [Learn more about using a proxy with the Datadog Agent][4].                                                                                                                                 |
 | `PROXY_PASSWORD`                            | String  | (If using a proxy) sets your proxy password. For the process/container Agent, this variable is required for passing in an authentication password and cannot be renamed. [Learn more about using a proxy with the Datadog Agent][4]. |
 | `EC2_USE_WINDOWS_PREFIX_DETECTION`          | Boolean | Use the EC2 instance id for Windows hosts on EC2. _(v7.28.0+)_                                                                                                                                                                      |
-| [DEPRECATED] `ADDLOCAL` | String | Enable additional Agent component. Setting to `"MainApplication,NPM"` causes the driver component for [Network Performance Monitoring][5] to be installed. _(version 7.44.0 and previous)_ |
+| [DEPRECATED] `ADDLOCAL` | String | Enable additional Agent component. Setting to `"MainApplication,NPM"` causes the driver component for [Cloud Network Monitoring][5] to be installed. _(version 7.44.0 and previous)_ |
 
 **Note:**
 Agent 7 only supports Python 3. Before upgrading, confirm that your custom checks are compatible with Python 3. See the [Python 3 Custom Check Migration][13] guide for more information. If you're not using custom checks or have already confirmed their compatibility, upgrade normally.
@@ -392,7 +392,7 @@ After configuration is complete, [restart the Agent][11].
 [2]: /agent/supported_platforms/?tab=windows
 [3]: /agent/faq/windows-agent-ddagent-user/
 [4]: /agent/configuration/proxy/
-[5]: /network_monitoring/performance
+[5]: /network_monitoring/cloud_network_monitoring
 [6]: /agent/guide/datadog-agent-manager-windows/
 [7]: /integrations/wmi_check/
 [8]: https://app.datadoghq.com/monitors/create/integration

content/en/agent/iot/_index.md

@@ -25,7 +25,7 @@ The IoT Agent also supports:
 - Custom metric collection using an embedded [DogStatsD][6] server
 - Log collection using [tailing files][7], [TCP/UDP][8], and [journald][9]
 
-The IoT Agent does not include the Python interpreter and other integrations pre-packaged with the standard Agent. It also doesn't support tracing for APM, live process monitoring, or network performance monitoring.
+The IoT Agent does not include the Python interpreter and other integrations pre-packaged with the standard Agent. It also doesn't support tracing for APM, live process monitoring, or Cloud Network Monitoring.
 
 ## Setup
 

content/en/all_guides.md

@@ -28,7 +28,7 @@ Guides in the Datadog documentation are pages that provide background knowledge,
 {{< whatsnext desc="Infrastructure:">}}
 {{< nextlink href="/containers/guide" >}}<i class="icon-container" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Containers{{< /nextlink >}}
 {{< nextlink href="/serverless/guide" >}}<i class="icon-serverless" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Serverless{{< /nextlink >}}
-{{< nextlink href="/network_monitoring/performance/guide" >}}<i class="icon-network" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Network Performance Monitoring{{< /nextlink >}}
+{{< nextlink href="/network_monitoring/cloud_network_monitoring/guide" >}}<i class="icon-network" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Cloud Network Monitoring{{< /nextlink >}}
 {{< nextlink href="/network_monitoring/devices/guide" >}}<i class="icon-ndm" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Network Device Monitoring{{< /nextlink >}}
 {{< /whatsnext >}}
 

content/en/cloud_cost_management/container_cost_allocation.md

@@ -45,15 +45,15 @@ The following table presents the list of collected features and the minimal Agen
 1. For AWS ECS support, set up [**Datadog Container Monitoring**][104] in ECS tasks.
 1. Optionally, enable [AWS Split Cost Allocation][105] for usage-based ECS allocation.
 1. To enable GPU container cost allocation, install the [Datadog DCGM integration][106].
-1. To enable Data transfer cost allocation, set up [Network Performance Monitoring][107]. **Note**: additional charges apply
+1. To enable Data transfer cost allocation, set up [Cloud Network Monitoring][107]. **Note**: additional charges apply
 
 [101]: https://app.datadoghq.com/cost/setup
 [102]: /containers/kubernetes/installation/?tab=operator
 [103]: /infrastructure/containers/orchestrator_explorer?tab=datadogoperator
 [104]: /containers/amazon_ecs/
 [105]: https://docs.aws.amazon.com/cur/latest/userguide/enabling-split-cost-allocation-data.html
 [106]: /integrations/dcgm/?tab=kubernetes#installation
-[107]: /network_monitoring/performance/setup
+[107]: /network_monitoring/cloud_network_monitoring/setup
 
 {{% /tab %}}
 {{% tab "Azure" %}}
@@ -145,15 +145,15 @@ Next, Datadog examines the daily [workload resources][104] running on that node.
 
 **Note**: Only _tags_ from pods and nodes are added to cost metrics. To include labels, enable labels as tags for [nodes][101] and [pods][102].
 
-[Network Performance Monitoring][105] must be enabled on all AWS hosts to allow accurate data transfer cost allocation. If some hosts do not have Network Performance Monitoring enabled, the data transfer costs for these hosts is not allocated and may appear as an `n/a` bucket depending on filter and group-by conditions.
+[Cloud Network Monitoring][105] must be enabled on all AWS hosts to allow accurate data transfer cost allocation. If some hosts do not have Cloud Network Monitoring enabled, the data transfer costs for these hosts is not allocated and may appear as an `n/a` bucket depending on filter and group-by conditions.
 
 Datadog supports data transfer cost allocation using [standard 6 workload resources][104] only. For [custom workload resources][106], data transfer costs can be allocated down to the cluster level only, and not the node/namespace level.
 
 [101]: /containers/kubernetes/tag/?tab=containerizedagent#node-labels-as-tags
 [102]: /containers/kubernetes/tag/?tab=containerizedagent#pod-labels-as-tags
 [103]: https://docs.aws.amazon.com/cur/latest/userguide/what-is-cur.html
 [104]: https://kubernetes.io/docs/concepts/workloads/
-[105]: /network_monitoring/performance/setup
+[105]: /network_monitoring/cloud_network_monitoring/setup
 [106]: https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/
 
 {{% /tab %}}
@@ -246,8 +246,8 @@ Costs are allocated into the following spend types:
 
 | Spend type | Description    |
 | -----------| -----------    |
-| Usage | Cost of data transfer that is monitored by Network Performance Monitoring and allocated. |
-| Not monitored | Cost of data transfer not monitored by Network Performance Monitoring. This cost is not allocated. |
+| Usage | Cost of data transfer that is monitored by Cloud Network Monitoring and allocated. |
+| Not monitored | Cost of data transfer not monitored by Cloud Network Monitoring. This cost is not allocated. |
 
 {{% /tab %}}
 {{% tab "Azure" %}}

content/en/containers/amazon_ecs/_index.md

@@ -202,7 +202,7 @@ To collect Live Process information for all your containers and send it to Datad
 }
 {{< /highlight >}}
 
-#### Network Performance Monitoring
+#### Cloud Network Monitoring
 
 <div class="alert alert-warning">
 This feature is only available for Linux.
@@ -266,7 +266,7 @@ If you already have a task definition, update your file to include the following
  ```
 #### Network Path
 
-<div class="alert alert-info">Network Path for Datadog Network Performance Monitoring is in Preview. Reach out to your Datadog representative to sign up.</div>
+<div class="alert alert-info">Network Path for Datadog Cloud Network Monitoring is in Preview. Reach out to your Datadog representative to sign up.</div>
 
 1. To enable [Network Path][31] on your ECS clusters, enable the `system-probe` traceroute module by adding the following environment variable in your `datadog-agent-sysprobe-ecs.json` file:
 

content/en/containers/guide/kubernetes_daemonset.md

@@ -39,7 +39,7 @@ To install the Datadog Agent on your Kubernetes cluster:
     |                                 |                                 |                                 |                                 | <i class="icon-check-bold"></i> |                                 | [Manifest template][10] | no template                          |
     | <i class="icon-check-bold"></i> |                                 |                                 |                                 |                                 |                                 | [Manifest template][11] | [Manifest template][12]              |
 
-     To enable trace collection completely, [extra steps are required on your application Pod configuration][13]. Refer also to the [logs][14], [APM][15], [processes][16], and [Network Performance Monitoring][17], and [Security][18] documentation pages to learn how to enable each feature individually.
+     To enable trace collection completely, [extra steps are required on your application Pod configuration][13]. Refer also to the [logs][14], [APM][15], [processes][16], and [Cloud Network Monitoring][17], and [Security][18] documentation pages to learn how to enable each feature individually.
 
      **Note**: Those manifests are set for the `default` namespace. If you are in a custom namespace, update the `metadata.namespace` parameter before applying them.
 
@@ -367,7 +367,7 @@ Additional examples are available on the [Container Discover Management][27] pag
 [14]: /agent/kubernetes/log/
 [15]: /agent/kubernetes/apm/
 [16]: /infrastructure/process/?tab=kubernetes#installation
-[17]: /network_monitoring/performance/setup/
+[17]: /network_monitoring/cloud_network_monitoring/setup/
 [18]: /data_security/agent/
 [19]: https://app.datadoghq.com/organization-settings/api-keys
 [20]: /getting_started/site/

content/en/containers/kubernetes/configuration.md

@@ -13,7 +13,7 @@ After you have installed the Datadog Agent in your Kubernetes environment, you m
 ### Enable Datadog to collect:
 - [Traces (APM)](#enable-apm-and-tracing)
 - [Kubernetes events](#enable-kubernetes-event-collection)
-- [NPM](#enable-npm-collection)
+- [CNM](#enable-cnm-collection)
 - [Logs](#enable-log-collection)
 - [Processes](#enable-process-collection)
 
@@ -134,7 +134,7 @@ agents:
 
 For DaemonSet configuration, see [DaemonSet Cluster Agent event collection][14].
 
-## Enable NPM collection
+## Enable CNM collection
 
 {{< tabs >}}
 {{% tab "Datadog Operator" %}}
@@ -183,7 +183,7 @@ helm upgrade -f datadog-values.yaml <RELEASE_NAME> datadog/datadog
 {{% /tab %}}
 {{< /tabs >}}
 
-For more information, see [Network Performance Monitoring][18].
+For more information, see [Cloud Network Monitoring][18].
 
 ## Enable log collection
 
@@ -852,7 +852,7 @@ Starting with Agent v6.4.0 (and v6.5.0 for the Trace Agent), you can override th
 [15]: /infrastructure/containers/
 [16]: /containers/kubernetes/apm
 [17]: /containers/kubernetes/log
-[18]: /network_monitoring/performance/
+[18]: /network_monitoring/cloud_network_monitoring/
 [19]: /developers/dogstatsd
 [20]: https://app.datadoghq.com/orchestration/overview
 [21]: /infrastructure/containers/orchestrator_explorer