diff --git a/src/content/docs/magic-transit/analytics/index.mdx b/src/content/docs/magic-transit/analytics/index.mdx
index 7044df1d6289f81..55dddeecf991ec7 100644
--- a/src/content/docs/magic-transit/analytics/index.mdx
+++ b/src/content/docs/magic-transit/analytics/index.mdx
@@ -18,6 +18,7 @@ import { Render } from "~/components";
analyticsAnchorHeading: "#magic-transit-network-analytics",
networkAnalyticsURL: "/magic-transit/analytics/network-analytics/",
traceRoutes: "/magic-transit/analytics/traceroutes/",
- graphQl: "/magic-transit/"
+ graphQlTunnelBandwidthURL: "/magic-transit/analytics/query-bandwidth/",
+ graphQlTunnelHealthURL: "/magic-transit/analytics/query-tunnel-health/"
}}
/>
\ No newline at end of file
diff --git a/src/content/docs/magic-transit/analytics/network-analytics.mdx b/src/content/docs/magic-transit/analytics/network-analytics.mdx
index e806982a80eea01..8c4f6fa1cf8eeb0 100644
--- a/src/content/docs/magic-transit/analytics/network-analytics.mdx
+++ b/src/content/docs/magic-transit/analytics/network-analytics.mdx
@@ -27,4 +27,4 @@ Refer to [Network Analytics](/analytics/network-analytics/) documentation to lea
## Access Magic Tunnel traffic analytics
-
+
diff --git a/src/content/docs/magic-transit/reference/traffic-steering.mdx b/src/content/docs/magic-transit/reference/traffic-steering.mdx
index 9d193b2e278bb4f..4a7a89c16a79525 100644
--- a/src/content/docs/magic-transit/reference/traffic-steering.mdx
+++ b/src/content/docs/magic-transit/reference/traffic-steering.mdx
@@ -18,6 +18,12 @@ import { Render } from "~/components";
params={{
magicWord: "Magic Transit",
productName: "Magic Transit",
+ mFirewallName: "Magic Firewall",
+ mFirewallURL: "/magic-firewall/",
+ warpClientURL: "/cloudflare-one/connections/connect-devices/warp/",
+ remoteBrowserURL: "/cloudflare-one/policies/browser-isolation/",
+ accessURL: "/cloudflare-one/policies/access/",
+ gatewayURL: "/cloudflare-one/policies/gateway/",
greIpsecReferenceURL: "/magic-transit/reference/gre-ipsec-tunnels/",
createStaticRoute: "/magic-transit/how-to/configure-routes/#create-a-static-route",
editStaticRoute: "/magic-transit/how-to/configure-routes/#edit-a-static-route",
diff --git a/src/content/docs/magic-wan/analytics/index.mdx b/src/content/docs/magic-wan/analytics/index.mdx
index d6b7158e7f49fd1..c959de5ae42fce6 100644
--- a/src/content/docs/magic-wan/analytics/index.mdx
+++ b/src/content/docs/magic-wan/analytics/index.mdx
@@ -19,6 +19,7 @@ import { Render } from "~/components";
analyticsAnchorHeading: "#magic-wan-network-analytics",
networkAnalyticsURL: "/magic-wan/analytics/network-analytics/",
traceRoutes: "/magic-wan/analytics/traceroutes/",
- graphQl: "/magic-wan/"
+ graphQlTunnelBandwidthURL: "/magic-wan/analytics/query-bandwidth/",
+ graphQlTunnelHealthURL: "/magic-wan/analytics/query-tunnel-health/"
}}
/>
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/analytics/network-analytics.mdx b/src/content/docs/magic-wan/analytics/network-analytics.mdx
index 0aba516e5a16eea..8d62dc03e29404b 100644
--- a/src/content/docs/magic-wan/analytics/network-analytics.mdx
+++ b/src/content/docs/magic-wan/analytics/network-analytics.mdx
@@ -6,25 +6,14 @@ sidebar:
head:
- tag: title
content: Magic WAN Network Analytics
-
---
-import { GlossaryTooltip, Render } from "~/components"
-
-Magic WAN customers can view their real-time and historical network data in Network Analytics. Customers can see their network data in a time series that shows Magic WAN traffic (in packets or bytes) over time, and can filter the time series data by different types of [packet](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) characteristics.
-
-
+import { Render } from "~/components";
-Refer to [Network Analytics](/analytics/network-analytics/) documentation to learn more.
-
-## Network traffic data filters
-
-
-
-## Access Magic Tunnel traffic analytics
+ params={{
+ productName: "Magic WAN"
-
+ }}
+/>
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/analytics/site-analytics.mdx b/src/content/docs/magic-wan/analytics/site-analytics.mdx
index 4b6480bac86b7f1..8124db9e4c40169 100644
--- a/src/content/docs/magic-wan/analytics/site-analytics.mdx
+++ b/src/content/docs/magic-wan/analytics/site-analytics.mdx
@@ -15,10 +15,13 @@ import { Render } from "~/components"
file="analytics/site-analytics"
product="networking-services"
params={{
- instructions: "Refer to [Set up a site](/magic-wan/configuration/common-settings/sites/) for more information on how to set up a site."
+ instructions: "Refer to [Set up a site](/magic-wan/configuration/common-settings/sites/) for more information on how to set up a site.",
+ productName: "Magic WAN",
+ magicTunnelHcsURL: "/magic-wan/configuration/common-settings/configure-magic-tunnel-health-alerts/",
+ setGeoCoordinatesURL: "/magic-wan/configuration/common-settings/sites/#set-geographic-coordinates"
}}
/>
-### Set thresholds for Magic WAN site health
+### Set thresholds for site health
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/common-settings/check-tunnel-health-dashboard.mdx b/src/content/docs/magic-wan/configuration/common-settings/check-tunnel-health-dashboard.mdx
index d5c63e017ac098a..5e484de47c43ab2 100644
--- a/src/content/docs/magic-wan/configuration/common-settings/check-tunnel-health-dashboard.mdx
+++ b/src/content/docs/magic-wan/configuration/common-settings/check-tunnel-health-dashboard.mdx
@@ -32,6 +32,11 @@ import { Render } from "~/components";
## Magic WAN Connector
-Magic WAN Connector also includes a heartbeat function, an additional way of communicating its health status which does not depend on successfully setting up any tunnels. The heartbeat function communicates periodically with Cloudflare via HTTPS and lets Cloudflare know that the Connector in question is connected to the Internet and reachable.
-
-Refer to [Heartbeat](/magic-wan/configuration/connector/maintenance/heartbeat/) to learn more.
+
diff --git a/src/content/docs/magic-wan/configuration/common-settings/custom-ike-id-ipsec.mdx b/src/content/docs/magic-wan/configuration/common-settings/custom-ike-id-ipsec.mdx
index e92bd80bdd00a88..9e72143a024bc9a 100644
--- a/src/content/docs/magic-wan/configuration/common-settings/custom-ike-id-ipsec.mdx
+++ b/src/content/docs/magic-wan/configuration/common-settings/custom-ike-id-ipsec.mdx
@@ -5,23 +5,12 @@ sidebar:
order: 6
---
-import { CURL } from "~/components";
+import { Render } from "~/components";
-Magic WAN customers can configure a custom IKE ID for their IPsec tunnels. Customers that are using Magic WAN and a VeloCloud SD-WAN device together should utilize this option to create a high availability configuration.
-
-:::note
-This feature is only available via API. There are no configuration options for a custom IKE ID for an IPsec tunnel in the Cloudflare dashboard.
-:::
-
-VeloCloud has a high availability mechanism that allows customers to specify one set of IKE parameters (like IKE ID) and multiple remote IPs. Customers create an IKE ID, and then assign the same custom IKE ID to their primary IPsec tunnel and their backup IPsec tunnel. FQDN is the only supported type for custom IKE IDs.
-
-Magic WAN customers can set a custom IKE ID for an IPsec tunnel using the following API call. Customers will need to fill in the appropriate values for ``, ``, and the FQDN wildcard before running the API call.
-
-..custom.ipsec.cloudflare.com"}
- }}
-/>
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/common-settings/sites.mdx b/src/content/docs/magic-wan/configuration/common-settings/sites.mdx
index 1d11076519f9f60..4a956d3fd34a544 100644
--- a/src/content/docs/magic-wan/configuration/common-settings/sites.mdx
+++ b/src/content/docs/magic-wan/configuration/common-settings/sites.mdx
@@ -9,62 +9,12 @@ sidebar:
import { Render } from "~/components";
-Sites represent the local network of a data center, office, or other physical location, and combine all on-ramps available there. Sites also allow you to check, at a glance, the state of your on-ramps and set up health alert settings so that you get notified when there are issues with the site's on-ramps.
-
-To use a site, start by setting up your on-ramps. These can be [GRE or IPsec tunnels](/magic-wan/configuration/manually/how-to/configure-tunnel-endpoints/), a [Magic WAN Connector](/magic-wan/configuration/connector/), or a direct [CNI link](/magic-wan/network-interconnect/). When you are finished setting these up, refer to the steps below to learn how to set up a site.
-
-## Add a site
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Network overview (beta)**.
-3. Select **Add site**.
-4. Add a name and description for your new site. Optionally, you can also add the geographical coordinates for your site in **Latitude** and **Longitude**. If you add geographical coordinates, once created your site's location will show in the map.
-5. Select **Create and continue**.
-6. Choose one or more on-ramps for your site from the list. Remember to only choose the on-ramps available to that particular site, as the list might show on-ramps available on other locations.
-7. Select **Continue**.
-8. In **Define alert settings** you set up alerts to notify you when there are issues with your site's on-ramps. If you want to set up alerts later, select **Skip this for now** to complete your setup. Otherwise, continue reading.
-9. In **Magic WAN Health Check Alert** > **Notification name**, enter a name for the site's alert.
-10. Under **Alert settings**, choose how you want to be notified when there is an issue. You can add webhooks as well as email addresses.
-11. In **Alert sensitivity level** define the threshold for Magic Tunnel health alerts to be fired. Refer to [How Cloudflare calculates Magic Tunnel health alerts](/magic-wan/reference/how-cloudflare-calculates-magic-tunnel-health-alerts/) for more information.
-12. Select **Complete setup** to finish setting up your site.
-
-Your site is now set up. If you have other sites you need to set up, repeat the steps above. If you did not set up alerts, we strongly recommend that you do it. Otherwise you will not be notified when there is a problem with one of your on-ramps.
-
----
-
-## Site analytics
-
-
-
----
-
-## Edit a site
-
-### Add or remove on-ramps
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Network overview (beta)**.
-3. Find your site in **Traffic overview** > select the three dots in front of it > **Edit**.
-4. Select **On-ramps**.
-5. Select **Add** to add a new on-ramp.
-6. If you want to remove an on-ramp, select the three dots in front of your on-ramp > **Remove**.
-
-### Set geographic coordinates
-
-If you add geographic coordinates to your site, it will show up in the Network map. To set up or edit geographic coordinates to an existing site:
-
-1. Go to **Magic WAN** > **Network overview (beta)**.
-2. Find your site in **Traffic overview** > select the three dots in front of it > **Edit**.
-3. In **Basic information**, edit your site's **Latitude** and **Longitude** coordinates.
-4. Select **Save**.
-
-### Set thresholds for Magic WAN site health
-
+ params={{
+ greIpsecTunnelsURL: "/magic-wan/configuration/manually/how-to/configure-tunnel-endpoints/",
+ connectorURL: "/magic-wan/configuration/connector/",
+ cniURL: "/magic-wan/network-interconnect/"
+ }}
+ />
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/index.mdx b/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/index.mdx
index c9de16ae5219773..09517f8e6100302 100644
--- a/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/index.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/index.mdx
@@ -13,10 +13,24 @@ import { Render } from "~/components";
params={{
magicWord: "hardware",
productName: "Magic WAN Connector",
+ maintenanceURL: "/magic-wan/configuration/connector/maintenance/",
+ productOriginalName: "Magic WAN",
+ sfpURL: "/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information/",
wan: "refers to the physical Magic WAN Connector Ethernet port that you are using for your WAN. The ports are labeled `GE1`, `GE2`, `GE3`, `GE4`, `GE5`, and `GE6`. Choose the number corresponding to the port that you are using in Connector. If you need a throughput higher than 1 Gbps, you can use one of the SFP+ ports. Refer to [SFP+ port information](/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information/) for more information on the hardware supported.",
lan: "refers to the physical Magic WAN Connector Ethernet port that you are using for your WAN. The ports are labeled `GE1`, `GE2`, `GE3`, `GE4`, `GE5`, and `GE6`. Choose a number corresponding to the port that you are using in Connector. If you need a throughput higher than 1 Gbps, you can use one of the SFP+ ports. Refer to [SFP+ port information](/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information/) for more information on the hardware supported.",
noConnectorShows: "You need to have bought a Connector already for it to show up here. Refer to [Prerequisites](#prerequisites) if no Connector shows up in this list.",
+ networkSegmentationURL: "/magic-wan/configuration/connector/network-options/network-segmentation/",
+ dhcpServerURL: "/magic-wan/configuration/connector/network-options/dhcp/dhcp-server/",
+ dhcpRelayURL: "/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay/",
+ reserveIpAddressesURL: "/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation/",
shippedLanguage: "The Magic WAN Connector is shipped to you deactivated",
hardSoftConn: "You need to deploy two Connectors in your premises before you can set up a site in high availability.",
- finalInstructions: "Follow the instructions in [Set up your Magic WAN Connector](#set-up-your-magic-wan-connector) and [Activate Connector](#activate-connector) to finish setting up your Connectors."
+ hcConfigsURL: "/magic-wan/configuration/connector/reference/#high-availability-configurations",
+ finalInstructions: "Follow the instructions in [Set up your Magic WAN Connector](#set-up-your-magic-wan-connector) and [Activate Connector](#activate-connector) to finish setting up your Connectors.",
+ ipsecTunnelsRefURL: "/magic-wan/reference/gre-ipsec-tunnels/#ipsec-tunnels",
+ staticRoutesRefURL: "/magic-wan/reference/traffic-steering/",
+ networkOptionsURL: "/magic-wan/configuration/connector/network-options/",
+ maintenanceURL: "/magic-wan/configuration/connector/maintenance/",
+ referenceInformationURL: "/magic-wan/configuration/connector/reference/",
+ troubleshootingURL: "/magic-wan/configuration/connector/troubleshooting/"
}} />
diff --git a/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information.mdx b/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information.mdx
index 436e85e5cea56da..615f661ff138e7d 100644
--- a/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information.mdx
@@ -4,44 +4,11 @@ title: SFP+ port information
---
-The hardware version of the Magic WAN connector includes two [SFP+ ports](https://en.wikipedia.org/wiki/Small_Form-factor_Pluggable) that support 10G throughput. These ports can be configured as either a WAN or a LAN port, like all of the 1G RJ45 ports in the machine. Because a 10G WAN uplink will often be bottlenecked by IPsec tunnel speeds, the SFP+ ports are most useful for configuring high speed LANs, and for using fiber connections.
-
-:::note[Virtual Connector and SFP+ ports]
-Since you decide and set up the hardware where Magic WAN Virtual Connector runs, you can ignore the information on this page.
-:::
-
-## Port configuration
-
-SFP+ ports are next to the regular LAN ports. They are represented as follows in the dashboard:
-
-- SFP+ **port 1** is represented by **port 7** in the dashboard
-- SFP+ **port 2** is represented by **port 8** in the dashboard
-
-
-
-_The left port, SFP+ 1, is port 7. The right port, SFP+ 2, is port 8._
-
-## SFP+ module compatibility
-
-The Magic WAN Connector only supports 10Gbps SFP+ modules, including RJ45, DAC, and fiber, among others. Many 1 Gbps modules are incompatible with the Intel driver used internally, and thus are not supported.
-
-Cloudflare supports the following SFP+ inputs:
-
-- 10 Gbps Intel-compatible optics using 10GBase-SR, LR, ER. This includes Intel-compatible active optical cables (AOC) cables at 10 Gbps.
-- 10 Gbps DAC Twinax cables, compatible with SFF-8431 v4.1 and SFF-8472 v10.4
-- 10GBASE-T RJ45 converter modules
-
-Cloudflare successfully deployed commonly available 10G modules that are also compatible across many vendors:
-
-- StarTech Dell EMC Twinax SFP+ DAC
-- Ubiquiti multi-mode, duplex, 10 Gbps fiber transceiver modules
-
-Keep in mind that SFP+ modules/cables have to be compatible at both ends, that is, both sides of the connection should be 10 Gbps, and it should really be the same module/cable that is compatible with both hardware stacks. The choice of module/optic/cable ultimately depends on your specific interoperability needs, and it is much less of a "plug and play" situation as one expects from RJ45.
-
-## Recover from unsupported SFP+ inputs
-
-SFP+ modules should be installed and tested prior to deploying a Connector into production usage.
-
-An unsupported SFP+ input is indicated by the interface failing to come up (that is, the Connector has no status lights), and also by the port (7 or 8) going offline until the hardware is rebooted.
-
-When an unsupported module is plugged, the module should be removed and then the Connector rebooted by removing power for five seconds. The module should not remain plugged during reboot, or the Connector will have to be rebooted again after the module is removed.
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/configure-virtual-connector.mdx b/src/content/docs/magic-wan/configuration/connector/configure-virtual-connector.mdx
index 58b3aead6cd583a..acf5c37bc6c4257 100644
--- a/src/content/docs/magic-wan/configuration/connector/configure-virtual-connector.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/configure-virtual-connector.mdx
@@ -12,11 +12,25 @@ import { Render } from "~/components";
product="networking-services"
params={{
magicWord: "virtual",
- productName: "Virtual Connector",
+ productName: "Magic WAN Connector",
+ productNameVirtual: "Virtual Connector",
+ maintenanceURL: "/magic-wan/configuration/connector/maintenance/",
+ productOriginalName: "Magic WAN",
wan: "needs to correspond to the virtual network interface on the Virtual Connector instance you have set up in VMware. Following our example from the previous steps, you need to choose port `1` since that is what corresponds to the `eno1` port we set up in VMware.",
lan: "needs to correspond to the virtual LAN interface on the Virtual Connector instance you have set up in VMware. Following our example from the previous steps, you need to choose port `2` since that is what corresponds to the `eno2` port we set up in VMware.",
noConnectorShows: "For a Virtual Connector to show up you need to:
VMWare: Have already obtained your OVA package and license keys if you are installing on VMWare.
Proxmox: Have already obtained your Virtual Connector Script and license keys if you are installing on Proxmox.
\nFor more information, refer to [Configure a virtual machine](#configure-a-virtual-machine) and select the appropriate tab.\n",
+ networkSegmentationURL: "/magic-wan/configuration/connector/network-options/network-segmentation/",
+ dhcpServerURL: "/magic-wan/configuration/connector/network-options/dhcp/dhcp-server/",
+ dhcpRelayURL: "/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay/",
+ reserveIpAddressesURL: "/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation/",
shippedLanguage: "Virtual Magic WAN Connector is deactivated after you install it",
hardSoftConn: "You need to install two Virtual Connectors before you can set up a site in high availability.",
- finalInstructions: "Follow the instructions in [Activate Connector](#activate-connector) to finish setting up your Connectors."
+ hcConfigsURL: "/magic-wan/configuration/connector/reference/#high-availability-configurations",
+ finalInstructions: "Follow the instructions in [Activate Connector](#activate-connector) to finish setting up your Connectors.",
+ ipsecTunnelsRefURL: "/magic-wan/reference/gre-ipsec-tunnels/#ipsec-tunnels",
+ staticRoutesRefURL: "/magic-wan/reference/traffic-steering/",
+ networkOptionsURL: "/magic-wan/configuration/connector/network-options/",
+ maintenanceURL: "/magic-wan/configuration/connector/maintenance/",
+ referenceInformationURL: "/magic-wan/configuration/connector/reference/",
+ troubleshootingURL: "/magic-wan/configuration/connector/troubleshooting/"
}} />
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/device-metrics.mdx b/src/content/docs/magic-wan/configuration/connector/device-metrics.mdx
index 516b1404596a6e0..f1c4ab8f23885ba 100644
--- a/src/content/docs/magic-wan/configuration/connector/device-metrics.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/device-metrics.mdx
@@ -5,76 +5,13 @@ sidebar:
order: 8
---
-Cloudflare customers can inspect metrics for a specific Magic WAN Connector in the Cloudflare dashboard. These metrics help you troubleshoot potential issues with your Connector. Refer to [Troubleshooting](/magic-wan/configuration/connector/troubleshooting/) for more information.
-
-## Query metrics with GraphQL
-
-Customers can query Cloudflare's GraphQL API to fetch their Magic WAN Connector device metrics. The Cloudflare dashboard displays Magic WAN Connector device metrics over the past one hour. Via the GraphQL API, customers can query for up to 30 days of historical Magic WAN Connector device metrics.
-
-For example:
-
-```graphql graphql-api-explorer
-query telemetry(
- $accountTag: string
- $snapshotsFilter: AccountMconnTelemetrySnapshotsAdaptiveGroupsFilter_InputObject!
- $snapshotMountsFilter: AccountMconnTelemetrySnapshotMountsAdaptiveGroupsFilter_InputObject!
- $snapshotThermalsFilter: AccountMconnTelemetrySnapshotThermalsAdaptiveGroupsFilter_InputObject!
- $limit: int64!
-) {
- viewer {
- accounts(filter: { accountTag: $accountTag }) {
- snapshots: mconnTelemetrySnapshots(
- filter: $snapshotsFilter
- limit: $limit
- orderBy: [datetimeFiveMinutes_DESC]
- ) {
- max {
- cpuCount
- loadAverage1m
- memoryFreeBytes
- memoryTotalBytes
- }
- dimensions {
- connectorId
- datetimeFiveMinutes
- }
- }
- snapshotMounts: mconnTelemetrySnapshotMounts(
- filter: $snapshotMountsFilter
- limit: $limit
- orderBy: [datetimeFiveMinutes_DESC]
- ) {
- max {
- availableBytes
- totalBytes
- }
- dimensions {
- connectorId
- datetimeFiveMinutes
- }
- }
- snapshotThermals: mconnTelemetrySnapshotThermals(
- filter: $snapshotThermalsFilter
- limit: $limit
- orderBy: [datetimeFiveMinutes_DESC, connectorId_DESC]
- ) {
- max {
- currentCelcius
- }
- dimensions {
- connectorId
- datetimeFiveMinutes
- }
- }
- }
- }
-}
-```
-
-### Average CPU load explained
-
-The metric `average CPU load` is unique and distinctly different from `CPU utilization` which is another common CPU metric. The Magic WAN connector uses a [Unix-style CPU load calculation]().
-
-CPU load is a measure of the number of processes that are currently running and that are waiting to be run on the CPU. Cloudflare collects the one minute load average from the device and converts that into a percentage based on the total number of cores in the CPU. If the Magic WAN Connector CPU has eight cores, and a one minute load average of two, then the average CPU load is 25%. If the average CPU load is above 100%, then there are processes in the queue that are waiting to be executed on the CPU.
-
-Cloudflare is still evaluating the typical CPU load operating range on the MWAN Connector. In general, a healthy range for average CPU load on any device is between 30% and 70%. Customers may experience decreased MWAN Connector performance if the average CPU load is consistently above 100%.
\ No newline at end of file
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/index.mdx b/src/content/docs/magic-wan/configuration/connector/index.mdx
index b7582dc6aa6fd59..23bb96696dbfbc1 100644
--- a/src/content/docs/magic-wan/configuration/connector/index.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/index.mdx
@@ -5,16 +5,16 @@ sidebar:
order: 1
---
-import { DirectoryListing, GlossaryTooltip } from "~/components";
+import { Render } from "~/components";
-The Magic WAN Connector is a lightweight appliance you can install in corporate network locations to automatically connect, steer, and shape any IP traffic through [secure IPsec tunnels](/magic-wan/configuration/connector/reference/#security-and-other-information). Magic WAN Connector is the easiest way to onboard your network locations to Cloudflare One. It is managed remotely through the Cloudflare dashboard, so you do not require an onsite IT team.
-
-You can [purchase Magic WAN Connector](/magic-wan/configuration/connector/configure-hardware-connector/) software pre-installed on a Cloudflare-certified device, or download and deploy [Virtual Magic WAN Connector (Virtual Connector)](/magic-wan/configuration/connector/configure-virtual-connector/) in your own infrastructure.
-
-Either option ensures the best possible connectivity to the closest Cloudflare network location, where Cloudflare will apply security controls and send traffic on an optimized route to its destination.
-
-Magic WAN Connector has the same type of support process as other Cloudflare Enterprise products. Contact your team account manager to learn more.
-
-Review this section to learn how to configure and deploy Magic WAN Connector.
-
-
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/activate-connector.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/activate-connector.mdx
index afc01314f0a76fa..7bf8f4735b45587 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/activate-connector.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/activate-connector.mdx
@@ -5,7 +5,13 @@ sidebar:
order: 2
---
-Before you can activate your Connector, you need to follow Cloudflare's instructions regarding DHCP. For full instructions on this, refer to:
+import { Render } from "~/components";
-- The [hardware version of Connector](/magic-wan/configuration/connector/configure-hardware-connector/#activate-connector)
-- The [virtual version of Connector](/magic-wan/configuration/connector/configure-virtual-connector/#activate-connector)
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/add-remove-connectors.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/add-remove-connectors.mdx
index ffa51605f427c89..f8b3c94769a542f 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/add-remove-connectors.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/add-remove-connectors.mdx
@@ -5,11 +5,12 @@ sidebar:
order: 4
---
-To add a new Connector you first need to remove the one associated with the on-ramp. You can only have more than one Connector if you initially enabled high availability on your on-ramp.
+import { Render } from "~/components";
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
-3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
-4. In **Connectors**, remove the Connector associated with the on-ramp.
-5. Select **Add Connector** to add a different Connector to your on-ramp.
-6. Select **Save**.
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/deactivate-connector.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/deactivate-connector.mdx
index 94b3558dde921c5..4ba8ec9866b093e 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/deactivate-connector.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/deactivate-connector.mdx
@@ -6,12 +6,9 @@ sidebar:
---
-import { DashButton } from '~/components';
+import { Render } from "~/components";
-1. In the Cloudflare dash, go to the **Configuration* page.
-
-
-
-2. In the **Connectors** tab, find the Connector you want to deactivate, select the three dots next to it > **Edit**.
-3. In **Status**, select _Deactivated_ from the dropdown.
-4. Select **Update**.
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/default-password.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/default-password.mdx
index 26e31195b694faa..8ef0a1523cc7aa8 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/default-password.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/default-password.mdx
@@ -6,14 +6,14 @@ sidebar:
order: 8
---
-Magic WAN Connector ships to you with a default password that enables you to access the hardware box or the virtual machine. Cloudflare recommends that you change this password after the first boot.
+import { Render } from "~/components";
-## Default password to access hardware Connector
-
-Your Connector's default password is the serial number (also known as a Service Tag for Dell devices), all uppercase followed by an `!` (exclamation mark). For example, `A1B2C3D!`
-
-## Default password to access Virtual Connector
-
-Your Virtual Connector's default password is the last seven characters of your license key, all uppercase, plus an `!` (exclamation mark).
-
-For example, if your license key is `mconn-abcdefghijklmnopqrstuvwxyz`, your default password will be `TUVWXYZ!`.
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-basic-info.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-basic-info.mdx
index 3b8a535f786b5cd..59d8a09b7b009ff 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-basic-info.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-basic-info.mdx
@@ -5,12 +5,9 @@ sidebar:
order: 3
---
-import { DashButton } from "~/components";
+import { Render } from "~/components";
-In **Basic information**, you can change the name and description of your on-ramp.
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
-3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
-4. In **Basic information** make the necessary changes.
-5. Select **Save**.
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-network-settings.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-network-settings.mdx
index a982bbbd8ae55ab..a238e5749ff0980 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-network-settings.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-network-settings.mdx
@@ -5,10 +5,9 @@ sidebar:
order: 5
---
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
-3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
-4. Go to **Network configuration** > **WAN configuration** or **LAN configuration**.
-5. Find the WAN/LAN you want to edit > select the three dots next to it > **Edit**.
-6. Make the necessary changes.
-7. Select **Save**.
\ No newline at end of file
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-sites.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-sites.mdx
index 711c384e4589bf8..cd330ac76e6ecb8 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-sites.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-sites.mdx
@@ -5,8 +5,9 @@ sidebar:
order: 7
---
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Network overview (beta)**.
-3. Find the site you want to make changes on > select the three dots next to it > **Edit**.
-4. In **Basic information**, make changes to the site's name, description, and geographic coordinates.
-5. In **On-ramps**, add new on-ramps to your site. You can also remove existing ones.
\ No newline at end of file
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-traffic-steering-settings.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-traffic-steering-settings.mdx
index c650cc713f91fc4..126f7cb285fb49e 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/edit-traffic-steering-settings.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/edit-traffic-steering-settings.mdx
@@ -5,11 +5,9 @@ sidebar:
order: 6
---
-You can only add or remove applications to Breakout traffic and Prioritized traffic. To add or remove applications:
+import { Render } from "~/components";
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
-3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
-4. Go to **Traffic steering** > **Breakout traffic** or **Prioritized traffic**.
-5. Select **Add** to add a new application.
-6. To delete an application, find the one you want to delete from **Breakout traffic** or **Prioritized traffic** > select the three dots next to it > **Remove**.
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/heartbeat.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/heartbeat.mdx
index 383d085848ce020..cb8a055a007fd85 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/heartbeat.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/heartbeat.mdx
@@ -6,22 +6,12 @@ sidebar:
---
-import { DashButton } from '~/components';
-
-Magic WAN Connector communicates periodically with Cloudflare via HTTPS. This is also known as a heartbeat, and lets Cloudflare know that the Connector in question is connected to the Internet and reachable.
-
-The heartbeat calls are made to `api.cloudflare.com`. Each Connector has a heartbeat frequency of 10 seconds, independently of the number of WAN interfaces you have running on your device.
-
-There are three symbols for the heartbeat signal that allow you to quickly check the status of Magic WAN Connector:
-
-- **Blue `i`**: Magic WAN Connector is contacting Cloudflare as expected.
-- **Yellow triangle**: Magic WAN Connector has not yet connected to Cloudflare.
-- **Red triangle**: There is a potential problem with Magic WAN Connector.
-
-### Access Magic WAN Connector's heartbeat
-
-1. In the Cloudflare dash, go to the **Configuration* page.
-
-
-
-2. In the **Connectors** tab, find your Connector, and place your cursor over the icon on the **Status** column to check the timestamp. The timestamp shows you the last time Connector successfully contacted Cloudflare.
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/interrupt-service-window.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/interrupt-service-window.mdx
index a48ad747e2397a3..1111317b3cad61a 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/interrupt-service-window.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/interrupt-service-window.mdx
@@ -8,16 +8,12 @@ sidebar:
---
-import { DashButton } from '~/components';
+import { Render } from "~/components";
-The Interrupt window defines when Magic WAN Connector can update its systems. When Magic WAN Connector is updating, this may result in an interruption to existing connections. Set up a time window that minimizes disruption to your sites.
-
-1. In the Cloudflare dash, go to the **Configuration* page.
-
-
-
-2. In the **Connectors** tab, select the Connector for which you want to set up the update window > **Edit**.
-3. In **Interrupt window**, select the most appropriate time for the Connector to update its systems:
- - **Timezone**: Select the time zone for the Connector to update.
- - **Start time**: Choose an hour for the Connector to start updating. Cloudflare recommends you choose an hour when there is minimal activity in your network, to avoid potential disruptions.
- - **Duration**: Duration indicates the time window during which the Connector is scheduled to update. For example, if you configure your Connector to update at `22:00` and specify a **Duration** of `4 hours`, the Connector will attempt to update within the four-hour period following `22:00`.
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/maintenance/register-appliance.mdx b/src/content/docs/magic-wan/configuration/connector/maintenance/register-appliance.mdx
index bb35753195c252f..a9c631d54848c61 100644
--- a/src/content/docs/magic-wan/configuration/connector/maintenance/register-appliance.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/maintenance/register-appliance.mdx
@@ -10,4 +10,4 @@ import { Render } from "~/components";
To set up and use a hardware Magic WAN Connector box, you first need to register it with your account. This is not applicable to Virtual Magic WAN Connector.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/breakout-traffic.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/breakout-traffic.mdx
index 41ba1bd88f006f8..ce8815b5a7f4887 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/breakout-traffic.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/breakout-traffic.mdx
@@ -8,10 +8,12 @@ description: Breakout traffic allows you to define which applications should
import { Render } from "~/components";
-
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/index.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/index.mdx
index 286452043578844..a52f82eb5297be1 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/index.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/index.mdx
@@ -4,16 +4,12 @@ title: Application-aware policies
---
-import { DirectoryListing } from "~/components"
-
-In addition to traffic policies based on network-layer attributes like IP and port ranges, the Magic WAN Connector supports the ability to classify traffic based on well-known applications. Application-aware policies provide easier management and more granularity over traffic flows.
-
-Cloudflare's implementation of application awareness leverages the intelligence of our global network, using the same categorization/classification already shared across security tools like our [Secure Web Gateway](/cloudflare-one/policies/gateway/), so IT and security teams can expect consistent behavior across routing and inspection decisions.
-
-For more information, refer to [Applications and app types](/cloudflare-one/policies/gateway/application-app-types/).
-
-Magic WAN Connector's ability to classify traffic allows you to define which applications should bypass Cloudflare's security filtering, and go directly to the Internet. You can also give some applications a higher priority, and Connector will process them first. This is useful when your network is at capacity, for example.
-
-Refer to the following pages for more information.
-
-
+import { Render } from "~/components"
+
+
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/prioritized-traffic.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/prioritized-traffic.mdx
index 691b2479fee6b07..b410411c750b633 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/prioritized-traffic.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/application-based-policies/prioritized-traffic.mdx
@@ -8,10 +8,11 @@ description: Prioritized traffic allows you to define which applications are
import { Render } from "~/components";
-
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay.mdx
index c28f30fcb00b6c8..421a6662bbdce23 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay.mdx
@@ -3,69 +3,14 @@ pcx_content_type: how-to
title: DHCP relay
---
-import { APIRequest, Render, TabItem, Tabs } from "~/components";
+import { Render } from "~/components";
-DHCP Relay provides a way for DHCP clients to communicate with DHCP servers that are not available on the same local subnet/broadcast domain. When you enable DHCP Relay, Magic WAN Connector forwards DHCP discover messages to a predefined DHCP server, and routes the responses back to the original device that sent the discover message.
-```mermaid
-flowchart LR
-accTitle: An example of Connector in DHCP Relay mode
- a(Magic WAN Connector) <--> b(Cloudflare/Magic WAN) <--> c(DHCP server)
-
- subgraph Site A
- d[LAN 1] <--> a
- e[LAN 2] <--> a
- end
-
- subgraph Site B
- c
- end
- classDef orange fill:#f48120,color: black
- class a,b,c orange
-```
-
-_The above graph shows Connector sending DHCP discover messages to a DHCP server offsite._
-
-:::caution
-DHCP relay will not work if your DHCP server is behind a [Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/). To enable DHCP relay functionality, use either a Magic WAN tunnel or a CNI connection.
-:::
-
-To configure DHCP relay:
-
-
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
-3. Select your Connector > **Edit**.
-4. Select **Network Configuration**.
-5. In **LAN configuration**, select the LAN where you need to configure DHCP relay.
-6. Select **Edit**.
-7. Select **This is a DHCP Relay**.
-8. In **Upstream DHCP server addresses**, enter the IP address of your DHCP server.
-9. (Optional) If you need to add more DHCP server addresses, select **Add upstream DHCP server address** as many times as needed, and enter the new values.
-
-
-
-
-
-Create a [`PUT` request](/api/resources/magic_transit/subresources/sites/subresources/lans/methods/update/) to update the LAN where you want to enable DHCP relay:
-
-Example:
-
-
-
-
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-server.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-server.mdx
index d92369fb8d2c7a4..c7920a59701e5df 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-server.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-server.mdx
@@ -3,45 +3,12 @@ pcx_content_type: how-to
title: DHCP server
---
-import { APIRequest, Render, TabItem, Tabs, DashButton } from "~/components";
+import { Render } from "~/components";
-When you use a static IP address, Magic WAN Connector can also act as a DHCP server in your network. To enable this feature:
+
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
-3. Select the Connector you want to configure > **Edit**.
-4. Select **Network Configuration**, and scroll down to **LAN configuration**.
-5. In **LAN configuration**, select the LAN where you want to enable DHCP server.
-6. Select **Edit**.
-7. Under **Static addressing**, select **This is a DHCP Server**. You also have to specify:
- - The DNS server address. You can have more than one IP address. Select **Add DNS Server** for each server you want to add.
- - The DHCP pool start
- - The DHCP pool end
-
-
-
-
-
-Create a [`PUT` request](/api/resources/magic_transit/subresources/sites/subresources/lans/methods/update/) to update the LAN where you want to enable DHCP server:
-
-Example:
-
-",
- "dhcp_pool_start": "",
- "dns_server": ""
- }
- }
- }
- }}
-/>
-
-
+ />
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation.mdx
index f89f6407ced6321..83707437660a232 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation.mdx
@@ -3,41 +3,11 @@ pcx_content_type: how-to
title: DHCP static address reservation
---
-import { APIRequest, Render, TabItem, Tabs } from "~/components";
-
-If you configure your Connector to be a DHCP server, you can also assign IP addresses to specific devices on your network. To reserve IP addresses:
-
-
-
-1. Configure your Connector to be a [DHCP server](/magic-wan/configuration/connector/network-options/dhcp/dhcp-server/).
-2. Select **Add DHCP Reservation**.
-3. In **Hardware Address** enter the [MAC address](https://en.wikipedia.org/wiki/MAC_address) for the device you want a specific IP address for.
-4. In **IP Address**, enter the IP address for that device.
-5. (Optional) If you need to reserve more IP addresses, select **Add DHCP Reservation** as many times as needed, and enter the new values.
-
-
-
-
-
-Create a [`PUT` request](/api/resources/magic_transit/subresources/sites/subresources/lans/methods/update/) to update the LAN where you want to reserve addresses:
-
-Example:
-
-": "",
- "": ""
- }
- }
- }
- }
- }}
-/>
-
-
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/nat-subnet.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/nat-subnet.mdx
index 0acda58c988789f..ac668336bd355a4 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/nat-subnet.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/nat-subnet.mdx
@@ -5,21 +5,15 @@ description: Enable static NAT for subnets in Magic WAN Connector to re-use add
---
-Each subnet (directly-attached or routed) must have a unique address space within your Magic WAN. You can re-use address spaces locally by enabling static network address translation (NAT) for a subnet. NAT is static. This means that inbound connections - from Magic WAN to the site behind the Connector - are allowed, and connections do not have to be initiated by hosts behind the Connector. NAT is also 1:1, that is, the Connector will translate between corresponding addresses in two equal-sized prefixes.
-
-To enable NAT, supply a WAN-facing address prefix the same size as the subnet's prefix, and the Magic WAN Connector will translate between the two.
-
-For example:
-
-- **Prefix**: `192.168.100.0/24`
-- **Static NAT prefix**: `10.10.100.0/24`
-
-With the example above, outbound traffic from host `192.168.100.13` in the subnet is translated to `10.10.100.13` in the Connector (and vice versa for incoming traffic).
-
-:::note
-Even if NAT is enabled, the local prefix for a subnet must be unique within its LAN. It can, however, be reused on other LANs or other sites. Overlay-facing prefixes - that is, a subnet's NAT prefix if NAT is enabled, and its local prefix otherwise - must always be unique across your whole Magic WAN.
-:::
-
-## Create NATs for subnets
-
-For more information on how to a create a NAT for a subnets, refer to **Create a LAN**, either in [Configure hardware Connector](/magic-wan/configuration/connector/configure-hardware-connector/#create-a-lan) or [Configure virtual Connector](/magic-wan/configuration/connector/configure-virtual-connector/#create-a-lan).
+import { Render } from "~/components"
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/network-segmentation.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/network-segmentation.mdx
index f27eca4bfd75859..b86dac1cf25f0ac 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/network-segmentation.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/network-segmentation.mdx
@@ -4,277 +4,15 @@ title: Network segmentation
description: Define policies to define if traffic should flow between your LANs without leaving your local premises, or if traffic should be forwarded to Cloudflare for additional security configurations.
---
-import { APIRequest, Render, TabItem, Tabs } from "~/components";
+import { Render } from "~/components"
+
+
-You can define policies in your Connector to either allow traffic to flow between your LANs without it leaving your local premises or to forward it via the Cloudflare network where you can add additional security features. The default behavior is to drop all LAN-to-LAN traffic. These policies can be created for specific subnets, and link two LANs.
-
-```mermaid
-flowchart LR
-accTitle: In this example, there are LANs where traffic flows between each other, instead of going to Cloudflare first.
- a(Magic WAN Connector) <---> b(Internet) <---> c(Cloudflare)
-
- subgraph Customer site
- d[LAN 1] <---> a
- e[LAN 2] <---> a
- g[LAN 3] <---> a
- h[LAN 4] <---> a
- end
- classDef orange fill:#f48120,color: black
- class a,c orange
-
- linkStyle 0,1,2,3 stroke:#f48120,stroke-width:3px
- linkStyle 4,5 stroke:red,stroke-width:3px
-```
-
-_In the above example, the red path shows traffic that stays in the customer's premises (allowing direct communication between LAN 3 and LAN 4), and the orange path shows traffic that goes to Cloudflare before returning to the customer's premises (processing traffic between LAN 1 and LAN 2 in Cloudflare)._
-
-
-
-As a best practice for security, we recommend sending all traffic through Cloudflare’s network for Zero Trust security filtering. Use these policies with care and only for scenarios where you have a hard requirement for LAN-to-LAN traffic flows.
-
-If you enable LAN to LAN traffic flows, communications can only be initiated from origin to destination — for example, LAN 1 to LAN 2 — and not the other way around. This is by design and prevents potential exfiltration of information. This does not mean bidirectional communication on TCP is not possible. It only means that the origin is the only one authorized to initiate communications.
-
-Unidirectional communication can be enabled for UDP and ICMP, but it is not available for TCP, as it would break that protocol.
-
-The following guide assumes you have already created a site and configured your Connector. To learn how to create a site and configure your Connector, refer to [Configure hardware Connector](/magic-wan/configuration/connector/configure-hardware-connector/) or [Configure virtual connector](/magic-wan/configuration/connector/configure-virtual-connector/), depending on the type of Magic WAN Connector you have on your premises.
-
-## Create a policy
-
-
-
-Follow the steps below to create a new LAN policy to segment your network. Only the fields marked **required** are mandatory.
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Connector on-ramps (beta)**.
-3. Select the Connector you want to configure > **Edit**.
-4. Go to **Network Configuration**, and scroll down to **LAN configuration**.
-5. Select **LAN policies** > **Create Policy**.
-6. In **Policy name**, enter a descriptive name for the policy you are creating.
-7. From the drop-down menu **Origin (required)**, select your origin LAN.
-8. Specify a subnet for your first LAN in **Subnets**.
-9. In **Ports** specify the TCP/UDP ports you want to use. Valid ports range from `1` to `65535`. Zero (`0`) is not a valid port number. Add a comma to separate each of the ports or add a port range. For example, `2,5,6,9-14`.
-10. In **Destination (required)**, select the destination LAN and repeat the above process to configure it.
-11. In **Protocols**, select the type of traffic you want to allow. You can choose **TCP**, **UDP**, and **ICMP**. You can also select **Any** to choose all types of traffic.
-12. In **Traffic direction** you can choose between bidirectional traffic (the default) and unidirectional traffic. What you can choose depends on the protocol that you chose for the policy:
- 1. **Any**: If **Any** is selected and you choose **Unidirectional**, the system will alert you that this will break TCP traffic.
- 2. **TCP**: You can only select **Bidirectional**.
- 3. **UDP**: The system defaults to **Bidirectional** but you can choose **Unidirectional**.
- 4. **ICMP**: The system defaults to **Bidirectional** but you can choose **Unidirectional**.
-13. In **Traffic path**, select **Forwarded via Cloudflare** if you want traffic to be forwarded to Cloudflare to be processed. If you do not select this option, traffic will flow locally, in your premises without passing through Cloudflare.
-14. Select **Create policy**.
-
-The new policy will ensure that traffic between the specified LANs flows locally, bypassing Cloudflare.
-
-
-
-
-
-Create a `POST` request [using the API](/api/resources/magic_transit/subresources/sites/subresources/acls/methods/create/) to create a network policy.
-
-Example:
-
-",
- "forward_locally": true,
- "lan_1": {
- "lan_id": "",
- "lan_name": "",
- "ports": [
- 1
- ],
- "subnets": [
- "192.0.2.1"
- ]
- },
- "lan_2": {
- "lan_id": "",
- "lan_name": "",
- "protocols": [
- "tcp"
- ]
- }}
-/>
-
-```json output
-{
- "errors": [
- {
- "code": 1000,
- "message": "message"
- }
- ],
- "messages": [
- {
- "code": 1000,
- "message": "message"
- }
- ],
- "result": {
- "id": "023e105f4ecef8ad9ca31a8372d0c353",
- "description": "Allows local traffic between PIN pads and cash register.",
- "forward_locally": true,
- "lan_1": {
- "lan_id": "lan_id",
- "lan_name": "lan_name",
- "port_ranges": [
- "8080-9000"
- ],
- "ports": [
- 1
- ],
- "subnets": [
- "192.0.2.1"
- ]
- },
- "lan_2": {
- "lan_id": "lan_id",
- "lan_name": "lan_name",
- "port_ranges": [
- "8080-9000"
- ],
- "ports": [
- 1
- ],
- "subnets": [
- "192.0.2.1"
- ]
- },
- "name": "PIN Pad - Cash Register",
- "protocols": [
- "tcp"
- ],
- "unidirectional": true
- },
- "success": true
-}
-```
-
-Take note of the `id` parameter, as you will need it to edit or delete network policies.
-
-
-
-The new policy will ensure that traffic between the specified LANs flows locally, bypassing Cloudflare.
-
-## Edit a policy
-
-
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Connector on-ramps (beta)**.
-3. Select the Connector you want to configure > **Edit**.
-4. Go to **Network Configuration**, and scroll down to **LAN configuration**.
-5. Select **LAN policies**.
-6. Select the policy you need to edit > **Edit**.
-7. Make your changes, and select **Update policy**.
-
-
-
-
-
-Create a `PUT` request [using the API](/api/resources/magic_transit/subresources/sites/subresources/acls/methods/update/) to edit a network policy.
-
-Example:
-
-",
- "forward_locally": true,
- "lan_1": {
- "lan_id": "",
- "lan_name": "",
- "ports": [
- 1
- ],
- "subnets": [
- "192.0.2.1"
- ]
- },
- "lan_2": {
- "lan_id": "",
- "lan_name": "",
- "ports": [
- 1
- ],
- "subnets": [
- "192.0.2.1"
- ]
- },
- "name": "",
- "protocols": [
- "tcp"
- ]
- }}
-/>
-
-```json output
-{
- "errors": [
- {
- "code": 1000,
- "message": "message"
- }
- ],
- "messages": [
- {
- "code": 1000,
- "message": "message"
- }
- ],
- "result": {
- "id": "023e105f4ecef8ad9ca31a8372d0c353",
- "connector_id": "ac60d3d0435248289d446cedd870bcf4",
- "description": "description",
- "ha_mode": true,
- "location": {
- "lat": "37.6192",
- "lon": "122.3816"
- },
- "name": "site_1",
- "secondary_connector_id": "8d67040d3835dbcf46ce29da440dc482"
- },
- "success": true
-}
-```
-
-
-
-## Delete a policy
-
-
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Connector on-ramps (beta)**.
-3. Select the Connector you want to configure > **Edit**.
-4. Go to **Network Configuration**, and scroll down to **LAN configuration**.
-5. Select **LAN policies**.
-6. Select the policy you need to edit > **Edit**.
-7. Select **Delete**.
-8. Select **I understand that deleting a policy is permanent** in the dialog box > **Delete**.
-
-
-
-
-
-Create a `DELETE` request [using the API](/api/resources/magic_transit/subresources/sites/subresources/acls/methods/delete/) to delete a network policy.
-
-Example:
-
-
-
-
diff --git a/src/content/docs/magic-wan/configuration/connector/network-options/routed-subnets.mdx b/src/content/docs/magic-wan/configuration/connector/network-options/routed-subnets.mdx
index cee09e29acadf06..241451af31d7ca3 100644
--- a/src/content/docs/magic-wan/configuration/connector/network-options/routed-subnets.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/network-options/routed-subnets.mdx
@@ -5,52 +5,15 @@ description: Learn how to configure routed subnets on a Magic WAN Connector, inc
---
-Each LAN interface (physical port + VLAN tag) on a Magic WAN Connector is part of a _directly-attached subnet_. When you specify a static address for the LAN interface, you indicate both the interface's address as well as the subnet it attaches to. For example, `192.168.100.13/24` means the LAN interface has the IP address `192.168.100.13`, and is part of the subnet `192.168.100.0/24`.
-
-Some LANs are more complex. In addition to the directly-attached subnet, they might have additional subnets sitting behind L3 routers south of the Magic WAN Connector. We call these _routed subnets_.
-
-Refer to the diagram below for an example of how this might work:
-
-:::note
-Blue represents directly-attached subnets, and red represents routed subnets.
-:::
-
-```mermaid
-flowchart TB
-accTitle: Routed subnets
-accDescr: Some LANs are complex, and might have additional subnets behind L3 routers.
-
-a((WAN)) --> b
-
-subgraph b [Connector]
-direction TB
-c(LAN 1)
-d(LAN n)
-end
-
-c --- e(subnet x):::blue
-d --- f(subnet 192.168.100.0/24):::blue
-
-f---|192.168.100.10|g(Layer 3 router)
-
-g --- h(routed subnet y):::red
-g --- i(192.168.200.0/24):::red
-g --- j(layer 3 router)
-j --- k(routed subnet z):::red
-
-classDef blue fill:#add8e6,color: black
-classDef red fill:#ff6900,color: black
-```
-
-
-
-To add a routed subnet to your LAN, you need:
-
-- **A prefix**: The subnet's CIDR prefix; Cloudflare will automatically install static routes to this prefix in our global network (to forward [packets](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) for this subnet to the right Connector), and in your Connector (to forward packets for this subnet to the right LAN interface). In the figure above, the routed subnet in the center has the prefix `192.168.200.0/24`.
-- **A next-hop address**: The address of the L3 router to which the Connector should forward packets for this subnet. In the figure, the routed subnet in the center has the next-hop address `192.168.100.10`.
-
-Optionally, you can also [enable NAT for a subnet](/magic-wan/configuration/connector/network-options/nat-subnet/) by providing a static overlay prefix.
-
-## Create routed subnets
-
-For more information on how to create routed subnets, refer to **Create a LAN**, either in [Configure hardware Connector](/magic-wan/configuration/connector/configure-hardware-connector/#create-a-lan) or [Configure virtual Connector](/magic-wan/configuration/connector/configure-virtual-connector/#create-a-lan).
+import { Render } from "~/components"
+
+
diff --git a/src/content/docs/magic-wan/configuration/connector/reference.mdx b/src/content/docs/magic-wan/configuration/connector/reference.mdx
index 4c76ea862d890c5..41010ab979d1593 100644
--- a/src/content/docs/magic-wan/configuration/connector/reference.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/reference.mdx
@@ -3,116 +3,30 @@ pcx_content_type: reference
title: Reference
sidebar:
order: 9
-
----
-
-import { GlossaryTooltip, Render } from "~/components"
-
-Magic WAN Connector software is certified for use on the [Dell Networking Virtual Edge Platform](https://www.dell.com/support/home/en-us/product-support/product/dell-emc-networking-vep1445-vep1485/docs). It can be purchased with software pre-installed through our partner network for plug-and-play connectivity to Cloudflare One.
-
-## Security and other information
-
-- Cloudflare ensures the Magic WAN Connector device is secure and is not altered via TPM/Secure boot (does not apply to Virtual Connector).
-- Connectivity to the Cloudflare global network is secure and all traffic is encrypted through IPsec tunneling. The Magic WAN Connector uses ESP-in-UDP with GCM-AES-256 encryption. Cloudflare uses a non-IKE keying protocol built into our control plane, secured with TLS.
-- The Magic WAN Connector does not support fail open.
-- Customers have the ability to layer on additional security features/policies that are enforced at the Cloudflare network.
-
----
-
-## ICMP traffic
-
-ICMP traffic is routed through the Internet and bypasses [Cloudflare Gateway](/cloudflare-one/policies/gateway/). This enables you to ping resources on the Internet from the Magic WAN connector directly, which can be useful for debugging.
-
---
-## VLAN ID
-
-This feature allows you to have multiple [virtual LANs](https://www.cloudflare.com/learning/network-layer/what-is-a-lan/) (VLANs) configured over the same physical port on your Magic WAN Connector. VLAN tagging adds an extra header to [packets](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) in order to identify which VLAN the packet belongs to and to route it appropriately. This effectively allows you to run multiple networks over the same physical port.
-
-A non-zero value set up for the VLAN ID field in your WAN/LAN is used to handle VLAN-tagged traffic. Cloudflare uses the VLAN ID to handle traffic coming into your Magic WAN Connector device, and applies a VLAN tag with the configured VLAN ID for traffic going out of your Connector through WAN/LAN.
-
-You can setup VLAN IDs both for WAN and LAN. Refer to [Configure hardware connector](/magic-wan/configuration/connector/configure-hardware-connector/) or [Configure software connector](/magic-wan/configuration/connector/configure-virtual-connector/) to learn where you can set up VLAN IDs.
-
-## High availability configurations
-
-### Terminology
-
-- **Primary/Secondary**: Used to identify the two nodes which are part of a high availability (HA) configuration pair of Magic WAN Connectors. This identity allows the node to identify which configuration is attributed to it — for example, specifying a primary and secondary IP in a LAN configuration. This identity is configured by the user on the Cloudflare dashboard.
-- **Active/Standby**: These are states that the two nodes in a HA pair will dynamically assume based on an election process. Only one node at any time is expected to be active.
-
-### High availability
-
-A site set up in high availability (HA) mode has two Magic WAN Connectors with the same configuration but replicated in two nodes. In case of failure of a Connector, the other Connector becomes the active node, taking over configuration of the LAN gateway IP and allowing traffic to continue without disruption.
-
-### Active/Standby Election
-
-During the LAN configuration, one of the LAN links is configured as a HA link, which is used to exchange heartbeats, resulting in the active / standby election of nodes.
-
-The state election uses a `PRIORITY` parameter where the node with the higher priority becomes active and the other assumes the standby state. If the priority is the same, the state machine automatically picks one of the nodes as active.
-
-The HA pair is configured in non-preemptive mode, meaning that once a node becomes active, it will remain active unless its priority drops below that of the other node.
-
-### Configuration
-
-The two Connectors of a high availability (HA) pair are part of a single site. You designate the connectors [as primary and secondary](/magic-wan/configuration/connector/configure-hardware-connector/#create-a-high-availability-configuration) in the Cloudflare dashboard.
-
-:::note
-The HA link cannot be connected back-to-back. It has to be connected over a switch. This is because, in a direct connection, if the link is unplugged on one end, the other end also detects a link failure. Since we have configured the system to enter a `FAULT` state when the HA link goes down, the affected node will be unable to function as the active node.
-:::
-
-### Failure Detection and Failover
-
-The Magic WAN Connector's health can be in one of three states:
-
-- **Good** : All health parameters are good
-- **Degraded** : One of the following is true:
- - Health of at least one configured tunnel is `DOWN`
- - At least one of the LAN links is disconnected (physically unplugged)
-- **Down** : If one of the following is true:
- - Health of all tunnels is `DOWN`
- - All LAN interfaces are disconnected
- - Connector software is not healthy
-
-A failover happens when the active node's health declines to a level lower than that of the standby node. For example, from `GOOD` to `DEGRADED`, or from `DEGRADED` to `DOWN`. In the case of a failover where a Connector is acting as a DHCP server, DHCP leases will be synchronized.
-
-When a failover occurs, traffic is moved to the new active node. It could take up to 30 seconds for traffic to be fully restored over the new active node.
-
-## WAN settings
-
-This is where you add and configure your WAN connections. Each configured WAN will create one IPsec tunnel, unless you have more than one anycast IP configured in your account.
-
-
-
-When you have multiple WANs you can attribute different priorities to each one. Lower values mean a higher priority. This translates in Connector routing traffic through the higher priority WANs or, more precisely, over the IPsec tunnels established over that interface. On the other hand, if you configure multiple WANs of equal priority, traffic will be distributed over those links through [(Equal-Cost Multi-Path) ECMP routing](/magic-wan/reference/traffic-steering/#equal-cost-multi-path-routing).
-
-Creating several WAN connections also means Connector can failover between circuits according to their health.
-
-### High-capacity use cases
-
-For high-capacity use cases, multiple tunnels can be established with equal priority. Outgoing traffic is then distributed across all available connections using an [ECMP routing](/magic-wan/reference/traffic-steering/#equal-cost-multi-path-routing) algorithm, which balances the load base.
-
-### Configure multiple tunnels in the same WAN profile
-
-If you do not have more than one anycast IP configured in your account, and you need to configure multiple tunnels for the same WAN profile, [set up multiple WAN connections](/magic-wan/configuration/connector/configure-hardware-connector/#create-a-wan). Each WAN is assigned one IPsec tunnel.
-
-### WAN settings
-
-- **Interface number:** When using the hardware version of Connector, this refers to the Ethernet port that you are using for your WAN. If you need a throughput higher than 1 Gbps, you can use one of the SFP+ ports. Refer to [SFP+ port information](/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information/) for more information on the hardware supported. If you are using Virtual Connector, this needs to correspond to the virtual network interface on the Virtual Connector instance you have set up in VMware.
-- **VLAN ID**: Allows you to have multiple virtual WANs configured over the same port on your Magic WAN Connector. Refer to [VLAN ID](https://developers.cloudflare.com/magic-wan/configuration/connector/reference/#vlan-id) for more information.
-- **Priority**: Assigns a priority to the WAN interface. Lower numbers have higher priority. Refer to [Traffic steering](https://developers.cloudflare.com/magic-wan/reference/traffic-steering/) to learn more about how Cloudflare calculates priorities.
-- **Health check rate:** Configures the health check frequency for your WAN. Options are low, mid, and high. Refer to [Update tunnel health checks frequency](https://developers.cloudflare.com/magic-wan/configuration/common-settings/tunnel-health-checks-frequency/) for more information.
-- **Addressing:** Configures the Connector to work in a DHCP or static IP environment.
-
-## LAN settings
-
-- **Interface number:** When using the hardware version of Connector, this refers to the Ethernet port that you are using for your LAN. If you need a throughput higher than 1 Gbps, you can use one of the SFP+ ports. Refer to [SFP+ port information](/magic-wan/configuration/connector/configure-hardware-connector/sfp-port-information/) for more information on the hardware supported. If you are using the Virtual Connector, this needs to correspond to the virtual LAN interface on the Virtual Connector instance you have set up in VMware.
-- **VLAN ID**: Allows you to have multiple virtual LANs configured over the same port on your Magic WAN Connector. Refer to [VLAN ID](https://developers.cloudflare.com/magic-wan/configuration/connector/reference/#vlan-id) for more information.
-- **Static addressing:** Configures the type of IP addressing for your Connector. Depending on your use case, this is where you configure your LAN interface IP address, or enable DHCP server or DHCP relay. Refer to [DHCP options](/magic-wan/configuration/connector/network-options/dhcp/) to learn more.
-- **Static NAT prefix**: Enable NAT (network address translation). This is an optional setting.
-- **Routed subnets:** Configures additional subnets behind a layer 3 router. Refer to [Routed subnets](/magic-wan/configuration/connector/network-options/routed-subnets/) for more information.
-
-### Restrict traffic to your premises
-
-Depending on your use case, you can define policies in your connector to either allow traffic to flow between your LANs without it leaving your local premises or to forward it via the Cloudflare network where you can add additional security features. The default behavior is to drop all LAN-to-LAN traffic. These policies can be created for specific subnets, and link two LANs.
-
-Refer to [Network segmentation](/magic-wan/configuration/connector/network-options/network-segmentation/) for more information.
\ No newline at end of file
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/connector/troubleshooting.mdx b/src/content/docs/magic-wan/configuration/connector/troubleshooting.mdx
index 7e67dc1ecd760f9..82cc8156c834e0a 100644
--- a/src/content/docs/magic-wan/configuration/connector/troubleshooting.mdx
+++ b/src/content/docs/magic-wan/configuration/connector/troubleshooting.mdx
@@ -7,106 +7,14 @@ sidebar:
import { Render } from "~/components";
-## Device metrics
-
-Cloudflare customers can inspect metrics for a specific Magic WAN Connector in the Cloudflare dashboard. These metrics help you troubleshoot potential issues with your Connector. The information spans categories such as:
-
-- Performance analytics
-- Port analytics
-- Event logs
-- DHCP leasing information
-
-To find the information above and start troubleshooting your Connector:
-
-
-
-### Performance analytics
-
-In Performance analytics you can review your Connector's performance over time including:
-
-- Kernel boot time (how long it has been running and if it is activated or not)
-- Last device snapshot (this also shows the frequency with which your device captures the snapshots that are used in several troubleshooting procedures)
-- CPU temperature
-- CPU load over time
-- Used RAM over time
-
-To access performance analytics:
-
-
-4. Select **Performance analytics**.
-
-### Port analytics
-
-Port analytics gives you access to information related to the packets sent and received through the ports in your Connector. You can adjust the time range for the information displayed in the dashboard regarding to:
-
-- Rate for packets sent and received
-- Rate for data sent and received
-
-The dashboard provides this information for all active ports in your Connector. To access port analytics:
-
-
-4. Select **Port analytics**.
-
-### Event logs
-
-Use Event logs to identify general patterns and changes over time. This is useful to find correlations with other data and gather deeper insights into your Connector. The following event logs are available:
-
-- `Init`: Initialized `mcon-agent` process. This process manages Connector.
-- `Leave`: Stopped `mcon-agent` process.
-- `StartAttestation`: Started attestation to verify the integrity of Connector before allowing the device to connect to your account.
-- `FinishAttestationSuccess`: Finished attestation successfully.
-- `FinishAttestationFailure`: Failed attestation.
-- `StartRotateCryptKey`: Started cryptography key rotation.
-- `FinishRotateCryptKeySuccess`: Finished cryptography key rotation.
-- `FinishRotateCryptKeyFailure`: Failed cryptography key rotation.
-- `StartRotatePki`: Started public key infrastructure (PKI) rotation.
-- `FinishRotatePkiSuccess`: Finished PKI rotation.
-- `FinishRotatePkiFailure`: Failed PKI rotation.
-- `StartUpgrade`: Began Connector's operating system upgrade.
-- `FinishUpgradeSuccess`: Finished operating system upgrade.
-- `FinishUpgradeFailure`: Failed operating system upgrade.
-- `Reconcile`: Cloudflare is comparing the system's current state against its desired state.
-- `ConfigureCloudflaredTunnel`: Configured Cloudflare Tunnel to debug device.
-
-To access event logs:
-
-
-4. Select **Events**.
-5. You can filter results by specific events, and by time.
-
-### DHCP leasing
-
-Refer to the DHCP leasing section to identify DHCP assigned leases and their expiration dates. To access DHCP leasing:
-
-
-4. Select **DHCP leasing**.
-
-## Troubleshooting tips
-
-If you are experiencing difficulties with your Magic WAN Connector, refer to the following tips to troubleshoot what might be happening.
-
-## I have set up a site, but my Connector is not working
-
-Make sure that you have [activated your Connector](/magic-wan/configuration/connector/configure-hardware-connector/#activate-connector). Cloudflare ships the Magic WAN Connector deactivated, and the Connector will only establish a connection to the Cloudflare network when it is activated.
-
-## I have tried to activate Magic WAN Connector, but it is still not working
-
-Check if your Magic WAN Connector is connected to the Internet via a port that can serve DHCP. This is required the first time a Connector boots up so that it can reach the Cloudflare global network and download the required configurations that you set up in the Site configuration step. Refer to [Activate Connector](/magic-wan/configuration/connector/configure-hardware-connector/#activate-connector) for more details.
-
-If you have a firewall deployed upstream of the Magic WAN Connector, [check your firewall settings](/magic-wan/configuration/connector/configure-hardware-connector/#firewall-settings-required). You might need to configure your firewall to allow traffic in specific ports for the Connector to work properly.
-
-## I can access Magic WAN Connector's health checks, but there is no traffic
-
-If you have a firewall deployed upstream of the Magic WAN Connector, make sure you review your [firewall settings](/magic-wan/configuration/connector/configure-hardware-connector/#firewall-settings-required). You might need to configure your firewall to allow traffic in specific ports for the Connector to work properly.
-
-## Devices I have behind Connector cannot connect to the Internet
-
-If you have other routing appliances behind Magic WAN Connector, make sure you create policy-based routing policies to send traffic from your devices through Connector, instead of these other routing devices.
-
-## How do I know if my device is contacting Cloudflare?
-
-Magic WAN Connector sends a heartbeat periodically to Cloudflare. You can [access the Magic WAN dashboard](/magic-wan/configuration/connector/maintenance/heartbeat/), and check for the heartbeat status of your Connector device.
-
-## What do I do in the event of hardware issues with Magic WAN Connector?
-
-Cloudflare is the single point of contact for any issues related to Magic WAN Connector, including issues with hardware. When required, Cloudflare Support will work with our partner, TD Synnex, to resolve any issues with the physical device.
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/manually/how-to/configure-routes.mdx b/src/content/docs/magic-wan/configuration/manually/how-to/configure-routes.mdx
index 314e78e2e6bc306..3287ad662e5a239 100644
--- a/src/content/docs/magic-wan/configuration/manually/how-to/configure-routes.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/how-to/configure-routes.mdx
@@ -28,4 +28,4 @@ import { Render } from "~/components"
## Next steps
-Now that you have configured your tunnels and routes, the next step is to create a site.
\ No newline at end of file
+Now that you have configured your tunnels and routes, the next step is to create a site.
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/manually/how-to/traceroute.mdx b/src/content/docs/magic-wan/configuration/manually/how-to/traceroute.mdx
index 3f111a603d7690a..5a6c923975438ad 100644
--- a/src/content/docs/magic-wan/configuration/manually/how-to/traceroute.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/how-to/traceroute.mdx
@@ -8,69 +8,15 @@ description: Learn what settings you need to change to perform a useful
`traceroute` to an endpoint behind a Cloudflare Tunnel.
---
-import { GlossaryTooltip } from "~/components";
-
-If you have a Magic WAN client connected through GRE, IPsec, [CNI](/network-interconnect/) or [WARP](/magic-wan/zero-trust/warp/) and want to perform a `traceroute` to an endpoint behind a [Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/), the following settings must be applied for the command to return useful information.
-
-## Inherited TTL value
-
-On the machine where the `traceroute` client is executed, make sure the tunnel device does not inherit the TTL value of the inner packet. This is the default behavior on Linux and can result in unhelpful `traceroute` results:
-
-```sh
-sudo traceroute -s 10.1.0.100 -I 10.3.0.100
-```
-
-```sh output
-traceroute to 10.3.0.100 (10.3.0.100), 30 hops max, 60 byte packets
- 1 * * *
- 2 * * *
- 3 * * *
- 4 * * *
- 5 * * *
- 6 * * *
- 7 * * *
- 8 * * *
- 9 * * *
-10 10.3.0.100 (10.3.0.100) 420.505 ms 420.779 ms 420.776 ms
-```
-
-Setting the TTL explicitly returns much better results:
-
-```sh
-sudo ip link set cf_gre type gre ttl 64
-sudo traceroute -s 10.1.0.100 -I 10.3.0.100
-```
-
-```sh output
-traceroute to 10.3.0.100 (10.3.0.100), 30 hops max, 60 byte packets
- 1 10.0.0.11 (10.0.0.11) 58.947 ms 58.933 ms 58.930 ms
- 2 173.245.60.175 (173.245.60.175) 61.138 ms 61.316 ms 61.313 ms
- 3 172.68.145.21 (172.68.145.21) 367.448 ms 367.532 ms 367.530 ms
- 4 mplat-e2e-vm3.c.magic-transit.internal (10.152.0.20) 370.362 ms 370.440 ms 370.522 ms
- 5 10.3.0.100 (10.3.0.100) 370.519 ms 370.541 ms 518.152 ms
-```
-
-## WARP client
-
-Some Linux distributions default to a very strict setting for [reverse path filtering](https://sysctl-explorer.net/net/ipv4/rp_filter/). This strict setting attempts to drop fake traffic as a security measure. Performing a `traceroute` with this setting on can unintentionally drop `traceroute` packets. If you use WARP on Linux, set a less strict policy before attempting to perform a `traceroute`:
-
-```sh
-sudo sysctl -w net.ipv4.conf.CloudflareWARP.rp_filter=2
-```
-
-```sh output
-net.ipv4.conf.CloudflareWARP.rp_filter = 2
-```
-
-```sh
-sudo traceroute -s 172.16.0.2 -I 10.3.0.100
-```
-
-```sh output
-traceroute to 10.3.0.100 (10.3.0.100), 30 hops max, 60 byte packets
- 1 169.254.21.171 (169.254.21.171) 48.887 ms 48.894 ms 48.620 ms
- 2 173.245.60.175 (173.245.60.175) 49.403 ms 49.519 ms 49.603 ms
- 3 172.68.65.7 (172.68.65.7) 357.499 ms 357.519 ms 357.520 ms
- 4 mplat-e2e-vm3.c.magic-transit.internal (10.152.0.20) 360.024 ms 360.086 ms 360.078 ms
- 5 10.3.0.100 (10.3.0.100) 360.283 ms 360.297 ms 360.489 ms
-```
+import { Render } from "~/components";
+
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/manually/third-party/fortinet.mdx b/src/content/docs/magic-wan/configuration/manually/third-party/fortinet.mdx
index e31218cebe8d470..fb2ced44a2181f8 100644
--- a/src/content/docs/magic-wan/configuration/manually/third-party/fortinet.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/third-party/fortinet.mdx
@@ -433,18 +433,7 @@ end
## Monitor Cloudflare Magic IPsec tunnel health checks
- **Tunnel health**",
- graphQL: "/magic-wan/analytics/query-tunnel-health/",
- notificationsPath: "[notifications wizard](/magic-wan/configuration/common-settings/configure-magic-tunnel-health-alerts/)",
- packetCaptures: "/magic-firewall/packet-captures/",
- networkAnalytics: "/magic-wan/analytics/network-analytics/"
- }}
-/>
+The Cloudflare dashboard monitors the health of all anycast tunnels on your account that route traffic from Cloudflare to your origin network. Refer to [Check tunnel health in the dashboard](/magic-wan/configuration/common-settings/check-tunnel-health-dashboard/) for more information.
## Troubleshooting
diff --git a/src/content/docs/magic-wan/configuration/manually/third-party/sonicwall.mdx b/src/content/docs/magic-wan/configuration/manually/third-party/sonicwall.mdx
index 32c0c54119b2cfb..aa7fbfe7b55887c 100644
--- a/src/content/docs/magic-wan/configuration/manually/third-party/sonicwall.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/third-party/sonicwall.mdx
@@ -199,15 +199,4 @@ Health checks might take some time to stabilize after the configuration is chang
## 9. Verify tunnel status on Cloudflare dashboard
- **Tunnel health**",
- graphQL: "/magic-wan/analytics/query-tunnel-health/",
- notificationsPath: "[notifications wizard](/magic-wan/configuration/common-settings/configure-magic-tunnel-health-alerts/)",
- packetCaptures: "/magic-firewall/packet-captures/",
- networkAnalytics: "/magic-wan/analytics/network-analytics/"
- }}
-/>
+The Cloudflare dashboard monitors the health of all anycast tunnels on your account that route traffic from Cloudflare to your origin network. Refer to [Check tunnel health in the dashboard](/magic-wan/configuration/common-settings/check-tunnel-health-dashboard/) for more information.
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/configuration/manually/third-party/sophos-firewall.mdx b/src/content/docs/magic-wan/configuration/manually/third-party/sophos-firewall.mdx
index 2ffb5a7b512cf52..366116bb94fdd1b 100644
--- a/src/content/docs/magic-wan/configuration/manually/third-party/sophos-firewall.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/third-party/sophos-firewall.mdx
@@ -184,18 +184,7 @@ system gre route add net tunnelname
## Verify tunnel status on Cloudflare dashboard
- **Tunnel health**",
- graphQL: "/magic-wan/analytics/query-tunnel-health/",
- notificationsPath: "[notifications wizard](/magic-wan/configuration/common-settings/configure-magic-tunnel-health-alerts/)",
- packetCaptures: "/magic-firewall/packet-captures/",
- networkAnalytics: "/magic-wan/analytics/network-analytics/"
- }}
-/>
+The Cloudflare dashboard monitors the health of all anycast tunnels on your account that route traffic from Cloudflare to your origin network. Refer to [Check tunnel health in the dashboard](/magic-wan/configuration/common-settings/check-tunnel-health-dashboard/) for more information.
### Make Cloudflare health checks work
diff --git a/src/content/docs/magic-wan/get-started.mdx b/src/content/docs/magic-wan/get-started.mdx
index 3683fd8784a74fe..c142aa08ee35f83 100644
--- a/src/content/docs/magic-wan/get-started.mdx
+++ b/src/content/docs/magic-wan/get-started.mdx
@@ -5,71 +5,19 @@ sidebar:
order: 2
---
-import { GlossaryTooltip, Render } from "~/components";
-
-Magic WAN allows you to achieve any-to-any connectivity across branch and retail sites and data centers, with Cloudflare connectivity cloud.
-
-## Before you begin
-
-Magic WAN is an Enterprise-only product. [Contact Cloudflare](https://www.cloudflare.com/magic-wan/) to acquire Magic WAN. If you plan on using Magic WAN Connector to automatically onboard your locations to Cloudflare, you will need to purchase Magic WAN first.
-
-## Set up method
-
-Magic WAN supports an automatic setup and a manual setup. The automatic setup through Magic WAN Connector is the preferred method.
-
-### Automatic set up
-
-Setting up Magic WAN automatically is done through Magic WAN Connector, and is the preferred method. You can choose between the hardware version and the virtual version of the Magic WAN Connector. The virtual version can be installed on your own machines.
-
-If you plan on using Magic WAN Connector, you can skip the prerequisites below, and refer to [Configure with Connector](/magic-wan/configuration/connector/) for more information on how to continue.
-
-### Manual set up
-
-Setting up Magic WAN manually is done through a combination of third-party devices in your premises and the Cloudflare dashboard. To be successful, you need to:
-
-1. Read the [Prerequisites](#prerequisites) below.
-2. Follow the steps in [Manual configuration](/magic-wan/configuration/manually/how-to/configure-tunnel-endpoints/).
-
-## Prerequisites
-
-:::note
-The list of prerequisites below is only for customers planning to connect manually to Cloudflare with a third-party device. If you plan on using Magic WAN Connector, skip this section and refer to [Configure with Connector](/magic-wan/configuration/connector/).
-:::
-
-### Use compatible tunnel endpoint routers
-
-Magic WAN relies on GRE and IPsec tunnels to transmit [packets](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) from Cloudflare's global network to your origin network. To ensure compatibility with Magic WAN, the routers at your tunnel endpoints must:
-
-- Allow configuration of at least one tunnel per Internet service provider (ISP).
-- Support maximum segment size (MSS) clamping.
-- Support the configuration parameters for IPsec mentioned in [IPsec tunnels](/magic-wan/reference/gre-ipsec-tunnels/#supported-configuration-parameters).
-
-### Set maximum segment size
-
-
-#### MSS clamping recommendations
-
-##### GRE tunnels as off-ramp
-
-
-
-##### IPsec tunnels
-
-
-
-:::caution[Important]
-Refer to your device documentation to check if it sets IPsec MSS clamping automatically. If that is not the case and you are using IPsec inside GRE, you have to set MSS clamp manually.
-:::
-
-Refer to [Maximum transmission unit and maximum segment size](/magic-wan/reference/mtu-mss/) for more details.
-
-### Follow router vendor guidelines
+import { Render } from "~/components";
+ params={{
+ productNameManual: "Magic WAN",
+ productNameConnector: "Magic WAN Connector",
+ configureConnectorUrl: "/magic-wan/configuration/connector/",
+ configureMwanManually: "/magic-wan/configuration/manually/how-to/configure-tunnel-endpoints/",
+ greReferenceURL: "/magic-wan/reference/gre-ipsec-tunnels/",
+ ipsecReferenceUrl: "/magic-wan/reference/gre-ipsec-tunnels/#ipsec-tunnels",
+ ipsecReferenceConfigParams: "/magic-wan/reference/gre-ipsec-tunnels/#supported-configuration-parameters",
+ mtuReferenceURL: "/magic-wan/reference/mtu-mss/"
+ }}
+/>
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/load-balancing.mdx b/src/content/docs/magic-wan/load-balancing.mdx
index 965847e0799b315..da5643663925fb7 100644
--- a/src/content/docs/magic-wan/load-balancing.mdx
+++ b/src/content/docs/magic-wan/load-balancing.mdx
@@ -3,9 +3,17 @@ title: Load Balancing
pcx_content_type: concept
sidebar:
order: 9
-
---
-You can use Cloudflare Load Balancing with Magic WAN to distribute traffic across endpoints, reducing strain and improving the performance of your network. This works through Private Network Load Balancing, which supports both on-ramping and off-ramping traffic to Magic WAN tunnels.
+import { Render } from "~/components";
+
+
+
-Refer to [Private Network Load Balancing](/load-balancing/private-network/) for more information about the feature and how to set it up. You will need to [enable Load Balancing](/load-balancing/) before you can use this feature.
diff --git a/src/content/docs/magic-wan/network-interconnect.mdx b/src/content/docs/magic-wan/network-interconnect.mdx
index 23bfd27992d35d8..b45efd02350bcaa 100644
--- a/src/content/docs/magic-wan/network-interconnect.mdx
+++ b/src/content/docs/magic-wan/network-interconnect.mdx
@@ -12,4 +12,14 @@ import { Render } from "~/components";
-
+
diff --git a/src/content/docs/magic-wan/reference/bandwidth-measurement.mdx b/src/content/docs/magic-wan/reference/bandwidth-measurement.mdx
index bcb91ace5bafde6..13c86d93b2033dd 100644
--- a/src/content/docs/magic-wan/reference/bandwidth-measurement.mdx
+++ b/src/content/docs/magic-wan/reference/bandwidth-measurement.mdx
@@ -5,8 +5,15 @@ sidebar:
order: 2
---
-Cloudflare measures Magic WAN usage based on the 95th percentile of bandwidth utilized by the customer's configured network.
+import { Render } from "~/components";
-Configured Magic WAN network's bandwidth refers to the sum of traffic routed in and out of Magic WAN network namespace by measuring and summing each active customer's configured [GRE](https://www.cloudflare.com/learning/network-layer/what-is-gre-tunneling/), [IPSEC](https://www.cloudflare.com/learning/network-layer/what-is-ipsec/), [Cloudflare Tunnel](/magic-wan/zero-trust/cloudflare-tunnel/) and [Cloudflare Network Interconnect](/network-interconnect/) tunnel's highest P95th percentile (ingress or egress traffic). The usage measurement excludes [WARP](/network-interconnect/) traffic.
+
\ No newline at end of file
diff --git a/src/content/docs/magic-wan/reference/traffic-steering.mdx b/src/content/docs/magic-wan/reference/traffic-steering.mdx
index 2b7eaabea82e832..e2bb6e8986dc93c 100644
--- a/src/content/docs/magic-wan/reference/traffic-steering.mdx
+++ b/src/content/docs/magic-wan/reference/traffic-steering.mdx
@@ -18,6 +18,13 @@ import { Render } from "~/components";
params={{
magicWord: "Magic WAN",
productName: "Magic WAN",
+ mFirewallName: "Magic Firewall",
+ mFirewallURL: "/magic-firewall/",
+ warpClientURL: "/cloudflare-one/connections/connect-devices/warp/",
+ remoteBrowserURL: "/cloudflare-one/policies/browser-isolation/",
+ accessURL: "/cloudflare-one/policies/access/",
+ gatewayURL: "/cloudflare-one/policies/gateway/",
+ cfTunnelURL: "/magic-wan/zero-trust/cloudflare-tunnel/",
greIpsecReferenceURL: "/magic-wan/reference/gre-ipsec-tunnels/",
createStaticRoute: "/magic-wan/configuration/manually/how-to/configure-routes/#create-a-static-route",
editStaticRoute: "/magic-wan/configuration/manually/how-to/configure-routes/#edit-a-static-route",
diff --git a/src/content/docs/magic-wan/security.mdx b/src/content/docs/magic-wan/security.mdx
index 47698ecbff010b4..fe3afdec196c6a0 100644
--- a/src/content/docs/magic-wan/security.mdx
+++ b/src/content/docs/magic-wan/security.mdx
@@ -9,8 +9,15 @@ head:
---
-Magic WAN customers have [automatic access to Magic Firewall](/magic-firewall/plans/). Magic Firewall is Cloudflare's firewall-as-a-service solution that allows you to protect your infrastructure. Magic Firewall supports layers three and four of the [OSI model](https://www.cloudflare.com/learning/ddos/glossary/open-systems-interconnection-model-osi/), and enables you to allow or block traffic on a variety of packet characteristics.
+import { Render } from "~/components"
-Refer to [Magic Firewall](/magic-firewall/) for more information about this product.
-
-As a Magic WAN customer, you can also use Cloudflare Gateway to set up policies to inspect network and HTTP traffic to the Internet or your private network infrastructure. Refer to [Connect to Cloudflare Gateway with Magic WAN](/magic-wan/zero-trust/cloudflare-gateway/) to learn how to filter Magic WAN traffic with Gateway policies.
+
diff --git a/src/content/docs/magic-wan/zero-trust/cloudflare-gateway.mdx b/src/content/docs/magic-wan/zero-trust/cloudflare-gateway.mdx
index 95675bb69dd6e08..bdad15273d35354 100644
--- a/src/content/docs/magic-wan/zero-trust/cloudflare-gateway.mdx
+++ b/src/content/docs/magic-wan/zero-trust/cloudflare-gateway.mdx
@@ -8,91 +8,30 @@ head:
import { Render } from "~/components";
-[Cloudflare Gateway](/cloudflare-one/policies/gateway/), our comprehensive Secure Web Gateway, allows you to set up policies to inspect DNS, network, HTTP, and egress traffic.
+
-You can apply network and HTTP Gateway policies alongside [Magic Firewall](/magic-firewall/) policies (for L3/4 traffic filtering) to Internet-bound traffic or private traffic entering the Cloudflare network via Magic WAN. Additionally, you can configure Gateway to [resolve DNS queries](#dns-filtering) from Magic WAN.
-
-## HTTPS filtering
-
-In order to inspect HTTPS traffic, you need to install a Cloudflare root certificate on each client device. You can use the [WARP client](/cloudflare-one/connections/connect-devices/warp/) to [automatically install a Cloudflare certificate](/cloudflare-one/connections/connect-devices/user-side-certificates/automated-deployment/) on supported devices. If your device or application does not support certificate installation via WARP, you can [manually install a certificate](/cloudflare-one/connections/connect-devices/user-side-certificates/manual-deployment/). A certificate is required for Cloudflare to [decrypt TLS](/cloudflare-one/policies/gateway/http-policies/tls-decryption/).
-
-If you cannot or do not want to install the certificate, you can create [Do Not Inspect](/cloudflare-one/policies/gateway/http-policies/#do-not-inspect) policies to exempt incompatible Magic WAN traffic from inspection or to disable TLS decryption entirely. Because Gateway cannot discern Magic WAN traffic, you must use [WARP client checks](/cloudflare-one/identity/devices/warp-client-checks/) or the IP addresses associated with Magic WAN to match traffic with Gateway policies. For example, if your organization onboards devices to Magic WAN via WARP, you can exempt devices not running WARP using [OS version checks](/cloudflare-one/identity/devices/warp-client-checks/os-version/):
-
-| Selector | Operator | Value | Logic | Action |
-| ---------------------------- | -------- | -------------------- | ----- | -------------- |
-| Passed Device Posture Checks | not in | Windows (OS version) | Or | Do Not Inspect |
-| Passed Device Posture Checks | not in | macOS (OS version) | Or | Do Not Inspect |
-| Passed Device Posture Checks | not in | Linux (OS version) | Or | Do Not Inspect |
-| Passed Device Posture Checks | not in | iOS (OS version) | Or | Do Not Inspect |
-| Passed Device Posture Checks | not in | Android (OS version) | | Do Not Inspect |
-
-If your organization onboards users to Magic WAN via an [on-ramp other than WARP](/magic-wan/on-ramps/), you can exempt devices from inspection using the IP addresses for your Magic IPsec tunnels:
-
-| Selector | Operator | Value | Action |
-| --------- | -------- | ---------------- | -------------- |
-| Source IP | in | `203.0.113.0/24` | Do Not Inspect |
-
-## DNS filtering
-
-You can configure the DNS resolver for your Magic WAN networks to the shared IP addresses for the Gateway DNS resolver. The Gateway DNS resolver IPs are `172.64.36.1` and `172.64.36.2`. When you resolve DNS queries from Magic WAN through Gateway, Gateway will log the queries with the private source IP. You can use the private source IP to create [resolver policies](/cloudflare-one/policies/gateway/resolver-policies/) for queries intended for [internal DNS records](/cloudflare-one/policies/gateway/resolver-policies/#internal-dns).
-
-```mermaid
-flowchart LR
- subgraph subGraph0["Data center"]
- direction TB
- InternalDNS(["Internal DNS"])
- ResolverPolicies["Resolver policies"]
- CloudflareGatewayDNSResolver["Gateway DNS resolver"]
- end
- ResolverPolicies -- Retain and useSource Internal IP --> InternalDNS
- CloudflareGatewayDNSResolver -- --> ResolverPolicies
- WarpConnector["WARP Connector"] -- DHCP/DNS resolver --> IPSecTunnel["IPsec tunnel"]
- MagicWAN["Magic WAN"] -- DHCP/DNS resolver --> IPSecTunnel
- IPSecTunnel -- Shared IP endpoints --> CloudflareGatewayDNSResolver
- ResolverPolicies@{ shape: proc}
- WarpConnector@{ shape: in-out}
- MagicWAN@{ shape: in-out}
-```
-
-## Outbound Internet traffic
-
-By default, the following traffic routed through Magic WAN tunnels and destined to public IP addresses is proxied/filtered through Cloudflare Gateway:
-
-- TCP, UDP, and ICMP traffic sourced from [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) IPs or WARP devices.
-- TCP and UDP traffic sourced from [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/) and destined to a well-known port (`0`-`1023`).
-
-Traffic destined to public IPs will be routed over the public Internet, unless explicitly specified otherwise. If you want to configure specific public IP ranges to be routed through your Magic WAN tunnels instead of over the public Internet after filtering, contact your account team.
-
-This traffic will egress from Cloudflare according to the [egress policies](/cloudflare-one/policies/gateway/egress-policies/) you define in Cloudflare Gateway. By default, it will egress from a shared Cloudflare public IP range.
-
-## Private traffic
-
-By default, TCP, UDP, and ICMP traffic routed through Magic WAN tunnels and destined to routes behind [Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/) will be proxied/filtered through Cloudflare Gateway.
-
-Contact your account team to enable Gateway filtering for traffic destined to routes behind Magic WAN tunnels.
-
-If enabled, by default TCP/UDP traffic meeting **all** the following criteria will be proxied/filtered by Cloudflare Gateway:
-
-- Both source and destination IPs are part of either [RFC1918](https://datatracker.ietf.org/doc/html/rfc1918) space, [WARP](/cloudflare-one/connections/connect-devices/warp/), [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/)
-- Source port must be a client port strictly higher than `1023`
-- Destination port is a well-known port lower than `1024`
-
-Optionally, more specific matches may be specified to override the default:
-
-- Source IP prefix in a subset of RFC1918 space, or [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/)
-- Destination IP prefix in a subset of RFC1918 space, or [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/)
-- Destination port number anywhere from `0`-`65535`
-
-Source ports are hard-coded to `1024`-`65535` and may not be overridden.
-
-
-
-## Test Gateway integration
-
-To check if Gateway is working properly with your Magic WAN connection, open a browser from a host behind your customer premise equipment, and browse to `https://ifconfig.me`.
-
-If you are still in the process of testing Gateway, and Cloudflare is not your default route, configure a policy-based route on your router to send traffic to Cloudflare Gateway first, before browsing to `https://ifconfig.me`.
-
-Confirm there is an entry for the test in [HTTP Gateway Activity Logs](/cloudflare-one/insights/logs/gateway-logs/#http-logs). The destination IP address should be the public IP address of `ifconfig.me`, and the source IP address should be the private (WAN) address of the host with the browser. Your outbound connection should be sourced from a Magic WAN IP address, and not any public IP address that Cloudflare might be advertising on your behalf. This is true as well when using [Magic Transit With Egress Option](/reference-architecture/architectures/magic-transit/#magic-transit-with-egress-option-enabled).
-
-Additionally, test both `http://ifconfig.me` (non-TLS) and `https://ifconfig.me` (TLS) to ensure that your [TCP maximum segment size (MSS Clamping)](/magic-wan/get-started/#set-maximum-segment-size) has been set properly. If the response to the HTTPS query hangs or fails, but HTTP works, it is possible that the MSS value is too high or not set. Reduce this value on your customer premise equipment to match the overhead introduced by your [IKE](/magic-wan/reference/gre-ipsec-tunnels/#supported-configuration-parameters) and [ESP](https://en.wikipedia.org/wiki/IPsec#Encapsulating_Security_Payload) settings.
diff --git a/src/content/docs/magic-wan/zero-trust/cloudflare-tunnel.mdx b/src/content/docs/magic-wan/zero-trust/cloudflare-tunnel.mdx
index fef820f9772bebe..e2320950a1c1250 100644
--- a/src/content/docs/magic-wan/zero-trust/cloudflare-tunnel.mdx
+++ b/src/content/docs/magic-wan/zero-trust/cloudflare-tunnel.mdx
@@ -1,29 +1,17 @@
---
title: Cloudflare Tunnel
pcx_content_type: reference
-
---
-import { Render } from "~/components"
-
-Magic WAN can be used together with [Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/) for easy access between your networks and applications.
-
-By default, TCP, UDP, and ICMP traffic routed through Magic WAN tunnels and destined to routes behind Cloudflare Tunnel will be proxied/filtered through [Cloudflare Gateway](/cloudflare-one/policies/gateway/).
-
-## Cloudflare Tunnel and Magic Networking Route interactions
-
-[Private network routes](/cloudflare-one/connections/connect-networks/private-net/cloudflared/#3-route-private-network-ips-through-warp) are evaluated together across Cloudflare Tunnel and Magic Networking routing tables. If traffic matches either a Cloudflare Tunnel route (in any virtual network) or a Magic Networking route, then the matched route will determine the next-hop.
-
-To design solutions where a destination IP may match both a Cloudflare Tunnel private network route and a Magic Networking route, consult your solutions engineer for guidance.
-
-## Test `cloudflared` tunnel integration
-
-To check if a `cloudflared` tunnel is working properly with your Magic WAN connection, open a browser from a host behind your customer premise equipment, and browse to the `cloudflared` tunnel endpoint.
-
-For example, imagine you have a Cloudflare Tunnel set up with a private network CIDR of `10.1.2.3/32`, a static route defined in Magic WAN for `10.1.2.3/24`, and the device you are trying to connect to is a web server. You can test connectivity to the web server by using a browser to load `https://10.1.2.3`. If the page loads correctly, your Cloudflare Tunnel is working properly. In this scenario, you have overlapping routes defined for Cloudflare Tunnel and Magic WAN.
-
-As mentioned above, if you have overlapping routes in your Magic WAN and Cloudflare Tunnel routing configurations, Cloudflare Tunnel will take precedence. This happens whenever a `cloudflared` tunnel CIDR matches a packet, regardless of prefix length. For example, a `cloudflared` tunnel with prefix `10.1.2.0/24` will take precedence over a static route configured to `10.1.2.4/32`, sending packets over a GRE tunnel.
-
-For more information, refer to [Connect private networks](/cloudflare-one/connections/connect-networks/private-net/cloudflared/).
-
-
+import { Render } from "~/components";
+
+
diff --git a/src/content/docs/magic-wan/zero-trust/index.mdx b/src/content/docs/magic-wan/zero-trust/index.mdx
index 67fbccb7a5ddde8..492d01365724628 100644
--- a/src/content/docs/magic-wan/zero-trust/index.mdx
+++ b/src/content/docs/magic-wan/zero-trust/index.mdx
@@ -11,10 +11,12 @@ description: Learn how to integrate Cloudflare Magic WAN with other Cloudflare
---
-import { DirectoryListing } from "~/components"
+import { Render } from "~/components";
-Review the tutorials to learn more about how you can use Magic WAN with the following Cloudflare Zero Trust products.
-
-
-
-If you want a deep dive into key architecture and functionalities aspects of Cloudflare One, and learn more about Magic WAN and its structure, refer to [Evolving to a SASE architecture with Cloudflare](/reference-architecture/architectures/sase/).
+
diff --git a/src/content/docs/magic-wan/zero-trust/warp.mdx b/src/content/docs/magic-wan/zero-trust/warp.mdx
index fc37ff8c4427e5c..0366756cd097563 100644
--- a/src/content/docs/magic-wan/zero-trust/warp.mdx
+++ b/src/content/docs/magic-wan/zero-trust/warp.mdx
@@ -8,92 +8,24 @@ description: >-
Use WARP as an on-ramp to Magic WAN and route traffic from user devices with WARP installed to any network connected with Cloudflare Tunnel or Magic IP-layer tunnels (anycast GRE, IPsec, or CNI).
---
-:::note
-By default, direct WARP-to-WARP connections are not supported for devices located behind Magic WAN with WARP enabled. This is due to issues caused by double encapsulation and asymmetric routing.
-
-When a device is behind Magic WAN, it is recommended to avoid enabling WARP. Instead, access the device using its local LAN IP from remote systems, rather than relying on WARP-to-WARP communication.
-
-If you do want to use WARP on a device behind Magic WAN and connect to its WARP IP (within the `100.96.0.0/12` range), you will need to adjust your WARP profiles. Specifically, exclude the `100.96.0.0/12` subnet from the on-premises WARP profile, and include it in the off-premises profile.
-:::
-
-import { GlossaryTooltip, Render } from "~/components";
-
-Use [WARP](/cloudflare-one/connections/connect-devices/warp/) as an on-ramp to Magic WAN and route traffic from user devices with WARP installed to any network connected with Cloudflare Tunnel or Magic IP-layer tunnels (anycastGRE, IPsec, or [CNI](/network-interconnect/)). Take advantage of the integration between Magic WAN and [Magic Firewall](/magic-firewall/) and enforce policies at Cloudflare's global network.
-
-## Prerequisites
-
-Before you can begin using WARP as an on-ramp to Magic WAN, you must set up your [Zero Trust account](/cloudflare-one/setup/#create-a-zero-trust-organization).
-
-## IP ranges
-
-When connecting a WARP device to Magic WAN, you will have virtual IP addresses from WARP, in the `100.96.0.0/12` range.
-
----
-
-## Set up WARP with Magic WAN
-
-### 1. Route packets back to WARP devices
-
-Route packets back to WARP devices from services behind an anycast GRE or other type tunnel. You need to do this before actually installing WARP. Otherwise, your infrastructure will not route packets correctly to Cloudflare global network and connectivity will fail.
-
-Cloudflare will assign IP addresses from the WARP virtual IP (VIP) space to your WARP devices. To view your virtual IP address, open the [Cloudflare Zero Trust dashboard](https://one.dash.cloudflare.com/), and select **My Team** > **Devices**.
-
-All packets with a destination IP in the VIP space need to be routed back through the tunnel. For example, with a single GRE tunnel named `gre1`, in Linux, the following command would add a routing rule that would route such packets:
-
-```sh
-ip route add 100.96.0.0/12 dev gre1
-```
-
-:::note[Note]
-
-After set up, **HTTP** and **Network logs** in Gateway will show the virtual IP address of your WARP device as the **Source IP**. DNS logs will continue to show the original WARP device IP because DNS traffic is sent over the public Internet to Cloudflare's public-facing resolver.
-:::
-
-### 2. Configure Split Tunnels
-
-Configure [Split Tunnels](/cloudflare-one/connections/connect-devices/warp/configure-warp/route-traffic/split-tunnels/) from your Zero Trust account to only include traffic from the private IP addresses you want to access.
-
-Optionally, you can configure Split Tunnels to include IP ranges or domains you want to use for connecting to public IP addresses.
-
-### 3. Install the WARP client on your device
-
-Refer to [Deploy WARP to your organization](/cloudflare-one/connections/connect-devices/warp/deployment/) for more information on whether to choose a manual or managed deployment.
-
-You should be able to access Private IP addresses specified in the Split Tunnel configuration.
-
-You must log out and log back in with at least one WARP device to ensure the configuration updates on your device.
-
-
-
-## Double encapsulation
-
-When a WARP user goes to a location (like an office) with a Magic WAN tunnel already set up, WARP traffic is doubly encapsulated - first by WARP and then by Magic WAN. This is unnecessary, since each on-ramp method provides full Zero Trust protection.
-
-Since WARP traffic is already protected on its own, Cloudflare recommends that you set up Magic WAN to exclude WARP traffic, sending it to the Internet through regular connections.
-
-To learn which IP addresses and UDP ports you should exclude to accomplish this, refer to [WARP ingress IP](/cloudflare-one/connections/connect-devices/warp/deployment/firewall/#warp-ingress-ip).
-
-### WARP and Magic WAN Connector
+import { Render } from "~/components";
**Devices**",
+ splitTunnelsURL: "/cloudflare-one/connections/connect-devices/warp/configure-warp/route-traffic/split-tunnels/",
+ warpDeploymentURL: "/cloudflare-one/connections/connect-devices/warp/deployment/",
+ warpIngressIpURL: "/cloudflare-one/connections/connect-devices/warp/deployment/firewall/#warp-ingress-ip",
+ mwanConnectorName: "Magic WAN Connector",
+ domainFallbackURL: "/cloudflare-one/connections/connect-devices/warp/configure-warp/route-traffic/local-domains/#add-a-domain"
+
+ }}
/>
-
-## Test WARP integration
-
-Before testing, be sure to [configure domain fallback](/cloudflare-one/connections/connect-devices/warp/configure-warp/route-traffic/local-domains/#add-a-domain) for the server or service in WARP settings. This is needed because by default Cloudflare Zero Trust excludes common top level domains used for local resolution from being sent to Gateway for processing.
-
-If WARP integration has been enabled for the account within the last day, log off and on again in the WARP client before testing.
-
-To check if WARP is working correctly as an on-ramp, you can do a resolution test on a [fully qualified domain name (FQDN)](https://en.wikipedia.org/wiki/Fully_qualified_domain_name) for a server or service in the Magic WAN. Test this from a user with a WARP device.
-
-For example:
-
-```sh
-nslookup
-```
-
-This DNS lookup should return a valid IP address associated with the server or service you are testing for.
-
-Next, test with a browser that you can connect to a service on the WAN by opening a webpage that is only accessible on the WAN. The server can be the same server used in the DNS lookup or another server in the WAN. Connecting using an IP address instead of a domain name should work.
diff --git a/src/content/partials/networking-services/analytics/network-analytics.mdx b/src/content/partials/networking-services/analytics/magic-tunnel-traffic-analytics.mdx
similarity index 100%
rename from src/content/partials/networking-services/analytics/network-analytics.mdx
rename to src/content/partials/networking-services/analytics/magic-tunnel-traffic-analytics.mdx
diff --git a/src/content/partials/networking-services/analytics/overview.mdx b/src/content/partials/networking-services/analytics/overview.mdx
index 4346d059144bad0..c70b7fc0b56088d 100644
--- a/src/content/partials/networking-services/analytics/overview.mdx
+++ b/src/content/partials/networking-services/analytics/overview.mdx
@@ -5,7 +5,8 @@ params:
- analyticsAnchorHeading
- networkAnalyticsURL
- traceRoutes
- - graphQl
+ - graphQlTunnelBandwidthURL
+ - graphQlTunnelHealthURL
---
import { AnchorHeading, Markdown } from "~/components";
@@ -66,5 +67,5 @@ Refer to [packet captures](/magic-firewall/packet-captures/) to learn more.
GraphQL Analytics provides customers with a GraphQL API that they can query to receive raw JSON data of their Magic WAN traffic analytics. This data can be ingested into a SIEM or other tool and analyzed further.
-- Querying {props.productName} tunnel bandwidth analytics with GraphQL
-- Querying {props.productName} tunnel health check results with GraphQL
+- Querying {props.productName} tunnel bandwidth analytics with GraphQL
+- Querying {props.productName} tunnel health check results with GraphQL
diff --git a/src/content/partials/networking-services/analytics/site-analytics.mdx b/src/content/partials/networking-services/analytics/site-analytics.mdx
index 6b12c9a1f0eb664..7f030e3f3eed310 100644
--- a/src/content/partials/networking-services/analytics/site-analytics.mdx
+++ b/src/content/partials/networking-services/analytics/site-analytics.mdx
@@ -1,8 +1,13 @@
---
params:
- instructions?
+ - productName
+ - magicTunnelHcsURL
+ - setGeoCoordinatesURL
---
+
+
import { Details, Markdown } from "~/components"
After adding your sites, the Network overview (beta) section of the dashboard provides a summary of the connectivity status and traffic analytics for all your sites. This is a great place to start if you receive a Magic WAN alert, need to begin the troubleshooting process, or are performing routine monitoring.
@@ -10,12 +15,12 @@ After adding your sites, the Network overview (beta) section of the dashboard pr
Network overview (beta) has the following data types available:
- - [Aggregate Magic WAN site health](#site-health)
- - [Magic WAN availability status for sites](#no-status-available)
- - [Magic WAN site geographic location](#no-location-set)
+ - [Aggregate {props.productName} site health](#site-health)
+ - [{props.productName} availability status for sites](#no-status-available)
+ - [{props.productName} site geographic location](#no-location-set)
-
+
- Site Name
- Site Health
- Site Tunnel Names
@@ -24,12 +29,12 @@ Network overview (beta) has the following data types available:
- Site Traffic Received
-
+
- Traffic Sent by Tunnel
- Traffic Received by Tunnel
-To start using Magic WAN site analytics:
+To start using {props.productName} site analytics:
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
2. Select **Magic WAN** > **Network overview (beta)**.
@@ -40,7 +45,7 @@ Review the topics below to learn more about the options available to you.
### Network map and traffic overview
-The network map section shows all the sites configured with Magic WAN. At a glance, you can check:
+The network map section shows all the sites configured with {props.productName}. At a glance, you can check:
- How many active sites you have
- Location for sites in a map (if you set up their geographic location)
@@ -52,20 +57,20 @@ Just below the map, Traffic overview shows a more granular list of your sites an
#### Site health
-Sites can be healthy or unhealthy, and Magic WAN uses this information to route traffic. Refer to [Set thresholds for Magic WAN site health](#set-thresholds-for-magic-wan-site-health) to learn more about this topic.
+Sites can be healthy or unhealthy, and Magic WAN uses this information to route traffic. Refer to [Set thresholds for site health](#set-thresholds-for-site-health) to learn more about this topic.
#### No status available
-The status of a site refers to its health. If your sites show a **No status available** message, this means you did not configure your alert settings when creating your site. Refer to [Configure Magic Tunnel health alerts](/magic-wan/configuration/common-settings/configure-magic-tunnel-health-alerts/) to learn how to create an alert for your site.
+The status of a site refers to its health. If your sites show a **No status available** message, this means you did not configure your alert settings when creating your site. Refer to Configure Magic Tunnel health alerts to learn how to create an alert for your site.
#### No location set
-The dashboard shows you the number of sites with no location set, meaning sites for which you did not set up a geographic location. To add a location to a site, find the site you want to add location to, and select **no location set** to edit its location settings. Refer to [Set geographic coordinates](#set-geographic-coordinates) for more information.
+The dashboard shows you the number of sites with no location set, meaning sites for which you did not set up a geographic location. To add a location to a site, find the site you want to add location to, and select **no location set** to edit its location settings. Refer to Set geographic coordinates for more information.
### Traffic overview
-Traffic overview aggregates all Magic WAN sites configured in your account. Here, you can check at-a-glance information about each site like:
+Traffic overview aggregates all {props.productName} sites configured in your account. Here, you can check at-a-glance information about each site like:
- Site status
- Traffic sent and received
diff --git a/src/content/partials/networking-services/icmp-mfirewall.mdx b/src/content/partials/networking-services/icmp-mfirewall.mdx
index 77edda76583b1af..f5ac7262bd1329f 100644
--- a/src/content/partials/networking-services/icmp-mfirewall.mdx
+++ b/src/content/partials/networking-services/icmp-mfirewall.mdx
@@ -1,10 +1,12 @@
---
-{}
+params:
+ - mFirewallName
+ - mFirewallURL
---
import { GlossaryTooltip } from "~/components"
:::caution
-Internet Control Message Protocol (ICMP) traffic is subject to Magic Firewall rules. If you have Magic Firewall enabled, ensure your rules allow ICMP traffic sourced from Cloudflare public IPs. Otherwise, health checks will fail. Refer to [Magic Firewall rules](/magic-firewall/about/ruleset-logic/#magic-firewall-rules-and-magic-transit-endpoint-health-checks) for more information.
+Internet Control Message Protocol (ICMP) traffic is subject to Magic Firewall rules. If you have Magic Firewall enabled, ensure your rules allow ICMP traffic sourced from Cloudflare public IPs. Otherwise, health checks will fail. Refer to {props.mFirewallName} for more information.
:::
diff --git a/src/content/partials/networking-services/magic-wan/analytics/network-analytics.mdx b/src/content/partials/networking-services/magic-wan/analytics/network-analytics.mdx
new file mode 100644
index 000000000000000..c0f0dbaed298945
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/analytics/network-analytics.mdx
@@ -0,0 +1,24 @@
+---
+params:
+ - productName
+---
+
+import { GlossaryTooltip, Render } from "~/components"
+
+{props.productName} customers can view their real-time and historical network data in Network Analytics. Customers can see their network data in a time series that shows {props.productName} traffic (in packets or bytes) over time, and can filter the time series data by different types of [packet](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) characteristics.
+
+
+
+Refer to [Network Analytics](/analytics/network-analytics/) documentation to learn more.
+
+## Network traffic data filters
+
+
+
+## Access Magic Tunnel traffic analytics
+
+
diff --git a/src/content/partials/networking-services/magic-wan/custom-ike-id-ipsec.mdx b/src/content/partials/networking-services/magic-wan/custom-ike-id-ipsec.mdx
new file mode 100644
index 000000000000000..2201c679cbcf322
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/custom-ike-id-ipsec.mdx
@@ -0,0 +1,25 @@
+---
+params:
+ - productName
+---
+
+import { CURL } from "~/components";
+
+{props.productName} customers can configure a custom IKE ID for their IPsec tunnels. Customers that are using {props.productName} and a VeloCloud SD-WAN device together should utilize this option to create a high availability configuration.
+
+:::note
+This feature is only available via API. There are no configuration options for a custom IKE ID for an IPsec tunnel in the Cloudflare dashboard.
+:::
+
+VeloCloud has a high availability mechanism that allows customers to specify one set of IKE parameters (like IKE ID) and multiple remote IPs. Customers create an IKE ID, and then assign the same custom IKE ID to their primary IPsec tunnel and their backup IPsec tunnel. FQDN is the only supported type for custom IKE IDs.
+
+{props.productName} customers can set a custom IKE ID for an IPsec tunnel using the following API call. Customers will need to fill in the appropriate values for ``, ``, and the FQDN wildcard before running the API call.
+
+..custom.ipsec.cloudflare.com"}
+ }}
+/>
diff --git a/src/content/partials/networking-services/magic-wan/get-started.mdx b/src/content/partials/networking-services/magic-wan/get-started.mdx
new file mode 100644
index 000000000000000..1d04fe2ee4609b6
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/get-started.mdx
@@ -0,0 +1,81 @@
+---
+params:
+ - productNameManual
+ - productNameConnector
+ - configureConnectorUrl
+ - configureMwanManually
+ - greReferenceURL
+ - ipsecReferenceUrl
+ - ipsecReferenceConfigParams
+ - mtuReferenceURL
+---
+
+import { GlossaryTooltip, Render } from "~/components";
+
+{props.productName} allows you to achieve any-to-any connectivity across branch and retail sites and data centers, with Cloudflare connectivity cloud.
+
+## Before you begin
+
+{props.productName} is an Enterprise-only product. [Contact Cloudflare](https://www.cloudflare.com/magic-wan/) to acquire Magic WAN. If you plan on using {props.productNameConnector} to automatically onboard your locations to Cloudflare, you will need to purchase Magic WAN first.
+
+## Set up method
+
+{props.productName} supports an automatic setup and a manual setup. The automatic setup through {props.productNameConnector} is the preferred method.
+
+### Automatic set up
+
+Setting up {props.productName} automatically is done through {props.productNameConnector}, and is the preferred method. You can choose between the hardware version and the virtual version of the {props.productNameConnector}. The virtual version can be installed on your own machines.
+
+If you plan on using {props.productNameConnector}, you can skip the prerequisites below, and refer to Configure with Connector for more information on how to continue.
+
+### Manual set up
+
+Setting up {props.productName} manually is done through a combination of third-party devices in your premises and the Cloudflare dashboard. To be successful, you need to:
+
+1. Read the [Prerequisites](#prerequisites) below.
+2. Follow the steps in Manual configuration.
+
+## Prerequisites
+
+:::note
+The list of prerequisites below is only for customers planning to connect manually to Cloudflare with a third-party device. If you plan on using Magic WAN Connector, skip this section and refer to Configure with Connector.
+:::
+
+### Use compatible tunnel endpoint routers
+
+Magic WAN relies on GRE and IPsec tunnels to transmit [packets](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) from Cloudflare's global network to your origin network. To ensure compatibility with Magic WAN, the routers at your tunnel endpoints must:
+
+- Allow configuration of at least one tunnel per Internet service provider (ISP).
+- Support maximum segment size (MSS) clamping.
+- Support the configuration parameters for IPsec mentioned in IPsec tunnels.
+
+### Set maximum segment size
+
+
+
+#### MSS clamping recommendations
+
+##### GRE tunnels as off-ramp
+
+
+
+##### IPsec tunnels
+
+
+
+:::caution[Important]
+Refer to your device documentation to check if it sets IPsec MSS clamping automatically. If that is not the case and you are using IPsec inside GRE, you have to set MSS clamp manually.
+:::
+
+Refer to Maximum transmission unit and maximum segment size for more details.
+
+### Follow router vendor guidelines
+
+
\ No newline at end of file
diff --git a/src/content/partials/networking-services/magic-wan/load-balancing.mdx b/src/content/partials/networking-services/magic-wan/load-balancing.mdx
new file mode 100644
index 000000000000000..49e012db6473cae
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/load-balancing.mdx
@@ -0,0 +1,8 @@
+---
+params:
+ - productName
+---
+
+You can use Cloudflare Load Balancing with {props.productName} to distribute traffic across endpoints, reducing strain and improving the performance of your network. This works through Private Network Load Balancing, which supports both on-ramping and off-ramping traffic to Magic WAN tunnels.
+
+Refer to [Private Network Load Balancing](/load-balancing/private-network/) for more information about the feature and how to set it up. You will need to [enable Load Balancing](/load-balancing/) before you can use this feature.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/magic-wan/mtu-mss/mss-clamping-ipsec.mdx b/src/content/partials/networking-services/magic-wan/mtu-mss/mss-clamping-ipsec.mdx
index 13cca021276c1c4..cad79270d4ab17a 100644
--- a/src/content/partials/networking-services/magic-wan/mtu-mss/mss-clamping-ipsec.mdx
+++ b/src/content/partials/networking-services/magic-wan/mtu-mss/mss-clamping-ipsec.mdx
@@ -4,4 +4,4 @@
For IPsec tunnels, the value you need to specify depends on how your network is set up. The MSS clamping value will be lower than for GRE tunnels, however, since the physical interface will see IPsec-encrypted packets, not TCP packets, and MSS clamping will not apply to those.
-- **On your Edge router**: Apply this on your Magic WAN IPsec tunnel internal interface (meaning where the Magic WAN egress traffic will traverse). This may be done automatically once the tunnel is configured but it depends on your devices. TCP MSS clamp should be 1,360 bytes maximum.
+- **On your Edge router**: Apply this on your IPsec tunnel internal interface (meaning where the egress traffic will traverse). This may be done automatically once the tunnel is configured but it depends on your devices. TCP MSS clamp should be 1,360 bytes maximum.
diff --git a/src/content/partials/networking-services/magic-wan/reference/bandwidth-measurement.mdx b/src/content/partials/networking-services/magic-wan/reference/bandwidth-measurement.mdx
new file mode 100644
index 000000000000000..0ad814c063cf3ec
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/reference/bandwidth-measurement.mdx
@@ -0,0 +1,12 @@
+---
+params:
+ - productName
+ - cloudflareTunnelURL
+ - warpURL
+---
+
+Cloudflare measures Magic WAN usage based on the 95th percentile of bandwidth utilized by the customer's configured network.
+
+Configured Magic WAN network's bandwidth refers to the sum of traffic routed in and out of Magic WAN network namespace by measuring and summing each active customer's configured [GRE](https://www.cloudflare.com/learning/network-layer/what-is-gre-tunneling/), [IPSEC](https://www.cloudflare.com/learning/network-layer/what-is-ipsec/), Cloudflare Tunnel and [Cloudflare Network Interconnect](/network-interconnect/) tunnel's highest P95th percentile (ingress or egress traffic). The usage measurement excludes WARP traffic.
+
+To measure 95th percentile bandwidth at each tunnel, Cloudflare records bandwidth incoming and leaving our global network at five minute intervals, sorts these measurements in descending order, and discards the top 5% of recorded measurements. The highest remaining value constitutes the 95th percentile bandwidth measurement for that time period.
diff --git a/src/content/partials/networking-services/magic-wan/security-filters.mdx b/src/content/partials/networking-services/magic-wan/security-filters.mdx
new file mode 100644
index 000000000000000..7f6238463ebe3fb
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/security-filters.mdx
@@ -0,0 +1,14 @@
+---
+params:
+ - productNameWAN
+ - magicFirewallPlansURL
+ - productNameFirewall
+ - magicFirewallURL
+ - gatewayURL
+---
+
+{props.productNameWAN} customers have automatic access to Magic Firewall. {props.productNameFirewall} is Cloudflare's firewall-as-a-service solution that allows you to protect your infrastructure. {props.productNameFirewall} supports layers three and four of the [OSI model](https://www.cloudflare.com/learning/ddos/glossary/open-systems-interconnection-model-osi/), and enables you to allow or block traffic on a variety of packet characteristics.
+
+Refer to {props.productNameFirewall} for more information about this product.
+
+As a {props.productNameWAN}, you can also use Cloudflare Gateway to set up policies to inspect network and HTTP traffic to the Internet or your private network infrastructure. Refer to Connect to Cloudflare Gateway with Magic WAN to learn how to filter Magic WAN traffic with Gateway policies.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/magic-wan/zero-trust/gateway.mdx b/src/content/partials/networking-services/magic-wan/zero-trust/gateway.mdx
new file mode 100644
index 000000000000000..9c81fbf2da00707
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/zero-trust/gateway.mdx
@@ -0,0 +1,125 @@
+---
+params:
+ - gatewayURL
+ - magicFirewallName
+ - magicFirewallURL
+ - warpURL
+ - cfAutoCertificatesURL
+ - cfManualCertificatesURL
+ - decryptTlsURL
+ - doNotInspectURL
+ - magicWANName
+ - warpChecksURL
+ - osVersionChecks
+ - mwanOnrampsURL
+ - gatewayResolverPoliciesURL
+ - gatewayInternalDnsURL
+ - egressPoliciesURL
+ - cloudflareTunnelURL
+ - gatewayLogsURL
+ - tcpMssClampingURL
+ - ikeURL
+---
+
+import { Render } from "~/components";
+
+Cloudflare Gateway, our comprehensive Secure Web Gateway, allows you to set up policies to inspect DNS, network, HTTP, and egress traffic.
+
+You can apply network and HTTP Gateway policies alongside {props.magicFirewallName} policies (for L3/4 traffic filtering) to Internet-bound traffic or private traffic entering the Cloudflare network via Magic WAN. Additionally, you can configure Gateway to [resolve DNS queries](#dns-filtering) from Magic WAN.
+
+## HTTPS filtering
+
+In order to inspect HTTPS traffic, you need to install a Cloudflare root certificate on each client device. You can use the WARP client to automatically install a Cloudflare certificate on supported devices. If your device or application does not support certificate installation via WARP, you can manually install a certificate. A certificate is required for Cloudflare to decrypt TLS.
+
+If you cannot or do not want to install the certificate, you can create Do Not Inspect policies to exempt incompatible {props.magicWANName} traffic from inspection or to disable TLS decryption entirely. Because Gateway cannot discern {props.magicWANName} traffic, you must use WARP client checks or the IP addresses associated with {props.magicWANName} to match traffic with Gateway policies. For example, if your organization onboards devices to {props.magicWANName} via WARP, you can exempt devices not running WARP using OS version checks:
+
+| Selector | Operator | Value | Logic | Action |
+| ---------------------------- | -------- | -------------------- | ----- | -------------- |
+| Passed Device Posture Checks | not in | Windows (OS version) | Or | Do Not Inspect |
+| Passed Device Posture Checks | not in | macOS (OS version) | Or | Do Not Inspect |
+| Passed Device Posture Checks | not in | Linux (OS version) | Or | Do Not Inspect |
+| Passed Device Posture Checks | not in | iOS (OS version) | Or | Do Not Inspect |
+| Passed Device Posture Checks | not in | Android (OS version) | | Do Not Inspect |
+
+If your organization onboards users to Magic WAN via an on-ramp other than WARP, you can exempt devices from inspection using the IP addresses for your Magic IPsec tunnels:
+
+| Selector | Operator | Value | Action |
+| --------- | -------- | ---------------- | -------------- |
+| Source IP | in | `203.0.113.0/24` | Do Not Inspect |
+
+## DNS filtering
+
+You can configure the DNS resolver for your {props.magicWANName} networks to the shared IP addresses for the Gateway DNS resolver. The Gateway DNS resolver IPs are `172.64.36.1` and `172.64.36.2`. When you resolve DNS queries from {props.magicWANName} through Gateway, Gateway will log the queries with the private source IP. You can use the private source IP to create resolver policies for queries intended for internal DNS records.
+
+
+
+## Outbound Internet traffic
+
+By default, the following traffic routed through {props.magicWANName} tunnels and destined to public IP addresses is proxied/filtered through Cloudflare Gateway:
+
+- TCP, UDP, and ICMP traffic sourced from [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) IPs or WARP devices.
+- TCP and UDP traffic sourced from [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/) and destined to a well-known port (`0`-`1023`).
+
+Traffic destined to public IPs will be routed over the public Internet, unless explicitly specified otherwise. If you want to configure specific public IP ranges to be routed through your Magic WAN tunnels instead of over the public Internet after filtering, contact your account team.
+
+This traffic will egress from Cloudflare according to the egress policies you define in Cloudflare Gateway. By default, it will egress from a shared Cloudflare public IP range.
+
+## Private traffic
+
+By default, TCP, UDP, and ICMP traffic routed through Magic WAN tunnels and destined to routes behind Cloudflare Tunnel will be proxied/filtered through Cloudflare Gateway.
+
+Contact your account team to enable Gateway filtering for traffic destined to routes behind {props.magicWANName} tunnels.
+
+If enabled, by default TCP/UDP traffic meeting **all** the following criteria will be proxied/filtered by Cloudflare Gateway:
+
+- Both source and destination IPs are part of either [RFC1918](https://datatracker.ietf.org/doc/html/rfc1918) space, WARP, [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/)
+- Source port must be a client port strictly higher than `1023`
+- Destination port is a well-known port lower than `1024`
+
+Optionally, more specific matches may be specified to override the default:
+
+- Source IP prefix in a subset of RFC1918 space, or [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/)
+- Destination IP prefix in a subset of RFC1918 space, or [BYO](/byoip/) or [Leased IPs](/magic-transit/cloudflare-ips/)
+- Destination port number anywhere from `0`-`65535`
+
+Source ports are hard-coded to `1024`-`65535` and may not be overridden.
+
+
+
+## Test Gateway integration
+
+To check if Gateway is working properly with your {props.magicWANName} connection, open a browser from a host behind your customer premise equipment, and browse to `https://ifconfig.me`.
+
+If you are still in the process of testing Gateway, and Cloudflare is not your default route, configure a policy-based route on your router to send traffic to Cloudflare Gateway first, before browsing to `https://ifconfig.me`.
+
+Confirm there is an entry for the test in HTTP Gateway Activity Logs. The destination IP address should be the public IP address of `ifconfig.me`, and the source IP address should be the private (WAN) address of the host with the browser. Your outbound connection should be sourced from a {props.magicWANName} IP address, and not any public IP address that Cloudflare might be advertising on your behalf. This is true as well when using [Magic Transit With Egress Option](/reference-architecture/architectures/magic-transit/#magic-transit-with-egress-option-enabled).
+
+Additionally, test both `http://ifconfig.me` (non-TLS) and `https://ifconfig.me` (TLS) to ensure that your TCP maximum segment size (MSS Clamping) has been set properly. If the response to the HTTPS query hangs or fails, but HTTP works, it is possible that the MSS value is too high or not set. Reduce this value on your customer premise equipment to match the overhead introduced by your IKE and [ESP](https://en.wikipedia.org/wiki/IPsec#Encapsulating_Security_Payload) settings.
diff --git a/src/content/partials/networking-services/magic-wan/zero-trust/overview.mdx b/src/content/partials/networking-services/magic-wan/zero-trust/overview.mdx
new file mode 100644
index 000000000000000..dcbc78cca11e6f4
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/zero-trust/overview.mdx
@@ -0,0 +1,12 @@
+---
+params:
+ - productName
+---
+
+import { DirectoryListing } from "~/components"
+
+Review the tutorials to learn more about how you can use {props.productName} with the following Cloudflare Zero Trust products.
+
+
+
+If you want a deep dive into key architecture and functionalities aspects of Cloudflare One, and learn more about {props.productName} and its structure, refer to [Evolving to a SASE architecture with Cloudflare](/reference-architecture/architectures/sase/).
\ No newline at end of file
diff --git a/src/content/partials/networking-services/magic-wan/zero-trust/tunnel.mdx b/src/content/partials/networking-services/magic-wan/zero-trust/tunnel.mdx
new file mode 100644
index 000000000000000..352a1d8672fa4df
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/zero-trust/tunnel.mdx
@@ -0,0 +1,41 @@
+---
+params:
+ - productName
+ - tunnelURL
+ - gatewayURL
+ - privateRoutesURL
+---
+
+import { Render } from "~/components"
+
+{props.productName} can be used together with Cloudflare Tunnel for easy access between your networks and applications.
+
+By default, TCP, UDP, and ICMP traffic routed through Magic WAN tunnels and destined to routes behind Cloudflare Tunnel will be proxied/filtered through Cloudflare Gateway.
+
+## Cloudflare Tunnel and Magic Networking Route interactions
+
+Private network routes are evaluated together across Cloudflare Tunnel and Magic Networking routing tables. If traffic matches either a Cloudflare Tunnel route (in any virtual network) or a Magic Networking route, then the matched route will determine the next-hop.
+
+To design solutions where a destination IP may match both a Cloudflare Tunnel private network route and a Magic Networking route, consult your solutions engineer for guidance.
+
+## Test `cloudflared` tunnel integration
+
+To check if a `cloudflared` tunnel is working properly with your {props.productName} connection, open a browser from a host behind your customer premise equipment, and browse to the `cloudflared` tunnel endpoint.
+
+For example, imagine you have a Cloudflare Tunnel set up with a private network CIDR of `10.1.2.3/32`, a static route defined in {props.productName} for `10.1.2.3/24`, and the device you are trying to connect to is a web server. You can test connectivity to the web server by using a browser to load `https://10.1.2.3`. If the page loads correctly, your Cloudflare Tunnel is working properly. In this scenario, you have overlapping routes defined for Cloudflare Tunnel and {props.productName}.
+
+As mentioned above, if you have overlapping routes in your {props.productName} and Cloudflare Tunnel routing configurations, Cloudflare Tunnel will take precedence. This happens whenever a `cloudflared` tunnel CIDR matches a packet, regardless of prefix length. For example, a `cloudflared` tunnel with prefix `10.1.2.0/24` will take precedence over a static route configured to `10.1.2.4/32`, sending packets over a GRE tunnel.
+
+For more information, refer to Connect private networks.
+
+
diff --git a/src/content/partials/networking-services/magic-wan/zero-trust/warp.mdx b/src/content/partials/networking-services/magic-wan/zero-trust/warp.mdx
new file mode 100644
index 000000000000000..aa75d4ad352b025
--- /dev/null
+++ b/src/content/partials/networking-services/magic-wan/zero-trust/warp.mdx
@@ -0,0 +1,122 @@
+---
+params:
+ - productName
+ - warpURL
+ - greIpsecURL
+ - magicFirewallName
+ - magicFirewallURL
+ - setupZeroTrustAccountURL
+ - ztDashPath
+ - splitTunnelsURL
+ - warpDeploymentURL
+ - warpIngressIpURL
+ - mwanConnectorName
+ - domainFallbackURL
+---
+
+import { Markdown } from "~/components";
+
+:::note
+By default, direct WARP-to-WARP connections are not supported for devices located behind {props.productName} with WARP enabled. This is due to issues caused by double encapsulation and asymmetric routing.
+
+When a device is behind {props.productName}, it is recommended to avoid enabling WARP. Instead, access the device using its local LAN IP from remote systems, rather than relying on WARP-to-WARP communication.
+
+If you do want to use WARP on a device behind {props.productName} and connect to its WARP IP (within the `100.96.0.0/12` range), you will need to adjust your WARP profiles. Specifically, exclude the `100.96.0.0/12` subnet from the on-premises WARP profile, and include it in the off-premises profile.
+:::
+
+import { GlossaryTooltip, Render } from "~/components";
+
+Use WARP as an on-ramp to {props.productName} and route traffic from user devices with WARP installed to any network connected with Cloudflare Tunnel or Magic IP-layer tunnels (anycastGRE, IPsec, or [CNI](/network-interconnect/)). Take advantage of the integration between {props.productName} and {props.magicFirewallName} and enforce policies at Cloudflare's global network.
+
+## Prerequisites
+
+Before you can begin using WARP as an on-ramp to {props.productName}, you must set up your Zero Trust account.
+
+## IP ranges
+
+When connecting a WARP device to {props.productName}, you will have virtual IP addresses from WARP, in the `100.96.0.0/12` range.
+
+---
+
+## Set up WARP with {props.productName}
+
+### 1. Route packets back to WARP devices
+
+Route packets back to WARP devices from services behind an anycast GRE or other type tunnel. You need to do this before actually installing WARP. Otherwise, your infrastructure will not route packets correctly to Cloudflare global network and connectivity will fail.
+
+Cloudflare will assign IP addresses from the WARP virtual IP (VIP) space to your WARP devices. To view your virtual IP address, open the [Cloudflare Zero Trust dashboard](https://one.dash.cloudflare.com/), and select .
+
+All packets with a destination IP in the VIP space need to be routed back through the tunnel. For example, with a single GRE tunnel named `gre1`, in Linux, the following command would add a routing rule that would route such packets:
+
+```sh
+ip route add 100.96.0.0/12 dev gre1
+```
+
+:::note[Note]
+
+After set up, **HTTP** and **Network logs** in Gateway will show the virtual IP address of your WARP device as the **Source IP**. DNS logs will continue to show the original WARP device IP because DNS traffic is sent over the public Internet to Cloudflare's public-facing resolver.
+:::
+
+### 2. Configure Split Tunnels
+
+Configure Split Tunnels from your Zero Trust account to only include traffic from the private IP addresses you want to access.
+
+Optionally, you can configure Split Tunnels to include IP ranges or domains you want to use for connecting to public IP addresses.
+
+### 3. Install the WARP client on your device
+
+Refer to Deploy WARP to your organization for more information on whether to choose a manual or managed deployment.
+
+You should be able to access Private IP addresses specified in the Split Tunnel configuration.
+
+You must log out and log back in with at least one WARP device to ensure the configuration updates on your device.
+
+
+
+## Double encapsulation
+
+When a WARP user goes to a location (like an office) with a {props.productName} tunnel already set up, WARP traffic is doubly encapsulated - first by WARP and then by {props.productName}. This is unnecessary, since each on-ramp method provides full Zero Trust protection.
+
+Since WARP traffic is already protected on its own, Cloudflare recommends that you set up {props.productName} to exclude WARP traffic, sending it to the Internet through regular connections.
+
+To learn which IP addresses and UDP ports you should exclude to accomplish this, refer to WARP ingress IP.
+
+### WARP and {props.mwanConnectorName}
+
+
+
+## Test WARP integration
+
+Before testing, be sure to configure domain fallback for the server or service in WARP settings. This is needed because by default Cloudflare Zero Trust excludes common top level domains used for local resolution from being sent to Gateway for processing.
+
+If WARP integration has been enabled for the account within the last day, log off and on again in the WARP client before testing.
+
+To check if WARP is working correctly as an on-ramp, you can do a resolution test on a [fully qualified domain name (FQDN)](https://en.wikipedia.org/wiki/Fully_qualified_domain_name) for a server or service in the {props.productName}. Test this from a user with a WARP device.
+
+For example:
+
+```sh
+nslookup
+```
+
+This DNS lookup should return a valid IP address associated with the server or service you are testing for.
+
+Next, test with a browser that you can connect to a service on the WAN by opening a webpage that is only accessible on the WAN. The server can be the same server used in the DNS lookup or another server in the WAN. Connecting using an IP address instead of a domain name should work.
diff --git a/src/content/partials/networking-services/mconn/app-aware-policies/warp-traffic.mdx b/src/content/partials/networking-services/mconn/app-aware-policies/warp-traffic.mdx
deleted file mode 100644
index 0f7c01902904c1a..000000000000000
--- a/src/content/partials/networking-services/mconn/app-aware-policies/warp-traffic.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
----
-{}
----
-
-If you have Magic WAN Connector and WARP clients deployed in your premises, Magic WAN Connector automatically routes WARP traffic to the Internet rather than Magic WAN IPsec tunnels. This prevents traffic from being encapsulated twice.
-
-You may need to configure your firewall to allow this new traffic. Make sure to allow the following IPs and ports:
-
-- **Destination IPs**: `162.159.193.0/24`, `162.159.197.0/24`
-- **Destination ports**: `443`, `500`, `1701`, `2408`, `4443`, `4500`, `8095`, `844`
-Refer to [WARP with firewall](/cloudflare-one/connections/connect-devices/warp/deployment/firewall/) for more information on this topic.
diff --git a/src/content/partials/networking-services/mconn/configure-connectors.mdx b/src/content/partials/networking-services/mconn/configure-connectors.mdx
index 88f882edbc72e63..2319c961eaf5440 100644
--- a/src/content/partials/networking-services/mconn/configure-connectors.mdx
+++ b/src/content/partials/networking-services/mconn/configure-connectors.mdx
@@ -2,12 +2,27 @@
params:
- magicWord
- productName
+ - productNameVirtual?
+ - maintenanceURL
+ - productOriginalName
+ - sfpURL?
- wan
- lan
- noConnectorShows
+ - networkSegmentationURL
+ - dhcpServerURL
+ - dhcpRelayURL
+ - reserveIpAddressesURL
- shippedLanguage
- hardSoftConn
+ - hcConfigsURL
- finalInstructions
+ - ipsecTunnelsRefURL
+ - staticRoutesRefURL
+ - networkOptionsURL
+ - maintenanceURL
+ - referenceInformationURL
+ - troubleshootingURL
---
import {
@@ -25,25 +40,21 @@ import {
{ props.magicWord === "virtual" && (
<>
-
Virtual Magic WAN Connector (Virtual Connector) is a virtual appliance alternative to the hardware based Magic WAN Connector appliance. These two versions of Connector are identical otherwise.
Currently, you can set up Virtual Connector on VMWare ESXi and Proxmox Virtual Environment. Support for Proxmox is in beta.
+
{props.productNameVirtual} is a virtual appliance alternative to the hardware based {props.productName}. These two versions of Connector are identical otherwise.
Currently, you can set up {props.productNameVirtual} on VMWare ESXi and Proxmox Virtual Environment. Support for Proxmox is in beta.
>
)
}
-In this page you will find instructions on how to configure Magic WAN Connector. This guide provides a step-by-step guide for Magic WAN Connector's initial setup. You can either return here after setting up your Connector, or refer to the [Maintenance](/magic-wan/configuration/connector/maintenance/) section where you will find instructions on how to update your settings.
+In this page you will find instructions on how to configure {props.productName}. This guide provides a step-by-step guide for {props.productName} initial setup. You can either return here after setting up your Connector, or refer to the Maintenance section where you will find instructions on how to update your settings.
## Prerequisites
{ props.magicWord === "hardware" && (
<>
- You need to purchase {props.productOriginalName} before you can purchase and use the {props.productName}. The {props.productName} can function as your primary edge device for your network, or be deployed in-line with existing network gear.
+
+
You also need to purchase a {props.productName} before you can start configuring your settings in the Cloudflare dashboard. Contact your account representative to learn more about purchasing options for the Magic WAN Connector device.
- You also need to purchase a Magic WAN Connector before you can start configuring your settings in the Cloudflare dashboard. Contact your account representative to learn more about purchasing options for the Magic WAN Connector device.
- `}
- inline={false}
- />
>
)
}
@@ -52,7 +63,7 @@ In this page you will find instructions on how to configure Magic WAN Connector.
<>
@@ -76,15 +87,15 @@ In this page you will find instructions on how to configure Magic WAN Connector.
## Before you begin
-There are a couple of decisions you need to make when installing your {props.productName}. Refer to the topics below for more information.
+There are a couple of decisions you need to make when installing your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName }. Refer to the topics below for more information.
### Determine the need for a high availability configuration
-You can install up to two {props.productName}s for redundancy at each of your sites. If one of your Connectors fails, traffic will fail over to the other Connector ensuring that you never lose connectivity to that site.
+You can install up to two { props.magicWord === "virtual" ? props.productNameVirtual : props.productName }s for redundancy at each of your sites. If one of your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName }s fails, traffic will fail over to the other { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } ensuring that you never lose connectivity to that site.
In this type of high availability (HA) configuration, you will choose a reliable LAN interface as the HA link which will be used to monitor the health of the peer connector. HA links can be dedicated links or can be shared with other LAN traffic.
-You must decide the type of configuration you want for your site from the beginning: no redundancy or with redundancy. You cannot add redundancy after finishing the configuration of your dashboard settings. If, at a later stage, you decide to enable redundancy, you will need to delete your Connector on-ramp in the Cloudflare dashboard, and start again.
+You must decide the type of configuration you want for your site from the beginning: no redundancy or with redundancy. You cannot add redundancy after finishing the configuration of your dashboard settings. If, at a later stage, you decide to enable redundancy, you will need to delete your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } on-ramp in the Cloudflare dashboard, and start again.
@@ -97,7 +108,7 @@ You must decide the type of configuration you want for your site from the beginn
:::caution
-You cannot enable high availability for an existing Connector on-ramp. To add high availability to an existing Connector on-ramp in the Cloudflare dashboard, you need to delete the on-ramp and start again. Plan accordingly to create a high availability configuration from the start if needed.
+You cannot enable high availability for an existing { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } on-ramp. To add high availability to an existing { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } on-ramp in the Cloudflare dashboard, you need to delete the on-ramp and start again. Plan accordingly to create a high availability configuration from the start if needed.
:::
@@ -105,7 +116,7 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
{ props.magicWord === "hardware" && (
<>
-
You can use Magic WAN Connector in both DHCP networks and networks that require a static IP configuration. At first boot, however, Magic WAN Connector needs to reach out to Cloudflare to download your settings and go through the activation process. If any of the networks plugged into your Connector are DHCP enabled, does not use a VLAN, and have an Internet connection, that process is handled automatically. However, if all of the networks require more information to utilize, (such as a network with static IPs, or tagged VLAN networks) your Magic WAN Connector might need some more information to proceed.
+
You can use {props.productName} in both DHCP networks and networks that require a static IP configuration. At first boot, however, {props.productName} needs to reach out to Cloudflare to download your settings and go through the activation process. If any of the networks plugged into your Connector are DHCP enabled, does not use a VLAN, and have an Internet connection, that process is handled automatically. However, if all of the networks require more information to utilize, (such as a network with static IPs, or tagged VLAN networks) your {props.productName} might need some more information to proceed.
There are couple of ways to provide this information. Choose the one that fits your workflow:
@@ -113,7 +124,7 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
-
Virtual Connector uses a DHCP connection at first boot to download your settings and go through the activation process. However, if you need to use a static IP in your Virtual Connector, and this is a fresh install:
+
{props.productNameVirtual} uses a DHCP connection at first boot to download your settings and go through the activation process. However, if you need to use a static IP in your {props.productNameVirtual}, and this is a fresh install:
SFP+ port information for details on this topic.
`}
inline={false}
/>
@@ -163,7 +174,7 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
{ props.magicWord === "virtual" && (
<>
-
Select the appropriate tab below to learn how to configure Virtual Connector on VMWare ESXi or Proxmox Virtual Environment.
+
Select the appropriate tab below to learn how to configure {props.productNameVirtual} on VMWare ESXi or Proxmox Virtual Environment.
@@ -171,11 +182,11 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
text={`
**1. Obtain the VMWare image**
- Contact your account team at Cloudflare to obtain the Virtual Connector OVA package and license keys. The OVA image includes the files required to install and configure the virtual machine (VM) for Virtual Connector with the appropriate settings. Refer to [VMWare VMs documentation](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-AE61948B-C2EE-436E-BAFB-3C7209088552.html) for more information on this topic.
+ Contact your account team at Cloudflare to obtain the ${props.productNameVirtual} OVA package and license keys. The OVA image includes the files required to install and configure the virtual machine (VM) for ${props.productNameVirtual} with the appropriate settings. Refer to [VMWare VMs documentation](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-AE61948B-C2EE-436E-BAFB-3C7209088552.html) for more information on this topic.
- This image can be deployed multiple times to create several instances of a Virtual Connector, in different locations or on the same ESXi host.
+ This image can be deployed multiple times to create several instances of a ${props.productNameVirtual}, in different locations or on the same ESXi host.
- You will consume one license key for each instance created. For example, if you want to deploy 10 Virtual Connectors you should request 10 license keys, and your account team will create 10 Connector instances in your Cloudflare dashboard.
+ You will consume one license key for each instance created. For example, if you want to deploy 10 ${props.productNameVirtual}s you should request 10 license keys, and your account team will create 10 ${props.productNameVirtual} instances in your Cloudflare dashboard.
`}
inline={false}
/>
@@ -183,14 +194,14 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
**Port groups**, and prepare your vSwitch port groups and/or VLANs for your desired network topology. For example, a simple deployment typically has:
- - A WAN port group where the Virtual Connector will get an IP address (static or DHCP) that has access to the Internet.
- - A LAN port group, where the Virtual Connector will act as default router, and possibly DHCP server.
- - A null, or unused, port group for allocating unused virtual interfaces in the Virtual Connector. You can, for example, create a null port group with the name of Null port group, and a **VLAN ID** of 999.
+ 1. When setting up your VMware ESXi, you need to create port groups for ${props.productNameVirtual}. Go to **Networking** > **Port groups**, and prepare your vSwitch port groups and/or VLANs for your desired network topology. For example, a simple deployment typically has:
+ - A WAN port group where the ${props.productNameVirtual} will get an IP address (static or DHCP) that has access to the Internet.
+ - A LAN port group, where the ${props.productNameVirtual} will act as default router, and possibly DHCP server.
+ - A null, or unused, port group for allocating unused virtual interfaces in the ${props.productNameVirtual}. You can, for example, create a null port group with the name of Null port group, and a **VLAN ID** of 999.
`}
inline={false}
/>
@@ -210,7 +221,7 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
text={`
Take note of the folder where you are extracting the files to, as you will need to refer to that folder when creating the VM.
- 3. Go to **Virtual Machines** > **Create/Register VM** wizard to start deploying the Virtual Connector.
+ 3. Go to **Virtual Machines** > **Create/Register VM** wizard to start deploying the ${props.productNameVirtual}.
4. Select **Deploy a virtual machine from an OVF or OVA file** > **Next**.
@@ -230,7 +241,7 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
10. Before completing the deployment wizard, disable **Power on automatically**. This is important so that you can configure the license key prior to boot.
11. Configure the virtual machine with the license key your account team provided you:
- 1. Select the Virtual Connector's VM > **Settings**.
+ 1. Select the ${props.productNameVirtual}'s VM > **Settings**.
2. Go to **VM Options** > **Advanced** > **Edit Configuration**.
3. Select **Add parameter** to add your license key. Scroll down to the last entry (this is where VMware adds the new parameter), and add the following two new entries:
- **Key**: guestinfo.cloudflare.identity
@@ -243,7 +254,7 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
Cloudflare dashboard.
`}
inline={false}
@@ -253,18 +264,18 @@ You cannot enable high availability for an existing Connector on-ramp. To add hi
-
To set up and use Magic WAN Connector, you first need to register it with your account.
-
+
To set up and use {props.productOriginalName}, you first need to register it with your account.
+
>
)
}
### Add a Connector on-ramp
-You need to add your Connector to your Cloudflare dashboard and configure its settings before connecting it to the Internet.
+You need to add your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } to your Cloudflare dashboard and configure its settings before connecting it to the Internet.
-To add a Connector on-ramp:
+To add a { props.magicWord === "virtual" ? props.productNameVirtual : props.productName }:
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
@@ -324,18 +340,18 @@ To add a Connector on-ramp:
4. In **Name**, enter a descriptive name for your Connector. Optionally, you can also add a description for it.
5. You need to decide if you want to turn on high availability for the Connector. Refer to [About high availability configurations](#about-high-availability-configurations) for more information.
6. Select **Create and continue**.
-7. Select **Add Connector**. This will show you a list of Magic WAN Connector devices associated with your account.
+7. Select **Add Connector**. This will show you a list of { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } devices associated with your account.
8. If you have more than one Connector, choose the one that corresponds to the on-ramp you are creating. Connectors are identified by a serial number, also known as a service tag. Use this information to choose the right Connector. Select **Select Connector** when you are ready to proceed.
-9. The Connector will be added to your account with an **Interrupt window** defined. The interrupt window is the time period when the Magic WAN Connector software can update, which may result in interruption to existing connections. You can change this later. Refer to [Interrupt window](/magic-wan/configuration/connector/maintenance/interrupt-service-window/) for more details on how to define when the Connector can update its systems.
+9. The Connector will be added to your account with an **Interrupt window** defined. The interrupt window is the time period when the { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } software can update, which may result in interruption to existing connections. You can change this later. Refer to [Interrupt window](/magic-wan/configuration/connector/maintenance/interrupt-service-window/) for more details on how to define when the Connector can update its systems.
10. Select **Continue** to proceed to creating your WAN and LAN networks.
### Create a WAN
-
+
-1. In **WAN configuration**, select **Create**. You can create one or more [wide area networks (WANs)](https://www.cloudflare.com/learning/network-layer/what-is-a-wan/). Configuring multiple WANs will create multiple IPsec tunnels (one IPsec tunnel per WAN port). This allows the Connector to load balance traffic over WANs of equal priority. It also allows Connector to failover between circuits according to their health. Refer to [WAN settings](/magic-wan/configuration/connector/reference/#wan-settings) for more details.
+1. In **WAN configuration**, select **Create**. You can create one or more [wide area networks (WANs)](https://www.cloudflare.com/learning/network-layer/what-is-a-wan/). Configuring multiple WANs will create multiple IPsec tunnels (one IPsec tunnel per WAN port). This allows { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } to load balance traffic over WANs of equal priority. It also allows Connector to failover between circuits according to their health. Refer to [WAN settings](/magic-wan/configuration/connector/reference/#wan-settings) for more details.
:::note
This is not the same as a high availability (HA) configuration. HA configurations need two Connectors to work. Refer to [About high availability configurations](#about-high-availability-configurations) for more information.
:::
@@ -420,30 +436,28 @@ curl https://api.cloudflare.com/client/v4/accounts/{account_id}/magic/sites/{sit
#### Network segmentation
-After setting up your LANs, you can configure your Connector to enable communication between them without traffic leaving your premises. Refer to [Network segmentation](/magic-wan/configuration/connector/network-options/network-segmentation/) for more information.
+After setting up your LANs, you can configure your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } to enable communication between them without traffic leaving your premises. Refer to Network segmentation for more information.
#### DHCP options
Magic WAN Connector supports different types of DHCP configurations. Connector can:
- Connect to a DHCP server or use a static IP address instead of connecting to a DHCP server.
-- Act as a [DHCP server](/magic-wan/configuration/connector/network-options/dhcp/dhcp-server/).
-- Use [DHCP relay](/magic-wan/configuration/connector/network-options/dhcp/dhcp-relay/) to connect to a DHCP server outside the location your Magic WAN Connector is in.
-- [Reserve IP addresses](/magic-wan/configuration/connector/network-options/dhcp/dhcp-static-address-reservation/) for specific devices on your network.
-
-Refer to [DHCP options](/magic-wan/configuration/connector/network-options/dhcp/) to learn more.
+- Act as a DHCP server.
+- Use DHCP relay to connect to a DHCP server outside the location your Magic WAN Connector is in.
+- Reserve IP addresses for specific devices on your network.
### Add your Connector to a site
-After finishing your Connector configuration, you need to add it to a site.
+After finishing your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } configuration, you need to add it to a site.
{ props.magicWord === "hardware" && (
<>
-
There are several deployment options for Magic WAN Connector. Connector can act like a DHCP server for your local network, or integrate with your local setup and have static IP addresses assigned to it.
-
When Connector acts like the WAN router for your site, deployment will be something like this:
+
There are several deployment options for {props.productName}. {props.productName} can act like a DHCP server for your local network, or integrate with your local setup and have static IP addresses assigned to it.
+
When {props.productName} acts like the WAN router for your site, deployment will be something like this:
{`flowchart LR
@@ -459,7 +473,7 @@ After finishing your Connector configuration, you need to add it to a site.
-
In the example below, the Connector sits behind the WAN router in your site, and on-ramps only some of the existing LANs to Cloudflare.
+
In the example below, the {props.productName} sits behind the WAN router in your site, and on-ramps only some of the existing LANs to Cloudflare.
{`flowchart LR
@@ -480,18 +494,18 @@ After finishing your Connector configuration, you need to add it to a site. Refer to Magic WAN Connector deployment options for a high-level explanation of the deployment options that make sense to most environments, as well as a few advanced use cases.
-
If there is a firewall deployed upstream of the Magic WAN Connector, configure the firewall to allow the following traffic:
+
If there is a firewall deployed upstream of the {props.productName}, configure the firewall to allow the following traffic:
@@ -506,25 +520,25 @@ After finishing your Connector configuration, you need to add it to a site.
-
When the Connector is first activated, you need to have Internet connection. If you chose to set up your Connector with DHCP you will need to have one of the Connector ports connected to the Internet through a device that supports DHCP. This is required so that the Connector can reach the Cloudflare global network and download the required configurations that you set up.
-
If you set up your Connector with a static IP through the bootstrap method, you do not need a DHCP port. Refer to DHCP vs static IP connections for more information.
+
When {props.productName} is first activated, you need to have Internet connection. If you chose to set up your {props.productName} with DHCP you will need to have one of the {props.productName} ports connected to the Internet through a device that supports DHCP. This is required so that the {props.productName} can reach the Cloudflare global network and download the required configurations that you set up.
+
If you set up your {props.productName} with a static IP through the bootstrap method, you do not need a DHCP port. Refer to DHCP vs static IP connections for more information.
When the Connector is first activated, one of the ports must be connected to the Internet through a device that supports DHCP. This is required so that the Connector can reach the Cloudflare global network and download the required configurations that you set up.
+
When the {props.productNameVirtual} is first activated, one of the ports must be connected to the Internet through a device that supports DHCP. This is required so that the {props.productNameVirtual} can reach the Cloudflare global network and download the required configurations that you set up.
-
+
>
)
}
-When you are ready to connect your Magic WAN Connector to the Cloudflare network:
+When you are ready to connect your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } to the Cloudflare network:
1. In the Cloudflare dashboard, go to Magic WAN's **Configuration** page.
@@ -571,22 +585,22 @@ When you are ready to connect your Magic WAN Connector to the Cloudflare network
{ props.magicWord === "hardware" && (
<>
-
After activating your Connector, you can use it in a network configuration with the WAN interface set to a static IP address — that is, an Internet configuration that is not automatically set by DHCP. To use your Connector on a network configuration with a static IP, follow the steps below.
+
After activating your {props.productName}, you can use it in a network configuration with the WAN interface set to a static IP address — that is, an Internet configuration that is not automatically set by DHCP. To use your Connector on a network configuration with a static IP, follow the steps below.
-
+
@@ -596,16 +610,16 @@ When you are ready to connect your Magic WAN Connector to the Cloudflare network
{ props.magicWord === "virtual" && (
<>
-
After activating your Virtual Connector, you can use it in a network configuration with the WAN interface set to a static IP address - that is, an Internet configuration that is not automatically set by DHCP. To use your Virtual Connector on a network configuration with a static IP, follow the steps below.
+
After activating your {props.productNameVirtual}, you can use it in a network configuration with the WAN interface set to a static IP address - that is, an Internet configuration that is not automatically set by DHCP. To use your {props.productNameVirtual} on a network configuration with a static IP, follow the steps below.
-
+
-
Advanced users can locally configure their Magic WAN Connector to work in a static IP configuration. This local method does not require having access to a DHCP Internet connection. However, it does require being comfortable with using tools to access the serial port on Magic WAN Connector as well as using a serial terminal client to access the Connector's environment.
-
Below is a detailed description of how to use the serial port to configure your Magic WAN Connector locally.
+
Advanced users can locally configure their {props.productName} to work in a static IP configuration. This local method does not require having access to a DHCP Internet connection. However, it does require being comfortable with using tools to access the serial port on {props.productName} as well as using a serial terminal client to access the {props.productName}'s environment.
+
Below is a detailed description of how to use the serial port to configure your {props.productName} locally.
-
+
-
+
-
-
Your Connector's default password is the serial number (also known as a Service Tag for Dell devices), all uppercase followed by an ! (for example, A1B2C3D!)
+
+
Your {props.productName}'s default password is the serial number (also known as a Service Tag for Dell devices), all uppercase followed by an ! (for example, A1B2C3D!)
-
To access Magic WAN Connector's environment you need a serial terminal client. Follow the instructions below to install one, based on your operating system.
+
To access ${props.productName}'s environment you need a serial terminal client. Follow the instructions below to install one, based on your operating system.
@@ -710,12 +724,12 @@ When you are ready to connect your Magic WAN Connector to the Cloudflare network
inline={false}
/>
-
-
The reset device option in your Connector clears most of the configuration that is locally cached, resets the password to the default, and reboots.
+
+
The reset device option in your {props.productName} clears most of the configuration that is locally cached, resets the password to the default, and reboots.
-
+
10.0.0.2/24).
7. Enter the IP address of the Internet gateway (this must be in the same subnet as the previous IP address you entered and must not be the same address).
8. Select **Save** and confirm that you want to use the new settings.
- 9. The Connector will download the rest of the settings from Cloudflare. The last heartbeat of the Connector should update once it has made contact with Cloudflare.
+ 9. The ${props.productName} will download the rest of the settings from Cloudflare. The last heartbeat of the Connector should update once it has made contact with Cloudflare.
`}
inline={false}
/>
@@ -743,17 +757,17 @@ When you are ready to connect your Magic WAN Connector to the Cloudflare network
## About high availability configurations
-{props.hardSoftConn} When you set up a site in high availability, the WANs and LANs in your Connectors have the same configuration but are replicated on two nodes. In case of failure of a Connector, the other Connector becomes the active node, taking over configuration of the LAN gateway IP and allowing traffic to continue without disruption.
+{props.hardSoftConn} When you set up a site in high availability, the WANs and LANs in your { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } have the same configuration but are replicated on two nodes. In case of failure of a { props.magicWord === "virtual" ? props.productNameVirtual : props.productName }, the other { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } becomes the active node, taking over configuration of the LAN gateway IP and allowing traffic to continue without disruption.
-Because Connectors in high availability configurations share a single site, you need to set up:
+Because { props.magicWord === "virtual" ? props.productNameVirtual : props.productName }s in high availability configurations share a single site, you need to set up:
- **Static address**: The IP for the primary node in your site.
- **Secondary static address**: The IP for the secondary node in your site.
-- **Virtual static address**: The IP that the LAN south of the Connector will forward traffic to, which is the LAN's gateway IP.
+- **Virtual static address**: The IP that the LAN south of the { props.magicWord === "virtual" ? props.productNameVirtual : props.productName } will forward traffic to, which is the LAN's gateway IP.
Make sure all IPs are part of the same subnet.
-For detailed information about the expected behavior of high availability configurations, refer to [High availability configurations](/magic-wan/configuration/connector/reference/#high-availability-configurations).
+For detailed information about the expected behavior of high availability configurations, refer to High availability configurations.
### Create a high availability configuration
@@ -781,7 +795,7 @@ To set up a high availability configuration:
## IPsec tunnels and static routes
-Magic WAN Connector automatically creates [IPsec tunnels](/magic-wan/reference/gre-ipsec-tunnels/#ipsec-tunnels) and [static routes](/magic-wan/reference/traffic-steering/) for you. You cannot configure these manually.
+Magic WAN Connector automatically creates IPsec tunnels and static routes for you. You cannot configure these manually.
To check the IPsec tunnels and static routes created by your Magic WAN Connector:
@@ -797,7 +811,7 @@ To check the IPsec tunnels and static routes created by your Magic WAN Connector
## Next steps
-- [Network options](/magic-wan/configuration/connector/network-options/)
-- [Maintenance](/magic-wan/configuration/connector/maintenance/)
-- [Reference information](/magic-wan/configuration/connector/reference/)
-- [Troubleshooting](/magic-wan/configuration/connector/troubleshooting/)
+- Network options
+- Maintenance
+- Reference information
+- Troubleshooting
diff --git a/src/content/partials/networking-services/mconn/device-metrics.mdx b/src/content/partials/networking-services/mconn/device-metrics.mdx
new file mode 100644
index 000000000000000..f05317b744036b3
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/device-metrics.mdx
@@ -0,0 +1,79 @@
+---
+params:
+ - productName
+ - troubleshootingURL
+---
+
+Cloudflare customers can inspect metrics for a specific {props.productName} in the Cloudflare dashboard. These metrics help you troubleshoot potential issues with your {props.productName}. Refer to Troubleshooting for more information.
+
+## Query metrics with GraphQL
+
+Customers can query Cloudflare's GraphQL API to fetch their {props.productName} device metrics. The Cloudflare dashboard displays {props.productName} device metrics over the past one hour. Via the GraphQL API, customers can query for up to 30 days of historical {props.productName} device metrics.
+
+For example:
+
+```graphql graphql-api-explorer
+query telemetry(
+ $accountTag: string
+ $snapshotsFilter: AccountMconnTelemetrySnapshotsAdaptiveGroupsFilter_InputObject!
+ $snapshotMountsFilter: AccountMconnTelemetrySnapshotMountsAdaptiveGroupsFilter_InputObject!
+ $snapshotThermalsFilter: AccountMconnTelemetrySnapshotThermalsAdaptiveGroupsFilter_InputObject!
+ $limit: int64!
+) {
+ viewer {
+ accounts(filter: { accountTag: $accountTag }) {
+ snapshots: mconnTelemetrySnapshots(
+ filter: $snapshotsFilter
+ limit: $limit
+ orderBy: [datetimeFiveMinutes_DESC]
+ ) {
+ max {
+ cpuCount
+ loadAverage1m
+ memoryFreeBytes
+ memoryTotalBytes
+ }
+ dimensions {
+ connectorId
+ datetimeFiveMinutes
+ }
+ }
+ snapshotMounts: mconnTelemetrySnapshotMounts(
+ filter: $snapshotMountsFilter
+ limit: $limit
+ orderBy: [datetimeFiveMinutes_DESC]
+ ) {
+ max {
+ availableBytes
+ totalBytes
+ }
+ dimensions {
+ connectorId
+ datetimeFiveMinutes
+ }
+ }
+ snapshotThermals: mconnTelemetrySnapshotThermals(
+ filter: $snapshotThermalsFilter
+ limit: $limit
+ orderBy: [datetimeFiveMinutes_DESC, connectorId_DESC]
+ ) {
+ max {
+ currentCelcius
+ }
+ dimensions {
+ connectorId
+ datetimeFiveMinutes
+ }
+ }
+ }
+ }
+}
+```
+
+### Average CPU load explained
+
+The metric `average CPU load` is unique and distinctly different from `CPU utilization` which is another common CPU metric. The {props.productName} uses a [Unix-style CPU load calculation]().
+
+CPU load is a measure of the number of processes that are currently running and that are waiting to be run on the CPU. Cloudflare collects the one minute load average from the device and converts that into a percentage based on the total number of cores in the CPU. If the {props.productName} CPU has eight cores, and a one minute load average of two, then the average CPU load is 25%. If the average CPU load is above 100%, then there are processes in the queue that are waiting to be executed on the CPU.
+
+Cloudflare is still evaluating the typical CPU load operating range on the MWAN Connector. In general, a healthy range for average CPU load on any device is between 30% and 70%. Customers may experience decreased MWAN Connector performance if the average CPU load is consistently above 100%.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/activate-connectors.mdx b/src/content/partials/networking-services/mconn/maintenance/activate-connectors.mdx
new file mode 100644
index 000000000000000..2058810b72995ec
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/activate-connectors.mdx
@@ -0,0 +1,11 @@
+---
+params:
+ - productName
+ - hadwareConnectorURL
+ - virtualConnectorURL
+---
+
+Before you can activate your {props.productName}, you need to follow Cloudflare's instructions regarding DHCP. For full instructions on this, refer to:
+
+- The hardware version of {props.productName}
+- The virtual version of {props.productName}
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/add-remove-connectors.mdx b/src/content/partials/networking-services/mconn/maintenance/add-remove-connectors.mdx
new file mode 100644
index 000000000000000..e83a24eba2af959
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/add-remove-connectors.mdx
@@ -0,0 +1,13 @@
+---
+params:
+ - productName
+---
+
+To add a new {props.productName} you first need to remove the one associated with the on-ramp. You can only have more than one {props.productName} if you initially enabled high availability on your on-ramp.
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
+4. In **Connectors**, remove the Connector associated with the on-ramp.
+5. Select **Add Connector** to add a different Connector to your on-ramp.
+6. Select **Save**.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/deactivate-connector.mdx b/src/content/partials/networking-services/mconn/maintenance/deactivate-connector.mdx
new file mode 100644
index 000000000000000..d83e65594a74f75
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/deactivate-connector.mdx
@@ -0,0 +1,13 @@
+---
+{}
+---
+
+import { DashButton } from '~/components';
+
+1. In the Cloudflare dash, go to the **Configuration* page.
+
+
+
+2. In the **Connectors** tab, find the Connector you want to deactivate, select the three dots next to it > **Edit**.
+3. In **Status**, select _Deactivated_ from the dropdown.
+4. Select **Update**.
diff --git a/src/content/partials/networking-services/mconn/maintenance/default-password.mdx b/src/content/partials/networking-services/mconn/maintenance/default-password.mdx
new file mode 100644
index 000000000000000..5638ee828d2e463
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/default-password.mdx
@@ -0,0 +1,18 @@
+---
+params:
+ - productName
+ - hardwareConnectorName
+ - virtualConnectorName
+---
+
+{props.productName} ships to you with a default password that enables you to access the hardware box or the virtual machine. Cloudflare recommends that you change this password after the first boot.
+
+## Default password to access hardware {props.hardwareConnectorName}
+
+Your Connector's default password is the serial number (also known as a Service Tag for Dell devices), all uppercase followed by an `!` (exclamation mark). For example, `A1B2C3D!`
+
+## Default password to access {props.virtualConnectorName}
+
+Your Virtual Connector's default password is the last seven characters of your license key, all uppercase, plus an `!` (exclamation mark).
+
+For example, if your license key is `mconn-abcdefghijklmnopqrstuvwxyz`, your default password will be `TUVWXYZ!`.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/edit-basic-info.mdx b/src/content/partials/networking-services/mconn/maintenance/edit-basic-info.mdx
new file mode 100644
index 000000000000000..dc6580ac328772e
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/edit-basic-info.mdx
@@ -0,0 +1,13 @@
+---
+{}
+---
+
+import { DashButton } from "~/components";
+
+In **Basic information**, you can change the name and description of your on-ramp.
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
+4. In **Basic information** make the necessary changes.
+5. Select **Save**.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/edit-network-settings.mdx b/src/content/partials/networking-services/mconn/maintenance/edit-network-settings.mdx
new file mode 100644
index 000000000000000..a879580522026d9
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/edit-network-settings.mdx
@@ -0,0 +1,11 @@
+---
+{}
+---
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
+4. Go to **Network configuration** > **WAN configuration** or **LAN configuration**.
+5. Find the WAN/LAN you want to edit > select the three dots next to it > **Edit**.
+6. Make the necessary changes.
+7. Select **Save**.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/edit-sites.mdx b/src/content/partials/networking-services/mconn/maintenance/edit-sites.mdx
new file mode 100644
index 000000000000000..3c6d9632d41d9e7
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/edit-sites.mdx
@@ -0,0 +1,9 @@
+---
+{}
+---
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Network overview (beta)**.
+3. Find the site you want to make changes on > select the three dots next to it > **Edit**.
+4. In **Basic information**, make changes to the site's name, description, and geographic coordinates.
+5. In **On-ramps**, add new on-ramps to your site. You can also remove existing ones.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/edit-traffic-steering.mdx b/src/content/partials/networking-services/mconn/maintenance/edit-traffic-steering.mdx
new file mode 100644
index 000000000000000..63d0d9af14bd8de
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/edit-traffic-steering.mdx
@@ -0,0 +1,12 @@
+---
+{}
+---
+
+You can only add or remove applications to Breakout traffic and Prioritized traffic. To add or remove applications:
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Find the on-ramp that you want to edit > select the three dots next to it > **Edit**.
+4. Go to **Traffic steering** > **Breakout traffic** or **Prioritized traffic**.
+5. Select **Add** to add a new application.
+6. To delete an application, find the one you want to delete from **Breakout traffic** or **Prioritized traffic** > select the three dots next to it > **Remove**.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/maintenance/heartbeat.mdx b/src/content/partials/networking-services/mconn/maintenance/heartbeat.mdx
new file mode 100644
index 000000000000000..4c50aa6a4d44acf
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/heartbeat.mdx
@@ -0,0 +1,24 @@
+---
+params:
+ - productName
+---
+
+import { DashButton } from '~/components';
+
+{props.productName} communicates periodically with Cloudflare via HTTPS. This is also known as a heartbeat, and lets Cloudflare know that the {props.productName} in question is connected to the Internet and reachable.
+
+The heartbeat calls are made to `api.cloudflare.com`. Each {props.productName} has a heartbeat frequency of 10 seconds, independently of the number of WAN interfaces you have running on your device.
+
+There are three symbols for the heartbeat signal that allow you to quickly check the status of {props.productName}:
+
+- **Blue `i`**: {props.productName} is contacting Cloudflare as expected.
+- **Yellow triangle**: {props.productName} has not yet connected to Cloudflare.
+- **Red triangle**: There is a potential problem with {props.productName}.
+
+### Access {props.productName}'s heartbeat
+
+1. In the Cloudflare dashboard, go to the **Configuration* page.
+
+
+
+2. In the **Connectors** tab, find your Connector, and place your cursor over the icon on the **Status** column to check the timestamp. The timestamp shows you the last time Connector successfully contacted Cloudflare.
diff --git a/src/content/partials/networking-services/mconn/maintenance/interrupt-service-window.mdx b/src/content/partials/networking-services/mconn/maintenance/interrupt-service-window.mdx
new file mode 100644
index 000000000000000..d68e8fed98ea2ed
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/maintenance/interrupt-service-window.mdx
@@ -0,0 +1,18 @@
+---
+params:
+ - productName
+---
+
+import { DashButton } from '~/components';
+
+The Interrupt window defines when {props.productName} can update its systems. When {props.productName} is updating, this may result in an interruption to existing connections. Set up a time window that minimizes disruption to your sites.
+
+1. In the Cloudflare dashboard, go to the **Configuration* page.
+
+
+
+2. In the **Connectors** tab, select the Connector for which you want to set up the update window > **Edit**.
+3. In **Interrupt window**, select the most appropriate time for the Connector to update its systems:
+ - **Timezone**: Select the time zone for the Connector to update.
+ - **Start time**: Choose an hour for the Connector to start updating. Cloudflare recommends you choose an hour when there is minimal activity in your network, to avoid potential disruptions.
+ - **Duration**: Duration indicates the time window during which the Connector is scheduled to update. For example, if you configure your Connector to update at `22:00` and specify a **Duration** of `4 hours`, the Connector will attempt to update within the four-hour period following `22:00`.
diff --git a/src/content/partials/networking-services/mconn/register-hardware-appliance.mdx b/src/content/partials/networking-services/mconn/maintenance/register-hardware-appliance.mdx
similarity index 77%
rename from src/content/partials/networking-services/mconn/register-hardware-appliance.mdx
rename to src/content/partials/networking-services/mconn/maintenance/register-hardware-appliance.mdx
index 29480c4a84aa00a..b2fb1b25fa8d51e 100644
--- a/src/content/partials/networking-services/mconn/register-hardware-appliance.mdx
+++ b/src/content/partials/networking-services/mconn/maintenance/register-hardware-appliance.mdx
@@ -1,16 +1,18 @@
---
-{}
+params:
+ - productName
---
import { DashButton } from "~/components";
+
1. In the Cloudflare dashboard, go to Magic WAN's **Configuration** page.
2. Under **Connectors**, select **Register your appliance**.
-3. In **Appliance details** > **Serial number**, insert the serial number for your device. You can optionally add notes about the Magic WAN Connector you are adding to the dashboard.
-4. (Optional) Select **Add** below **Serial number** to add multiple Magic WAN Connectors at once to your account.
+3. In **Appliance details** > **Serial number**, insert the serial number for your device. You can optionally add notes about the {props.productName} you are adding to the dashboard.
+4. (Optional) Select **Add** below **Serial number** to add multiple {props.productName}s at once to your account.
5. Select **Register appliance**.
-Your device is now registered with your account. Select **Add on-ramps** to continue with the setup process, or **Return to connections** to check your newly added Connector.
+Your device is now registered with your account. Select **Add on-ramps** to continue with the setup process, or **Return to connections** to check your newly added Connector.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/mconn-reference.mdx b/src/content/partials/networking-services/mconn/mconn-reference.mdx
new file mode 100644
index 000000000000000..09be3efd21d98f1
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/mconn-reference.mdx
@@ -0,0 +1,132 @@
+---
+params:
+ - productName
+ - virtualProductName
+ - gatewayURL
+ - hardConnectorURL
+ - virtualConnectorURL
+ - configHardProductName
+ - configVirtualProductName
+ - haSetupURL
+ - ecmpRoutingURL
+ - multipleWansURL
+ - sfpURL
+ - vlanIdURL
+ - trafficSteeringURL
+ - hcFrequencyURL
+ - dhcpURL
+ - routedSubnetsURL
+ - networkSegmentationURL
+---
+
+import { GlossaryTooltip, Render } from "~/components"
+
+{props.productName} software is certified for use on the [Dell Networking Virtual Edge Platform](https://www.dell.com/support/home/en-us/product-support/product/dell-emc-networking-vep1445-vep1485/docs). It can be purchased with software pre-installed through our partner network for plug-and-play connectivity to Cloudflare One.
+
+## Security and other information
+
+- Cloudflare ensures the {props.productName} device is secure and is not altered via TPM/Secure boot (does not apply to {props.virtualProductName}).
+- Connectivity to the Cloudflare global network is secure and all traffic is encrypted through IPsec tunneling. The {props.productName} uses ESP-in-UDP with GCM-AES-256 encryption. Cloudflare uses a non-IKE keying protocol built into our control plane, secured with TLS.
+- The {props.productName} does not support fail open.
+- Customers have the ability to layer on additional security features/policies that are enforced at the Cloudflare network.
+
+---
+
+## ICMP traffic
+
+ICMP traffic is routed through the Internet and bypasses Cloudflare Gateway. This enables you to ping resources on the Internet from the {props.productName} directly, which can be useful for debugging.
+
+---
+
+## VLAN ID
+
+This feature allows you to have multiple [virtual LANs](https://www.cloudflare.com/learning/network-layer/what-is-a-lan/) (VLANs) configured over the same physical port on your {props.productName}. VLAN tagging adds an extra header to [packets](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) in order to identify which VLAN the packet belongs to and to route it appropriately. This effectively allows you to run multiple networks over the same physical port.
+
+A non-zero value set up for the VLAN ID field in your WAN/LAN is used to handle VLAN-tagged traffic. Cloudflare uses the VLAN ID to handle traffic coming into your {props.productName} device, and applies a VLAN tag with the configured VLAN ID for traffic going out of your {props.productName} through WAN/LAN.
+
+You can setup VLAN IDs both for WAN and LAN. Refer to {props.configHardProductName} or {props.configVirtualProductName} to learn where you can set up VLAN IDs.
+
+## High availability configurations
+
+### Terminology
+
+- **Primary/Secondary**: Used to identify the two nodes which are part of a high availability (HA) configuration pair of {props.productName}s. This identity allows the node to identify which configuration is attributed to it — for example, specifying a primary and secondary IP in a LAN configuration. This identity is configured by the user on the Cloudflare dashboard.
+- **Active/Standby**: These are states that the two nodes in a HA pair will dynamically assume based on an election process. Only one node at any time is expected to be active.
+
+### High availability
+
+A site set up in high availability (HA) mode has two {props.productName}s with the same configuration but replicated in two nodes. In case of failure of a {props.productName}, the other {props.productName} becomes the active node, taking over configuration of the LAN gateway IP and allowing traffic to continue without disruption.
+
+### Active/Standby Election
+
+During the LAN configuration, one of the LAN links is configured as a HA link, which is used to exchange heartbeats, resulting in the active / standby election of nodes.
+
+The state election uses a `PRIORITY` parameter where the node with the higher priority becomes active and the other assumes the standby state. If the priority is the same, the state machine automatically picks one of the nodes as active.
+
+The HA pair is configured in non-preemptive mode, meaning that once a node becomes active, it will remain active unless its priority drops below that of the other node.
+
+### Configuration
+
+The two Connectors of a high availability (HA) pair are part of a single site. You designate the connectors as primary and secondary in the Cloudflare dashboard.
+
+:::note
+The HA link cannot be connected back-to-back. It has to be connected over a switch. This is because, in a direct connection, if the link is unplugged on one end, the other end also detects a link failure. Since we have configured the system to enter a `FAULT` state when the HA link goes down, the affected node will be unable to function as the active node.
+:::
+
+### Failure Detection and Failover
+
+The {props.productName}'s health can be in one of three states:
+
+- **Good** : All health parameters are good
+- **Degraded** : One of the following is true:
+ - Health of at least one configured tunnel is `DOWN`
+ - At least one of the LAN links is disconnected (physically unplugged)
+- **Down** : If one of the following is true:
+ - Health of all tunnels is `DOWN`
+ - All LAN interfaces are disconnected
+ - {props.productName}'s software is not healthy
+
+A failover happens when the active node's health declines to a level lower than that of the standby node. For example, from `GOOD` to `DEGRADED`, or from `DEGRADED` to `DOWN`. In the case of a failover where a {props.productName} is acting as a DHCP server, DHCP leases will be synchronized.
+
+When a failover occurs, traffic is moved to the new active node. It could take up to 30 seconds for traffic to be fully restored over the new active node.
+
+## WAN settings
+
+This is where you add and configure your WAN connections. Each configured WAN will create one IPsec tunnel, unless you have more than one anycast IP configured in your account.
+
+
+
+When you have multiple WANs you can attribute different priorities to each one. Lower values mean a higher priority. This translates in {props.productName} routing traffic through the higher priority WANs or, more precisely, over the IPsec tunnels established over that interface. On the other hand, if you configure multiple WANs of equal priority, traffic will be distributed over those links through Equal-Cost Multi-Path (ECMP routing).
+
+
+Creating several WAN connections also means {props.productName} can failover between circuits according to their health.
+
+### High-capacity use cases
+
+For high-capacity use cases, multiple tunnels can be established with equal priority. Outgoing traffic is then distributed across all available connections using an ECMP routing algorithm, which balances the load base.
+
+### Configure multiple tunnels in the same WAN profile
+
+If you do not have more than one anycast IP configured in your account, and you need to configure multiple tunnels for the same WAN profile, set up multiple WAN connections. Each WAN is assigned one IPsec tunnel.
+
+### WAN settings
+
+- **Interface number:** When using the hardware version of {props.productName}, this refers to the Ethernet port that you are using for your WAN. If you need a throughput higher than 1 Gbps, you can use one of the SFP+ ports. Refer to SFP+ port information for more information on the hardware supported. If you are using {props.virtualProductName}, this needs to correspond to the virtual network interface on the {props.virtualProductName} instance you have set up in VMware.
+- **VLAN ID**: Allows you to have multiple virtual WANs configured over the same port on your Magic WAN Connector. Refer to VLAN ID for more information.
+- **Priority**: Assigns a priority to the WAN interface. Lower numbers have higher priority. Refer to Traffic steering to learn more about how Cloudflare calculates priorities.
+- **Health check rate:** Configures the health check frequency for your WAN. Options are low, mid, and high. Refer to Update tunnel health checks frequency for more information.
+- **Addressing:** Configures the {props.productName} to work in a DHCP or static IP environment.
+
+## LAN settings
+
+- **Interface number:** When using the hardware version of {props.productName}, this refers to the Ethernet port that you are using for your LAN. If you need a throughput higher than 1 Gbps, you can use one of the SFP+ ports. Refer to SFP+ port information for more information on the hardware supported. If you are using the {props.virtualProductName}, this needs to correspond to the virtual LAN interface on the {props.virtualProductName} instance you have set up in VMware.
+- **VLAN ID**: Allows you to have multiple virtual LANs configured over the same port on your Magic WAN Connector. Refer to VLAN ID for more information.
+- **Static addressing:** Configures the type of IP addressing for your Connector. Depending on your use case, this is where you configure your LAN interface IP address, or enable DHCP server or DHCP relay. Refer to DHCP options to learn more.
+- **Static NAT prefix**: Enable NAT (network address translation). This is an optional setting.
+- **Routed subnets:** Configures additional subnets behind a layer 3 router. Refer to Routed subnets for more information.
+
+### Restrict traffic to your premises
+
+Depending on your use case, you can define policies in your connector to either allow traffic to flow between your LANs without it leaving your local premises or to forward it via the Cloudflare network where you can add additional security features. The default behavior is to drop all LAN-to-LAN traffic. These policies can be created for specific subnets, and link two LANs.
+
+Refer to Network segmentation for more information.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/app-aware-policies/breakout-prioritized.mdx b/src/content/partials/networking-services/mconn/network-options/app-aware-policies/breakout-prioritized.mdx
similarity index 86%
rename from src/content/partials/networking-services/mconn/app-aware-policies/breakout-prioritized.mdx
rename to src/content/partials/networking-services/mconn/network-options/app-aware-policies/breakout-prioritized.mdx
index b5e0946f412e78a..05e3fc09dab4370 100644
--- a/src/content/partials/networking-services/mconn/app-aware-policies/breakout-prioritized.mdx
+++ b/src/content/partials/networking-services/mconn/network-options/app-aware-policies/breakout-prioritized.mdx
@@ -1,7 +1,9 @@
---
params:
- magicWord
+ - productName
- featureName
+ - trafficSteeringURL?
- whatHappensApp
---
@@ -9,7 +11,7 @@ import { APIRequest, Aside, AnchorHeading, CURL, Markdown, Render, TabItem, Tabs
{ props.magicWord === "breakout" && (
<>
-
Breakout traffic allows you to define which applications should bypass Cloudflare's security filtering, and go directly to the Internet. It works via DNS requests inspection. This means that if your network is caching DNS requests, Breakout traffic will only take effect after you cache entries expire and your client issues a new DNS request that the Magic WAN Connector can detect. This can take several minutes.
+
Breakout traffic allows you to define which applications should bypass Cloudflare's security filtering, and go directly to the Internet. It works via DNS requests inspection. This means that if your network is caching DNS requests, Breakout traffic will only take effect after you cache entries expire and your client issues a new DNS request that the {props.productName} can detect. This can take several minutes.
Prioritized traffic allows you to define which applications Magic WAN Connector should process first. Applications not in the list will be queued behind prioritized traffic.
+
Prioritized traffic allows you to define which applications {props.productName} should process first. Applications not in the list will be queued behind prioritized traffic.
Similarly to breakout traffic, prioritized traffic also works via DNS requests inspection.
>
@@ -30,7 +32,7 @@ import { APIRequest, Aside, AnchorHeading, CURL, Markdown, Render, TabItem, Tabs
{`
flowchart LR
accTitle: In this example, the applications go directly to the Internet, skipping Cloudflare's security. filtering
- a(Magic WAN Connector) --> b(Cloudflare) -->|Filtered traffic|c(Internet)
+ a(${props.productName}) --> b(Cloudflare) -->|Filtered traffic|c(Internet)
a-- Breakout traffic ---d(Application1) & e(Application2) --> c
@@ -44,7 +46,7 @@ import { APIRequest, Aside, AnchorHeading, CURL, Markdown, Render, TabItem, Tabs
text={`
We recommend [routing](https://www.cloudflare.com/learning/network-layer/what-is-routing/) all traffic through our global network for comprehensive security filtering and access controls. However, there may be specific cases where you want a subset of traffic to bypass Cloudflare's security filtering and route it directly to the Internet. You can scope this breakout traffic to specific applications from the Cloudflare dashboard.
- Refer to [Traffic steering](/magic-wan/reference/traffic-steering/) to learn how Cloudflare routes traffic.
+ Refer to Traffic steering to learn how Cloudflare routes traffic.
`}
inline={false}
/>
@@ -55,7 +57,7 @@ import { APIRequest, Aside, AnchorHeading, CURL, Markdown, Render, TabItem, Tabs
## Add an application to your account
-Before you can add or remove {props.featureName} applications to your Connector, you need to create an account-level list with the applications that you want to configure. Currently, adding to or modifying this list is only possible via API, through the [`managed_app_id`](/api/resources/magic_transit/subresources/apps/methods/create/) endpoint.
+Before you can add or remove {props.featureName} applications to your {props.productName}, you need to create an account-level list with the applications that you want to configure. Currently, adding to or modifying this list is only possible via API, through the [`managed_app_id`](/api/resources/magic_transit/subresources/apps/methods/create/) endpoint.
To add applications to your account:
@@ -86,7 +88,7 @@ Send a `POST` request to add new apps to your account.
You can now add this new app to the {props.featureName} list in your Connector.
-### Add an application to Connector
+### Add an application to {props.productName}
You need to configure {props.featureName} applications for each of your existing sites, as this is a per-site configuration.
@@ -157,7 +159,7 @@ The traffic for the application you chose {props.whatHappensApp}.
-### Delete an application from Connector
+### Delete an application from {props.productName}
@@ -222,7 +224,15 @@ You need to delete {props.featureName} applications for each of your existing si
{ props.magicWord === "breakout" && (
<>
-
+
>
)
}
diff --git a/src/content/partials/networking-services/mconn/network-options/app-aware-policies/overview.mdx b/src/content/partials/networking-services/mconn/network-options/app-aware-policies/overview.mdx
new file mode 100644
index 000000000000000..433151d701c77d9
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/app-aware-policies/overview.mdx
@@ -0,0 +1,21 @@
+---
+params:
+ - productName
+ - gatewayPoliciesURL
+ - appTypesGatewayURL
+---
+
+import { DirectoryListing } from "~/components"
+
+In addition to traffic policies based on network-layer attributes like IP and port ranges, the {props.productName} supports the ability to classify traffic based on well-known applications. Application-aware policies provide easier management and more granularity over traffic flows.
+
+Cloudflare's implementation of application awareness leverages the intelligence of our global network, using the same categorization/classification already shared across security tools like our Secure Web Gateway, so IT and security teams can expect consistent behavior across routing and inspection decisions.
+
+For more information, refer to Applications and app types.
+
+{props.productName}'s ability to classify traffic allows you to define which applications should bypass Cloudflare's security filtering, and go directly to the Internet. You can also give some applications a higher priority, and Connector will process them first. This is useful when your network is at capacity, for example.
+
+Refer to the following pages for more information.
+
+
+
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/network-options/app-aware-policies/warp-traffic.mdx b/src/content/partials/networking-services/mconn/network-options/app-aware-policies/warp-traffic.mdx
new file mode 100644
index 000000000000000..54a03347b64e371
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/app-aware-policies/warp-traffic.mdx
@@ -0,0 +1,15 @@
+---
+params:
+ - connectorName
+ - mwanName
+ - warpFirewallURL
+---
+
+If you have {props.connectorName} and WARP clients deployed in your premises, {props.connectorName} automatically routes WARP traffic to the Internet rather than {props.mwanName} IPsec tunnels. This prevents traffic from being encapsulated twice.
+
+You may need to configure your firewall to allow this new traffic. Make sure to allow the following IPs and ports:
+
+- **Destination IPs**: `162.159.193.0/24`, `162.159.197.0/24`
+- **Destination ports**: `443`, `500`, `1701`, `2408`, `4443`, `4500`, `8095`, `844`
+
+Refer to WARP with firewall for more information on this topic.
diff --git a/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-relay.mdx b/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-relay.mdx
new file mode 100644
index 000000000000000..49ec0897e87ce23
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-relay.mdx
@@ -0,0 +1,75 @@
+---
+params:
+ - productName
+ - cfTunnelURL
+ - cfVsCoreDashNamingMwanCni
+---
+
+import { APIRequest, Render, TabItem, Tabs } from "~/components";
+
+DHCP Relay provides a way for DHCP clients to communicate with DHCP servers that are not available on the same local subnet/broadcast domain. When you enable DHCP Relay, {props.productName} forwards DHCP discover messages to a predefined DHCP server, and routes the responses back to the original device that sent the discover message.
+
+
+ {`
+ flowchart LR
+ accTitle: An example of Connector in DHCP Relay mode
+ a(${props.productName}) <--> b(Cloudflare/Magic WAN) <--> c(DHCP server)
+
+ subgraph Site A
+ d[LAN 1] <--> a
+ e[LAN 2] <--> a
+ end
+
+ subgraph Site B
+ c
+ end
+ classDef orange fill:#f48120,color: black
+ class a,b,c orange
+ `}
+
+
+_The above graph shows {props.productName} sending DHCP discover messages to a DHCP server offsite._
+
+:::caution
+DHCP relay will not work if your DHCP server is behind a Cloudflare Tunnel. To enable DHCP relay functionality, use either a {props.cfVsCoreDashNamingMwanCni}.
+:::
+
+To configure DHCP relay:
+
+
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select your Connector > **Edit**.
+4. Select **Network Configuration**.
+5. In **LAN configuration**, select the LAN where you need to configure DHCP relay.
+6. Select **Edit**.
+7. Select **This is a DHCP Relay**.
+8. In **Upstream DHCP server addresses**, enter the IP address of your DHCP server.
+9. (Optional) If you need to add more DHCP server addresses, select **Add upstream DHCP server address** as many times as needed, and enter the new values.
+
+
+
+
+
+Create a [`PUT` request](/api/resources/magic_transit/subresources/sites/subresources/lans/methods/update/) to update the LAN where you want to enable DHCP relay:
+
+Example:
+
+
+
+
diff --git a/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-server.mdx b/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-server.mdx
new file mode 100644
index 000000000000000..e13614401a720e0
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-server.mdx
@@ -0,0 +1,47 @@
+---
+params:
+ - productName
+---
+
+import { APIRequest, Render, TabItem, Tabs, DashButton } from "~/components";
+
+When you use a static IP address, {props.productName} can also act as a DHCP server in your network. To enable this feature:
+
+
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select the Connector you want to configure > **Edit**.
+4. Select **Network Configuration**, and scroll down to **LAN configuration**.
+5. In **LAN configuration**, select the LAN where you want to enable DHCP server.
+6. Select **Edit**.
+7. Under **Static addressing**, select **This is a DHCP Server**. You also have to specify:
+ - The DNS server address. You can have more than one IP address. Select **Add DNS Server** for each server you want to add.
+ - The DHCP pool start
+ - The DHCP pool end
+
+
+
+
+
+Create a [`PUT` request](/api/resources/magic_transit/subresources/sites/subresources/lans/methods/update/) to update the LAN where you want to enable DHCP server:
+
+Example:
+
+",
+ "dhcp_pool_start": "",
+ "dns_server": ""
+ }
+ }
+ }
+ }}
+/>
+
+
diff --git a/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-static-address-reservation.mdx b/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-static-address-reservation.mdx
new file mode 100644
index 000000000000000..8c7176209428f17
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/dhcp/dhcp-static-address-reservation.mdx
@@ -0,0 +1,43 @@
+---
+params:
+ - productName
+---
+
+import { APIRequest, Render, TabItem, Tabs } from "~/components";
+
+If you configure your {props.productName} to be a DHCP server, you can also assign IP addresses to specific devices on your network. To reserve IP addresses:
+
+
+
+1. Configure your Connector to be a [DHCP server](/magic-wan/configuration/connector/network-options/dhcp/dhcp-server/).
+2. Select **Add DHCP Reservation**.
+3. In **Hardware Address** enter the [MAC address](https://en.wikipedia.org/wiki/MAC_address) for the device you want a specific IP address for.
+4. In **IP Address**, enter the IP address for that device.
+5. (Optional) If you need to reserve more IP addresses, select **Add DHCP Reservation** as many times as needed, and enter the new values.
+
+
+
+
+
+Create a [`PUT` request](/api/resources/magic_transit/subresources/sites/subresources/lans/methods/update/) to update the LAN where you want to reserve addresses:
+
+Example:
+
+": "",
+ "": ""
+ }
+ }
+ }
+ }
+ }}
+/>
+
+
diff --git a/src/content/partials/networking-services/mconn/network-options/nat-subnet.mdx b/src/content/partials/networking-services/mconn/network-options/nat-subnet.mdx
new file mode 100644
index 000000000000000..251ececaf685856
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/nat-subnet.mdx
@@ -0,0 +1,28 @@
+---
+params:
+ - productName
+ - connectorName
+ - hardConnectorURL
+ - virtualConnectorURL
+ - configHardProductName
+ - configVirtualProductName
+---
+
+Each subnet (directly-attached or routed) must have a unique address space within your {props.productName}. You can re-use address spaces locally by enabling static network address translation (NAT) for a subnet. NAT is static. This means that inbound connections - from {props.productName} to the site behind the {props.connectorName} - are allowed, and connections do not have to be initiated by hosts behind the {props.connectorName}. NAT is also 1:1, that is, the {props.connectorName} will translate between corresponding addresses in two equal-sized prefixes.
+
+To enable NAT, supply a WAN-facing address prefix the same size as the subnet's prefix, and the {props.connectorName} will translate between the two.
+
+For example:
+
+- **Prefix**: `192.168.100.0/24`
+- **Static NAT prefix**: `10.10.100.0/24`
+
+With the example above, outbound traffic from host `192.168.100.13` in the subnet is translated to `10.10.100.13` in the {props.connectorName} (and vice versa for incoming traffic).
+
+:::note
+Even if NAT is enabled, the local prefix for a subnet must be unique within its LAN. It can, however, be reused on other LANs or other sites. Overlay-facing prefixes - that is, a subnet's NAT prefix if NAT is enabled, and its local prefix otherwise - must always be unique across your whole {props.productName}.
+:::
+
+## Create NATs for subnets
+
+For more information on how to a create a NAT for a subnets, refer to **Create a LAN**, either in {props.configHardProductName} or in {props.configVirtualProductName}.
diff --git a/src/content/partials/networking-services/mconn/network-options/network-segmentation.mdx b/src/content/partials/networking-services/mconn/network-options/network-segmentation.mdx
new file mode 100644
index 000000000000000..734e710ff745bf1
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/network-segmentation.mdx
@@ -0,0 +1,286 @@
+---
+params:
+ - productName
+ - hardConnectorURL
+ - virtualConnectorURL
+ - configHardProductName
+ - configVirtualProductName
+---
+
+
+import { APIRequest, Render, TabItem, Tabs } from "~/components";
+
+You can define policies in your {props.productName} to either allow traffic to flow between your LANs without it leaving your local premises or to forward it via the Cloudflare network where you can add additional security features. The default behavior is to drop all LAN-to-LAN traffic. These policies can be created for specific subnets, and link two LANs.
+
+
+ {`
+ flowchart LR
+ accTitle: In this example, there are LANs where traffic flows between each other, instead of going to Cloudflare first.
+ a(${props.productName}) <---> b(Internet) <---> c(Cloudflare)
+
+ subgraph Customer site
+ d[LAN 1] <---> a
+ e[LAN 2] <---> a
+ g[LAN 3] <---> a
+ h[LAN 4] <---> a
+ end
+ classDef orange fill:#f48120,color: black
+ class a,c orange
+
+ linkStyle 0,1,2,3 stroke:#f48120,stroke-width:3px
+ linkStyle 4,5 stroke:red,stroke-width:3px
+ `}
+
+
+_In the above example, the red path shows traffic that stays in the customer's premises (allowing direct communication between LAN 3 and LAN 4), and the orange path shows traffic that goes to Cloudflare before returning to the customer's premises (processing traffic between LAN 1 and LAN 2 in Cloudflare)._
+
+
+
+As a best practice for security, we recommend sending all traffic through Cloudflare's network for Zero Trust security filtering. Use these policies with care and only for scenarios where you have a hard requirement for LAN-to-LAN traffic flows.
+
+If you enable LAN to LAN traffic flows, communications can only be initiated from origin to destination — for example, LAN 1 to LAN 2 — and not the other way around. This is by design and prevents potential exfiltration of information. This does not mean bidirectional communication on TCP is not possible. It only means that the origin is the only one authorized to initiate communications.
+
+Unidirectional communication can be enabled for UDP and ICMP, but it is not available for TCP, as it would break that protocol.
+
+The following guide assumes you have already created a site and configured your {props.productName}. To learn how to create a site and configure your {props.productName}, refer to {props.configHardProductName} or {props.configVirtualProductName}, depending on the type of {props.productName} you have on your premises.
+
+## Create a policy
+
+
+
+Follow the steps below to create a new LAN policy to segment your network. Only the fields marked **required** are mandatory.
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
+2. Select **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select the Connector you want to configure > **Edit**.
+4. Go to **Network Configuration**, and scroll down to **LAN configuration**.
+5. Select **LAN policies** > **Create Policy**.
+6. In **Policy name**, enter a descriptive name for the policy you are creating.
+7. From the drop-down menu **Origin (required)**, select your origin LAN.
+8. Specify a subnet for your first LAN in **Subnets**.
+9. In **Ports** specify the TCP/UDP ports you want to use. Valid ports range from `1` to `65535`. Zero (`0`) is not a valid port number. Add a comma to separate each of the ports or add a port range. For example, `2,5,6,9-14`.
+10. In **Destination (required)**, select the destination LAN and repeat the above process to configure it.
+11. In **Protocols**, select the type of traffic you want to allow. You can choose **TCP**, **UDP**, and **ICMP**. You can also select **Any** to choose all types of traffic.
+12. In **Traffic direction** you can choose between bidirectional traffic (the default) and unidirectional traffic. What you can choose depends on the protocol that you chose for the policy:
+ 1. **Any**: If **Any** is selected and you choose **Unidirectional**, the system will alert you that this will break TCP traffic.
+ 2. **TCP**: You can only select **Bidirectional**.
+ 3. **UDP**: The system defaults to **Bidirectional** but you can choose **Unidirectional**.
+ 4. **ICMP**: The system defaults to **Bidirectional** but you can choose **Unidirectional**.
+13. In **Traffic path**, select **Forwarded via Cloudflare** if you want traffic to be forwarded to Cloudflare to be processed. If you do not select this option, traffic will flow locally, in your premises without passing through Cloudflare.
+14. Select **Create policy**.
+
+The new policy will ensure that traffic between the specified LANs flows locally, bypassing Cloudflare.
+
+
+
+
+
+Create a `POST` request [using the API](/api/resources/magic_transit/subresources/sites/subresources/acls/methods/create/) to create a network policy.
+
+Example:
+
+",
+ "forward_locally": true,
+ "lan_1": {
+ "lan_id": "",
+ "lan_name": "",
+ "ports": [
+ 1
+ ],
+ "subnets": [
+ "192.0.2.1"
+ ]
+ },
+ "lan_2": {
+ "lan_id": "",
+ "lan_name": "",
+ "protocols": [
+ "tcp"
+ ]
+ }}
+/>
+
+```json output
+{
+ "errors": [
+ {
+ "code": 1000,
+ "message": "message"
+ }
+ ],
+ "messages": [
+ {
+ "code": 1000,
+ "message": "message"
+ }
+ ],
+ "result": {
+ "id": "023e105f4ecef8ad9ca31a8372d0c353",
+ "description": "Allows local traffic between PIN pads and cash register.",
+ "forward_locally": true,
+ "lan_1": {
+ "lan_id": "lan_id",
+ "lan_name": "lan_name",
+ "port_ranges": [
+ "8080-9000"
+ ],
+ "ports": [
+ 1
+ ],
+ "subnets": [
+ "192.0.2.1"
+ ]
+ },
+ "lan_2": {
+ "lan_id": "lan_id",
+ "lan_name": "lan_name",
+ "port_ranges": [
+ "8080-9000"
+ ],
+ "ports": [
+ 1
+ ],
+ "subnets": [
+ "192.0.2.1"
+ ]
+ },
+ "name": "PIN Pad - Cash Register",
+ "protocols": [
+ "tcp"
+ ],
+ "unidirectional": true
+ },
+ "success": true
+}
+```
+
+Take note of the `id` parameter, as you will need it to edit or delete network policies.
+
+
+
+The new policy will ensure that traffic between the specified LANs flows locally, bypassing Cloudflare.
+
+## Edit a policy
+
+
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
+2. Select **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select the Connector you want to configure > **Edit**.
+4. Go to **Network Configuration**, and scroll down to **LAN configuration**.
+5. Select **LAN policies**.
+6. Select the policy you need to edit > **Edit**.
+7. Make your changes, and select **Update policy**.
+
+
+
+
+
+Create a `PUT` request [using the API](/api/resources/magic_transit/subresources/sites/subresources/acls/methods/update/) to edit a network policy.
+
+Example:
+
+",
+ "forward_locally": true,
+ "lan_1": {
+ "lan_id": "",
+ "lan_name": "",
+ "ports": [
+ 1
+ ],
+ "subnets": [
+ "192.0.2.1"
+ ]
+ },
+ "lan_2": {
+ "lan_id": "",
+ "lan_name": "",
+ "ports": [
+ 1
+ ],
+ "subnets": [
+ "192.0.2.1"
+ ]
+ },
+ "name": "",
+ "protocols": [
+ "tcp"
+ ]
+ }}
+/>
+
+```json output
+{
+ "errors": [
+ {
+ "code": 1000,
+ "message": "message"
+ }
+ ],
+ "messages": [
+ {
+ "code": 1000,
+ "message": "message"
+ }
+ ],
+ "result": {
+ "id": "023e105f4ecef8ad9ca31a8372d0c353",
+ "connector_id": "ac60d3d0435248289d446cedd870bcf4",
+ "description": "description",
+ "ha_mode": true,
+ "location": {
+ "lat": "37.6192",
+ "lon": "122.3816"
+ },
+ "name": "site_1",
+ "secondary_connector_id": "8d67040d3835dbcf46ce29da440dc482"
+ },
+ "success": true
+}
+```
+
+
+
+## Delete a policy
+
+
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
+2. Select **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select the Connector you want to configure > **Edit**.
+4. Go to **Network Configuration**, and scroll down to **LAN configuration**.
+5. Select **LAN policies**.
+6. Select the policy you need to edit > **Edit**.
+7. Select **Delete**.
+8. Select **I understand that deleting a policy is permanent** in the dialog box > **Delete**.
+
+
+
+
+
+Create a `DELETE` request [using the API](/api/resources/magic_transit/subresources/sites/subresources/acls/methods/delete/) to delete a network policy.
+
+Example:
+
+
+
+
diff --git a/src/content/partials/networking-services/mconn/network-options/routed-subnets.mdx b/src/content/partials/networking-services/mconn/network-options/routed-subnets.mdx
new file mode 100644
index 000000000000000..18c6c0ad3fb8e95
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/network-options/routed-subnets.mdx
@@ -0,0 +1,59 @@
+---
+params:
+ - productName
+ - netSubnetURL
+ - hardConnectorURL
+ - virtualConnectorURL
+ - configHardProductName
+ - configVirtualProductName
+---
+
+Each LAN interface (physical port + VLAN tag) on a {props.productName} is part of a _directly-attached subnet_. When you specify a static address for the LAN interface, you indicate both the interface's address as well as the subnet it attaches to. For example, `192.168.100.13/24` means the LAN interface has the IP address `192.168.100.13`, and is part of the subnet `192.168.100.0/24`.
+
+Some LANs are more complex. In addition to the directly-attached subnet, they might have additional subnets sitting behind L3 routers south of the {props.productName}. We call these _routed subnets_.
+
+Refer to the diagram below for an example of how this might work:
+
+:::note
+Blue represents directly-attached subnets, and red represents routed subnets.
+:::
+
+```mermaid
+flowchart TB
+accTitle: Routed subnets
+accDescr: Some LANs are complex, and might have additional subnets behind L3 routers.
+
+a((WAN)) --> b
+
+subgraph b [Connector]
+direction TB
+c(LAN 1)
+d(LAN n)
+end
+
+c --- e(subnet x):::blue
+d --- f(subnet 192.168.100.0/24):::blue
+
+f---|192.168.100.10|g(Layer 3 router)
+
+g --- h(routed subnet y):::red
+g --- i(192.168.200.0/24):::red
+g --- j(layer 3 router)
+j --- k(routed subnet z):::red
+
+classDef blue fill:#add8e6,color: black
+classDef red fill:#ff6900,color: black
+```
+
+
+
+To add a routed subnet to your LAN, you need:
+
+- **A prefix**: The subnet's CIDR prefix; Cloudflare will automatically install static routes to this prefix in our global network (to forward [packets](https://www.cloudflare.com/learning/network-layer/what-is-a-packet/) for this subnet to the right {props.productName}), and in your {props.productName} (to forward packets for this subnet to the right LAN interface). In the figure above, the routed subnet in the center has the prefix `192.168.200.0/24`.
+- **A next-hop address**: The address of the L3 router to which the {props.productName} should forward packets for this subnet. In the figure, the routed subnet in the center has the next-hop address `192.168.100.10`.
+
+Optionally, you can also enable NAT for a subnet by providing a static overlay prefix.
+
+## Create routed subnets
+
+For more information on how to create routed subnets, refer to **Create a LAN**, either in either in {props.configHardProductName} or in {props.configVirtualProductName}.
diff --git a/src/content/partials/networking-services/mconn/overview.mdx b/src/content/partials/networking-services/mconn/overview.mdx
new file mode 100644
index 000000000000000..b76cea1bc8de29f
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/overview.mdx
@@ -0,0 +1,22 @@
+---
+params:
+ - hardwareProductName
+ - ipsecRefUrl
+ - hardwareUrl
+ - virtualProductName
+ - virtualUrl
+---
+
+import { DirectoryListing, GlossaryTooltip } from "~/components";
+
+The {props.hardwareProductName} is a lightweight appliance you can install in corporate network locations to automatically connect, steer, and shape any IP traffic through secure IPsec tunnels. Magic WAN Connector is the easiest way to onboard your network locations to Cloudflare One. It is managed remotely through the Cloudflare dashboard, so you do not require an onsite IT team.
+
+You can purchase {props.hardwareProductName} software pre-installed on a Cloudflare-certified device, or download and deploy {props.virtualProductName} in your own infrastructure.
+
+Either option ensures the best possible connectivity to the closest Cloudflare network location, where Cloudflare will apply security controls and send traffic on an optimized route to its destination.
+
+Magic WAN Connector has the same type of support process as other Cloudflare Enterprise products. Contact your team account manager to learn more.
+
+Review this section to learn how to configure and deploy Magic WAN Connector.
+
+
\ No newline at end of file
diff --git a/src/content/partials/networking-services/mconn/spf-port-info.mdx b/src/content/partials/networking-services/mconn/spf-port-info.mdx
new file mode 100644
index 000000000000000..9d6054b5a872af8
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/spf-port-info.mdx
@@ -0,0 +1,47 @@
+---
+params:
+ - productName
+ - productNameVirtual
+---
+
+The hardware version of the {props.productName} includes two [SFP+ ports](https://en.wikipedia.org/wiki/Small_Form-factor_Pluggable) that support 10G throughput. These ports can be configured as either a WAN or a LAN port, like all of the 1G RJ45 ports in the machine. Because a 10G WAN uplink will often be bottlenecked by IPsec tunnel speeds, the SFP+ ports are most useful for configuring high speed LANs, and for using fiber connections.
+
+:::note[{props.productNameVirtual} and SFP+ ports]
+Since you decide and set up the hardware where {props.productNameVirtual} runs, you can ignore the information on this page.
+:::
+
+## Port configuration
+
+SFP+ ports are next to the regular LAN ports. They are represented as follows in the dashboard:
+
+- SFP+ **port 1** is represented by **port 7** in the dashboard
+- SFP+ **port 2** is represented by **port 8** in the dashboard
+
+
+
+_The left port, SFP+ 1, is port 7. The right port, SFP+ 2, is port 8._
+
+## SFP+ module compatibility
+
+The {props.productName} only supports 10Gbps SFP+ modules, including RJ45, DAC, and fiber, among others. Many 1 Gbps modules are incompatible with the Intel driver used internally, and thus are not supported.
+
+Cloudflare supports the following SFP+ inputs:
+
+- 10 Gbps Intel-compatible optics using 10GBase-SR, LR, ER. This includes Intel-compatible active optical cables (AOC) cables at 10 Gbps.
+- 10 Gbps DAC Twinax cables, compatible with SFF-8431 v4.1 and SFF-8472 v10.4
+- 10GBASE-T RJ45 converter modules
+
+Cloudflare successfully deployed commonly available 10G modules that are also compatible across many vendors:
+
+- StarTech Dell EMC Twinax SFP+ DAC
+- Ubiquiti multi-mode, duplex, 10 Gbps fiber transceiver modules
+
+Keep in mind that SFP+ modules/cables have to be compatible at both ends, that is, both sides of the connection should be 10 Gbps, and it should really be the same module/cable that is compatible with both hardware stacks. The choice of module/optic/cable ultimately depends on your specific interoperability needs, and it is much less of a "plug and play" situation as one expects from RJ45.
+
+## Recover from unsupported SFP+ inputs
+
+SFP+ modules should be installed and tested prior to deploying a {props.productName} into production usage.
+
+An unsupported SFP+ input is indicated by the interface failing to come up (that is, the {props.productName} has no status lights), and also by the port (7 or 8) going offline until the hardware is rebooted.
+
+When an unsupported module is plugged, the module should be removed and then the {props.productName} rebooted by removing power for five seconds. The module should not remain plugged during reboot, or the {props.productName} will have to be rebooted again after the module is removed.
diff --git a/src/content/partials/networking-services/mconn/troubleshooting.mdx b/src/content/partials/networking-services/mconn/troubleshooting/troubleshooting-steps.mdx
similarity index 100%
rename from src/content/partials/networking-services/mconn/troubleshooting.mdx
rename to src/content/partials/networking-services/mconn/troubleshooting/troubleshooting-steps.mdx
diff --git a/src/content/partials/networking-services/mconn/troubleshooting/troubleshooting.mdx b/src/content/partials/networking-services/mconn/troubleshooting/troubleshooting.mdx
new file mode 100644
index 000000000000000..c0519dddac34f87
--- /dev/null
+++ b/src/content/partials/networking-services/mconn/troubleshooting/troubleshooting.mdx
@@ -0,0 +1,113 @@
+---
+params:
+ - productName
+ - activateURL
+ - firewallURL
+ - heartbeatURL
+---
+
+import { Render } from "~/components";
+
+## Device metrics
+
+Cloudflare customers can inspect metrics for a specific {props.productName} in the Cloudflare dashboard. These metrics help you troubleshoot potential issues with your device. The information spans categories such as:
+
+- Performance analytics
+- Port analytics
+- Event logs
+- DHCP leasing information
+
+To find the information above and start troubleshooting your {props.productName}:
+
+
+
+### Performance analytics
+
+In Performance analytics you can review your {props.productName}'s performance over time including:
+
+- Kernel boot time (how long it has been running and if it is activated or not)
+- Last device snapshot (this also shows the frequency with which your device captures the snapshots that are used in several troubleshooting procedures)
+- CPU temperature
+- CPU load over time
+- Used RAM over time
+
+To access performance analytics:
+
+
+3. Select **Performance analytics**.
+
+### Port analytics
+
+Port analytics gives you access to information related to the packets sent and received through the ports in your {props.productName}. You can adjust the time range for the information displayed in the dashboard regarding to:
+
+- Rate for packets sent and received
+- Rate for data sent and received
+
+The dashboard provides this information for all active ports in your {props.productName}. To access port analytics:
+
+
+3. Select **Port analytics**.
+
+### Event logs
+
+Use Event logs to identify general patterns and changes over time. This is useful to find correlations with other data and gather deeper insights into your {props.productName}. The following event logs are available:
+
+- `Init`: Initialized `mcon-agent` process. This process manages Connector.
+- `Leave`: Stopped `mcon-agent` process.
+- `StartAttestation`: Started attestation to verify the integrity of Connector before allowing the device to connect to your account.
+- `FinishAttestationSuccess`: Finished attestation successfully.
+- `FinishAttestationFailure`: Failed attestation.
+- `StartRotateCryptKey`: Started cryptography key rotation.
+- `FinishRotateCryptKeySuccess`: Finished cryptography key rotation.
+- `FinishRotateCryptKeyFailure`: Failed cryptography key rotation.
+- `StartRotatePki`: Started public key infrastructure (PKI) rotation.
+- `FinishRotatePkiSuccess`: Finished PKI rotation.
+- `FinishRotatePkiFailure`: Failed PKI rotation.
+- `StartUpgrade`: Began Connector's operating system upgrade.
+- `FinishUpgradeSuccess`: Finished operating system upgrade.
+- `FinishUpgradeFailure`: Failed operating system upgrade.
+- `Reconcile`: Cloudflare is comparing the system's current state against its desired state.
+- `ConfigureCloudflaredTunnel`: Configured Cloudflare Tunnel to debug device.
+
+To access event logs:
+
+
+3. Select **Events**.
+4. You can filter results by specific events, and by time.
+
+### DHCP leasing
+
+Refer to the DHCP leasing section to identify DHCP assigned leases and their expiration dates. To access DHCP leasing:
+
+
+3. Select **DHCP leasing**.
+
+## Troubleshooting tips
+
+If you are experiencing difficulties with your {props.productName}, refer to the following tips to troubleshoot what might be happening.
+
+## I have set up a site, but my {props.productName} is not working
+
+Make sure that you have activated your Connector. Cloudflare ships the {props.productName} deactivated, and the it will only establish a connection to the Cloudflare network when it is activated.
+
+## I have tried to activate {props.productName}, but it is still not working
+
+Check if your {props.productName} is connected to the Internet via a port that can serve DHCP. This is required the first time a {props.productName} boots up so that it can reach the Cloudflare global network and download the required configurations that you set up in the Site configuration step. Refer to Activate Connector for more details.
+
+If you have a firewall deployed upstream of the {props.productName}, check your firewall settings. You might need to configure your firewall to allow traffic in specific ports for the Connector to work properly.
+
+## I can access {props.productName}'s health checks, but there is no traffic
+
+If you have a firewall deployed upstream of the {props.productName}, make sure you review your firewall settings. You might need to configure your firewall to allow traffic in specific ports for the {props.productName} to work properly.
+
+## Devices I have behind {props.productName} cannot connect to the Internet
+
+If you have other routing appliances behind {props.productName}, make sure you create policy-based routing policies to send traffic from your devices through {props.productName}, instead of these other routing devices.
+
+## How do I know if my device is contacting Cloudflare?
+
+{props.productName} sends a heartbeat periodically to Cloudflare. You can access the dashboard, and check for the heartbeat status of your Connector device.
+
+## What do I do in the event of hardware issues with {props.productName}?
+
+Cloudflare is the single point of contact for any issues related to {props.productName}, including issues with hardware. When required, Cloudflare Support will work with our partner, TD Synnex, to resolve any issues with the physical device.
diff --git a/src/content/partials/networking-services/mconn/wan-two-tunnels.mdx b/src/content/partials/networking-services/mconn/wan-two-tunnels.mdx
index 8b699a9a3fac30d..113d53db0bf2d77 100644
--- a/src/content/partials/networking-services/mconn/wan-two-tunnels.mdx
+++ b/src/content/partials/networking-services/mconn/wan-two-tunnels.mdx
@@ -1,5 +1,6 @@
---
-{}
+params:
+ - productName
---
-When you have more than one anycast IP configured in your account (set up during your Magic WAN onboarding), Connector will automatically create at most two tunnels per WAN port. This improves reliability and performance, and requires no additional configuration on your part.
\ No newline at end of file
+When you have more than one anycast IP configured in your account (set up during your Magic WAN onboarding), {props.productName} will automatically create at most two tunnels per WAN port. This improves reliability and performance, and requires no additional configuration on your part.
\ No newline at end of file
diff --git a/src/content/partials/networking-services/reference/traffic-steering.mdx b/src/content/partials/networking-services/reference/traffic-steering.mdx
index 35be27e88796e36..30f3fd21801b4eb 100644
--- a/src/content/partials/networking-services/reference/traffic-steering.mdx
+++ b/src/content/partials/networking-services/reference/traffic-steering.mdx
@@ -2,6 +2,13 @@
params:
- magicWord
- productName
+ - mFirewallName
+ - mFirewallURL
+ - warpClientURL
+ - remoteBrowserURL
+ - accessURL
+ - gatewayURL
+ - cfTunnelURL?
- greIpsecReferenceURL
- createStaticRoute
- editStaticRoute
@@ -16,8 +23,8 @@ import { AnchorHeading, Aside, Markdown, Render } from "~/components";
The Magic networking routing table is a virtual network overlay, private to your account, that spans all Cloudflare data centers globally. This overlay network provides:
-- Magic Transit delivery for [DoS](/ddos-protection/) and [Magic Firewall](/magic-firewall/) filtered Internet traffic, from the entry data center where the traffic ingressed, to your publicly addressed edge/border network.
-- Magic WAN packet transport between Magic tunnels, interconnects, [Cloudflare Load Balancer](/load-balancing/), and [Zero Trust](/cloudflare-one/) connections such as [WARP Client](/cloudflare-one/connections/connect-devices/warp/), [Remote Browser Isolation](/cloudflare-one/policies/browser-isolation/), [Access](/cloudflare-one/policies/access/), and [Gateway](/cloudflare-one/policies/gateway/).
+- Magic Transit delivery for [DoS](/ddos-protection/) and {props.mFirewallName} filtered Internet traffic, from the entry data center where the traffic ingressed, to your publicly addressed edge/border network.
+- {props.productName} packet transport between Magic tunnels, interconnects, [Cloudflare Load Balancer](/load-balancing/), and [Zero Trust](/cloudflare-one/) connections such as WARP Client, Remote Browser Isolation, Access, and Gateway.
The Magic routing table supports routing the {props.productName} traffic via anycast tunnels using GRE and Internet Protocol Security (IPsec) or [Direct Cloudflare Network Interconnect (CNI)](/network-interconnect/). Entries can be added to the Magic routing table via static route configuration or via routes learned through BGP peering (only available over Direct CNI).
@@ -44,7 +51,7 @@ The following IPv4 address ranges are allowed in the Magic Routing table:
text={`
- [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) address space, specifically \`10.0.0.0/8\`, \`172.16.0.0/12\`, and \`192.168.0.0/16\`.
- When using Magic WAN and Cloudflare Tunnel together, remember to consider the IP ranges utilized in the static routes of Cloudflare Tunnel when selecting static routes for Magic WAN. For more information, refer to [Cloudflare Tunnel](/magic-wan/zero-trust/cloudflare-tunnel/).
+ When using ${props.productName} and Cloudflare Tunnel together, remember to consider the IP ranges utilized in the static routes of Cloudflare Tunnel when selecting static routes for ${props.productName}. For more information, refer to Cloudflare Tunnel.
For prefixes outside RFC 1918 contact your Cloudflare customer service manager.
`}
@@ -56,7 +63,7 @@ The following IPv4 address ranges are allowed in the Magic Routing table:
### Route prioritization
-Magic {props.productName} is steered along tunnel routes based on priorities of route entries.
+{props.productName} is steered along tunnel routes based on priorities of route entries.
- Lower values have greater priority.
- When the priority values for prefix entries match, Cloudflare uses [equal-cost multi-path (ECMP)](#equal-cost-multi-path-routing) packet forwarding to route traffic. An optional weight value can be applied to static routes to [modify ECMP tunnel distribution](#set-priority-and-weights-for-static-routes).
@@ -348,7 +355,7 @@ If instead you are seeking to do public peering with the Cloudflare ASN 13335 at
### BGP route distribution and convergence
-Routes received from the customer device will be redistributed into the Magic routing table, which is used by both Magic WAN and Magic Transit.
+Routes received from the customer device will be redistributed into the Magic routing table, which is used by both {props.productName} and Magic Transit.
All routes in the Magic routing table are advertised to BGP peers. Each BGP peer will receive each prefix route along with the full `AS_PATH`, with the selected Cloudflare side [ASN](https://www.cloudflare.com/learning/network-layer/what-is-an-autonomous-system/) prepended. This is so that the peer can accurately perform [loop prevention](https://datatracker.ietf.org/doc/html/rfc4271#section-9.1.2).
diff --git a/src/content/partials/networking-services/reference/tunnel-health-checks.mdx b/src/content/partials/networking-services/reference/tunnel-health-checks.mdx
index aaad2f5361215d5..9744027463512a0 100644
--- a/src/content/partials/networking-services/reference/tunnel-health-checks.mdx
+++ b/src/content/partials/networking-services/reference/tunnel-health-checks.mdx
@@ -203,7 +203,14 @@ flowchart TB
### Rate
-
+
Every Cloudflare data center configured to process your traffic sends tunnel health check probes. The rate at which these health check probes are sent varies based on tunnel and location. This rate can also be tuned up or down on a per tunnel basis by modifying the `health_check` rate of a tunnel with the API or the dash. A customer can set the rate value as _low_, _mid_ or _high_, with _mid_ being the default option. The actual rate formula considers the number of servers in a Cloudflare data center or the number of servers with the customer namespace provisioned on them for dynamically provisioned namespaces. Thus, the rate is not a specific number; it is dynamic and depends on the size of our network.
diff --git a/src/content/partials/networking-services/routing/configure-tunnels.mdx b/src/content/partials/networking-services/routing/configure-tunnels.mdx
index a927799dc785513..6c29e3f1f8ba67c 100644
--- a/src/content/partials/networking-services/routing/configure-tunnels.mdx
+++ b/src/content/partials/networking-services/routing/configure-tunnels.mdx
@@ -71,7 +71,14 @@ Beyond GRE and IPsec tunnels, you can also use Network Interconnect (CNI) to onb
## Add tunnels
-
+
diff --git a/src/content/partials/networking-services/routing/traceroute.mdx b/src/content/partials/networking-services/routing/traceroute.mdx
new file mode 100644
index 000000000000000..9fdf246d2b139ee
--- /dev/null
+++ b/src/content/partials/networking-services/routing/traceroute.mdx
@@ -0,0 +1,73 @@
+---
+params:
+ - greIpsecURL
+ - warpURL
+ - cfTunnelURL
+---
+
+import { GlossaryTooltip } from "~/components";
+
+If you have a Magic WAN client connected through GRE, IPsec, [CNI](/network-interconnect/) or WARP and want to perform a `traceroute` to an endpoint behind a Cloudflare Tunnel, the following settings must be applied for the command to return useful information.
+
+## Inherited TTL value
+
+On the machine where the `traceroute` client is executed, make sure the tunnel device does not inherit the TTL value of the inner packet. This is the default behavior on Linux and can result in unhelpful `traceroute` results:
+
+```sh
+sudo traceroute -s 10.1.0.100 -I 10.3.0.100
+```
+
+```sh output
+traceroute to 10.3.0.100 (10.3.0.100), 30 hops max, 60 byte packets
+ 1 * * *
+ 2 * * *
+ 3 * * *
+ 4 * * *
+ 5 * * *
+ 6 * * *
+ 7 * * *
+ 8 * * *
+ 9 * * *
+10 10.3.0.100 (10.3.0.100) 420.505 ms 420.779 ms 420.776 ms
+```
+
+Setting the TTL explicitly returns much better results:
+
+```sh
+sudo ip link set cf_gre type gre ttl 64
+sudo traceroute -s 10.1.0.100 -I 10.3.0.100
+```
+
+```sh output
+traceroute to 10.3.0.100 (10.3.0.100), 30 hops max, 60 byte packets
+ 1 10.0.0.11 (10.0.0.11) 58.947 ms 58.933 ms 58.930 ms
+ 2 173.245.60.175 (173.245.60.175) 61.138 ms 61.316 ms 61.313 ms
+ 3 172.68.145.21 (172.68.145.21) 367.448 ms 367.532 ms 367.530 ms
+ 4 mplat-e2e-vm3.c.magic-transit.internal (10.152.0.20) 370.362 ms 370.440 ms 370.522 ms
+ 5 10.3.0.100 (10.3.0.100) 370.519 ms 370.541 ms 518.152 ms
+```
+
+## WARP client
+
+Some Linux distributions default to a very strict setting for [reverse path filtering](https://sysctl-explorer.net/net/ipv4/rp_filter/). This strict setting attempts to drop fake traffic as a security measure. Performing a `traceroute` with this setting on can unintentionally drop `traceroute` packets. If you use WARP on Linux, set a less strict policy before attempting to perform a `traceroute`:
+
+```sh
+sudo sysctl -w net.ipv4.conf.CloudflareWARP.rp_filter=2
+```
+
+```sh output
+net.ipv4.conf.CloudflareWARP.rp_filter = 2
+```
+
+```sh
+sudo traceroute -s 172.16.0.2 -I 10.3.0.100
+```
+
+```sh output
+traceroute to 10.3.0.100 (10.3.0.100), 30 hops max, 60 byte packets
+ 1 169.254.21.171 (169.254.21.171) 48.887 ms 48.894 ms 48.620 ms
+ 2 173.245.60.175 (173.245.60.175) 49.403 ms 49.519 ms 49.603 ms
+ 3 172.68.65.7 (172.68.65.7) 357.499 ms 357.519 ms 357.520 ms
+ 4 mplat-e2e-vm3.c.magic-transit.internal (10.152.0.20) 360.024 ms 360.086 ms 360.078 ms
+ 5 10.3.0.100 (10.3.0.100) 360.283 ms 360.297 ms 360.489 ms
+```
diff --git a/src/content/partials/networking-services/sites-brief.mdx b/src/content/partials/networking-services/sites/sites-brief.mdx
similarity index 100%
rename from src/content/partials/networking-services/sites-brief.mdx
rename to src/content/partials/networking-services/sites/sites-brief.mdx
diff --git a/src/content/partials/networking-services/sites/sites.mdx b/src/content/partials/networking-services/sites/sites.mdx
new file mode 100644
index 000000000000000..cd737dd69206110
--- /dev/null
+++ b/src/content/partials/networking-services/sites/sites.mdx
@@ -0,0 +1,74 @@
+---
+params:
+ - greIpsecTunnelsURL
+ - connectorURL
+ - cniURL
+---
+
+import { set } from "date-fns";
+import { Render } from "~/components";
+
+Sites represent the local network of a data center, office, or other physical location, and combine all on-ramps available there. Sites also allow you to check, at a glance, the state of your on-ramps and set up health alert settings so that you get notified when there are issues with the site's on-ramps.
+
+To use a site, start by setting up your on-ramps. These can be GRE or IPsec tunnels, a Magic WAN Connector, or a direct CNI link. When you are finished setting these up, refer to the steps below to learn how to set up a site.
+
+## Add a site
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Network overview (beta)**.
+3. Select **Add site**.
+4. Add a name and description for your new site. Optionally, you can also add the geographical coordinates for your site in **Latitude** and **Longitude**. If you add geographical coordinates, once created your site's location will show in the map.
+5. Select **Create and continue**.
+6. Choose one or more on-ramps for your site from the list. Remember to only choose the on-ramps available to that particular site, as the list might show on-ramps available on other locations.
+7. Select **Continue**.
+8. In **Define alert settings** you set up alerts to notify you when there are issues with your site's on-ramps. If you want to set up alerts later, select **Skip this for now** to complete your setup. Otherwise, continue reading.
+9. In **Magic WAN Health Check Alert** > **Notification name**, enter a name for the site's alert.
+10. Under **Alert settings**, choose how you want to be notified when there is an issue. You can add webhooks as well as email addresses.
+11. In **Alert sensitivity level** define the threshold for Magic Tunnel health alerts to be fired. Refer to [How Cloudflare calculates Magic Tunnel health alerts](/magic-wan/reference/how-cloudflare-calculates-magic-tunnel-health-alerts/) for more information.
+12. Select **Complete setup** to finish setting up your site.
+
+Your site is now set up. If you have other sites you need to set up, repeat the steps above. If you did not set up alerts, we strongly recommend that you do it. Otherwise you will not be notified when there is a problem with one of your on-ramps.
+
+---
+
+## Site analytics
+
+
+
+---
+
+## Edit a site
+
+### Add or remove on-ramps
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Go to **Magic WAN** > **Network overview (beta)**.
+3. Find your site in **Traffic overview** > select the three dots in front of it > **Edit**.
+4. Select **On-ramps**.
+5. Select **Add** to add a new on-ramp.
+6. If you want to remove an on-ramp, select the three dots in front of your on-ramp > **Remove**.
+
+### Set geographic coordinates
+
+If you add geographic coordinates to your site, it will show up in the Network map. To set up or edit geographic coordinates to an existing site:
+
+1. Go to **Magic WAN** > **Network overview (beta)**.
+2. Find your site in **Traffic overview** > select the three dots in front of it > **Edit**.
+3. In **Basic information**, edit your site's **Latitude** and **Longitude** coordinates.
+4. Select **Save**.
+
+### Set thresholds for site health
+
+
diff --git a/src/content/partials/networking-services/traceroute.mdx b/src/content/partials/networking-services/traceroute.mdx
index d4615ccb8106ef0..3b00f2cf0cd40fa 100644
--- a/src/content/partials/networking-services/traceroute.mdx
+++ b/src/content/partials/networking-services/traceroute.mdx
@@ -1,8 +1,12 @@
---
-{}
-
+params:
+ - productName
+ - greIpsecURL
+ - warpURL
+ - cloudflareTunnelURL
+ - tracerouteURL
---
:::note[Run traceroute]
-Magic WAN clients connecting through [GRE](/magic-wan/configuration/manually/how-to/configure-tunnel-endpoints/), [IPsec](/magic-wan/configuration/manually/how-to/configure-tunnel-endpoints/), [CNI](/network-interconnect/) or [WARP](/cloudflare-one/connections/connect-devices/warp/) that want to perform a `traceroute` to an endpoint behind a [Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/) will need to change some settings to make the command useful. Refer to [Run `traceroute`](/magic-wan/configuration/manually/how-to/traceroute/) for more information.
+{props.productName} clients connecting through GRE, IPsec, [CNI](/network-interconnect/) or WARP that want to perform a `traceroute` to an endpoint behind a Cloudflare Tunnel will need to change some settings to make the command useful. Refer to Run `traceroute` for more information.
:::
diff --git a/src/content/partials/networking-services/tunnel-health/mconn-heartbeat-health.mdx b/src/content/partials/networking-services/tunnel-health/mconn-heartbeat-health.mdx
new file mode 100644
index 000000000000000..095b35ecc5a6000
--- /dev/null
+++ b/src/content/partials/networking-services/tunnel-health/mconn-heartbeat-health.mdx
@@ -0,0 +1,9 @@
+---
+params:
+ - productName
+ - heartbeatURL
+---
+
+{props.productName} also includes a heartbeat function, an additional way of communicating its health status which does not depend on successfully setting up any tunnels. The heartbeat function communicates periodically with Cloudflare via HTTPS and lets Cloudflare know that the {props.productName} in question is connected to the Internet and reachable.
+
+Refer to Heartbeat to learn more.
\ No newline at end of file