diff --git a/src/content/docs/magic-wan/analytics/site-analytics.mdx b/src/content/docs/magic-wan/analytics/site-analytics.mdx
index 1c7f39f3d880150..95c377d9fd37f75 100644
--- a/src/content/docs/magic-wan/analytics/site-analytics.mdx
+++ b/src/content/docs/magic-wan/analytics/site-analytics.mdx
@@ -1,98 +1,15 @@
---
-title: Site Analytics
+title: Site analytics
pcx_content_type: how-to
sidebar:
order: 1
head:
- tag: title
- content: Magic WAN Site Analytics
+ content: Magic WAN site analytics
---
-import { Details } from "~/components"
+After adding sites to your Magic WAN, the Network overview (beta) section of the dashboard provides you 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.
-Magic WAN Site Analytics provides an overview of the connectivity status and traffic analytics of all Magic WAN Connector sites. Magic WAN Site Analytics is a great place to start if you receive a Magic WAN alert, need to begin the Magic WAN Connector troubleshooting process, or are performing routine monitoring.
+Refer to [Set up a site](/magic-wan/configuration/common-settings/sites/) for more information.
-Magic WAN Site Analytics 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-available)
-
-
-
- - Site Name
- - Site Health
- - Site Tunnel Names
- - Site Tunnel Statuses
- - Site Traffic Sent
- - Site Traffic Received
-
-
-
- - Traffic Sent by Tunnel
- - Traffic Received by Tunnel
-
-
-To start using Magic WAN Site Analytics:
-
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Select **Magic WAN** > **Overview**.
-
-You will have access to an overview map with all your active sites, and any alerts for sites that are unhealthy or have no status available to them.
-
-Review the topics below to learn more about the options available to you.
-
-### All sites
-
-This section shows all the sites you configured with Magic WAN. At a glance, you can check:
-
-- How many active sites you have
-- Sites that are healthy or unhealthy
-- Sites that have no status available
-- Sites that have no location set
-
-#### 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.
-
-#### 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 [Tunnel health check alerts](/magic-wan/configuration/common-settings/configure-magic-tunnel-alerts/).
-
-#### No location available
-
-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.
-
-
-### 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:
-
-- Site status
-- Traffic sent and received
-
-Select one of your sites to have access to a more detailed view of its traffic, including traffic by tunnel.
-
----
-
-## Configure Magic WAN Site Analytics
-
-### Set geographic coordinates
-
-When you create a site, you can set geographic coordinates in order for it to show on the Overview map. You can also add this information to sites you have already created. To add a Magic WAN site to the geographic map in the Overview page:
-
-1. Go to **Magic WAN** > **Sites**.
-2. Select a specific site > **Edit**.
-3. Scroll to **Site Location**.
-4. Set the **latitude** and **longitude** coordinates of the Magic WAN Site.
-5. Scroll down and select **Save**.
-6. The Magic WAN Site will now appear on the geographic map in the Overview page.
-
-### Set thresholds for Magic WAN site health
-
-You can set Magic Tunnel health alerts to receive alerts when the percentage of successful health checks for a Magic Tunnel drops below the selected service-level objective (SLO). Setting health alerts will also show unhealthy tunnels in the Overview map:
-
-1. Configure [Magic Tunnel health alerts](/magic-wan/configuration/common-settings/configure-magic-tunnel-alerts/) across all of the Magic Tunnels associated with each Magic WAN Site.
-2. After configuring Magic Tunnel health alerts, any Magic WAN Site with a Magic Tunnel that is outside of its SLO threshold will be labeled unhealthy in the Overview map.
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 4b250492b2b7ee4..533a94633ff18e1 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
@@ -2,7 +2,7 @@
pcx_content_type: how-to
title: Check tunnel health in the dashboard
sidebar:
- order: 2
+ order: 3
---
import { Render } from "~/components";
@@ -12,7 +12,7 @@ import { Render } from "~/components";
params={{
dashInfo:
"The dashboard shows the view of tunnel health as measured from each Cloudflare location where your traffic is likely to land.",
- productPath: "**Magic WAN** > **Tunnel health check**",
+ productPath: "**Magic WAN** > **Tunnel health**",
}}
/>
diff --git a/src/content/docs/magic-wan/configuration/common-settings/sites.mdx b/src/content/docs/magic-wan/configuration/common-settings/sites.mdx
new file mode 100644
index 000000000000000..ad1934cfc7592eb
--- /dev/null
+++ b/src/content/docs/magic-wan/configuration/common-settings/sites.mdx
@@ -0,0 +1,131 @@
+---
+title: Set up a site
+pcx_content_type: how-to
+sidebar:
+ order: 2
+---
+
+import { Details } 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-tunnels/), 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 **Create site**. If this is not the first time you are adding a site, you will have the option **Add site** instead.
+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.
+9. Under **Alert settings**, choose how you want to be notified when there is an issue. You can add webhooks as well as email addresses.
+10. In **Alert sensitivity level** define the threshold for Magic Tunnel health alerts to be fired. Available options are _Low_, _Medium_, and _High_. Refer to [Magic Tunnels background information](/magic-wan/reference/magic-tunnels/) for more information.
+11. 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
+
+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.
+
+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)
+
+
+
+ - Site Name
+ - Site Health
+ - Site Tunnel Names
+ - Site Tunnel Statuses
+ - Site Traffic Sent
+ - Site Traffic Received
+
+
+
+ - Traffic Sent by Tunnel
+ - Traffic Received by Tunnel
+
+
+To start using Magic WAN site analytics:
+
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
+2. Select **Magic WAN** > **Network overview (beta)**.
+
+You will have access to an overview map with all your active sites, and any alerts for sites that are unhealthy or have no status available to them.
+
+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:
+
+- How many active sites you have
+- Location for sites in a map (if you set up their geographic location)
+- Sites that are healthy or unhealthy
+- Sites that have no status available
+- Sites that have no location set
+
+Just below the map, Traffic overview shows a more granular list of your sites and their status.
+
+#### 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.
+
+#### 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-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.
+
+
+### 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:
+
+- Site status
+- Traffic sent and received
+
+Select one of your sites to have access to a more detailed view of its traffic, including traffic by tunnel.
+
+---
+
+## 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
+
+When you set up an alert for your site, you will be notified when there is an issue with one or more on-ramps. These alerts are sent when the percentage of successful health checks for a Magic WAN on-ramp drops below the selected service-level objective (SLO). Setting health alerts will also show unhealthy tunnels in the Network map and in the Traffic overview sections.
+
+To set up health alerts:
+
+1. Configure [Magic Tunnel health alerts](/magic-wan/configuration/common-settings/configure-magic-tunnel-alerts/) across all of the Magic Tunnels associated with each Magic WAN site.
+2. After configuring Magic Tunnel health alerts, any Magic WAN site with a Magic Tunnel (on-ramp) that is outside of its SLO threshold will be labeled unhealthy in Network map and Traffic overview.
diff --git a/src/content/docs/magic-wan/configuration/common-settings/tunnel-health-checks.mdx b/src/content/docs/magic-wan/configuration/common-settings/tunnel-health-checks.mdx
index 007d1cd825d2be0..3f6a16eb93c44f6 100644
--- a/src/content/docs/magic-wan/configuration/common-settings/tunnel-health-checks.mdx
+++ b/src/content/docs/magic-wan/configuration/common-settings/tunnel-health-checks.mdx
@@ -2,7 +2,7 @@
pcx_content_type: how-to
title: Update tunnel health checks frequency
sidebar:
- order: 3
+ order: 4
---
import { Render } from "~/components";
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 9a4fc9f4e28293a..3f7ab16b54776cf 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
@@ -44,7 +44,7 @@ Refer to [SFP+ port information](/magic-wan/configuration/connector/configure-ha
## Set up Cloudflare dashboard
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 LAN. 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.",
@@ -133,16 +133,15 @@ Make sure you complete the setup workflow and activate your Magic WAN Connector
:::
1. Connect Magic WAN Connector to a DHCP port with access to the Internet.
-2. [Create a site](#1-create-a-site) in the Cloudflare dashboard.
-3. Associate a Connector to it.
-4. Create a [DHCP WAN](#2-create-a-wan).
-5. [Active](#activate-connector) and power on your Connector.
-6. Wait 60 seconds.
-7. Make changes to the [WAN settings](#2-create-a-wan) in the Cloudflare dashboard to a static IP set up.
-8. Wait 60 seconds again.
-9. Magic WAN Connector will go offline. This is normal and expected behavior.
-10. Adjust your physical connections as required to match the static configuration.
-11. Magic WAN Connector comes back online.
+2. [Add a Connector on-ramp](#1-add-a-connector-on-ramp) in the Cloudflare dashboard.
+3. Create a [DHCP WAN](#2-create-a-wan).
+4. [Activate](#activate-connector) and power on your Connector.
+5. Wait 60 seconds.
+6. Make changes to the [WAN settings](#2-create-a-wan) in the Cloudflare dashboard to a static IP set up.
+7. Wait 60 seconds again.
+8. Magic WAN Connector will go offline. This is normal and expected behavior.
+9. Adjust your physical connections as required to match the static configuration.
+10. Magic WAN Connector comes back online.
---
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 5c0a8263f9b44da..c43ed53ca365329 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
@@ -104,7 +104,7 @@ You cannot use the same license key twice, or reuse a key once the virtual machi
## Set up Cloudflare dashboard
-
6. Select one or more applications that should bypass Cloudflare filtering from the list. You can also use the search box.
7. Select **Add applications**.
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 c48ae48f1d8559f..6c915387911f06b 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
@@ -29,9 +29,9 @@ To configure DHCP relay:
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Sites**.
-3. Select your site > **Edit**.
-4. Select **Network**.
+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**.
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 3abd012ec9e7fc4..fd0da78a43083cb 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
@@ -10,9 +10,9 @@ When you use a static IP address, Magic WAN Connector can also act as a DHCP ser
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Sites**.
-3. Select your site > **Edit**.
-4. Select **Network**.
+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:
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 4eee4d59bccc123..3748b9c4f4cd0eb 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
@@ -42,9 +42,9 @@ The following guide assumes you have already created a site and configured your
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** > **Sites**.
-3. Select the site you want to configure > **Edit**.
-4. Go to **Network**, and scroll down to **LAN configuration**.
+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 **LAN 1**, select your origin LAN.
@@ -142,9 +142,9 @@ The new policy will ensure that traffic between the specified LANs flows locally
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Sites**.
-3. Select the site you want to configure > **Edit**.
-4. Go to **Network**, and scroll down to **LAN configuration**.
+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**.
@@ -202,9 +202,9 @@ https://api.cloudflare.com/client/v4/accounts/{account_id}/magic/sites/{site_id}
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Sites**.
-3. Select the site you want to configure > **Edit**.
-4. Go to **Network**, and scroll down to **LAN configuration**.
+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**.
diff --git a/src/content/docs/magic-wan/configuration/manually/how-to/bgp-peering.mdx b/src/content/docs/magic-wan/configuration/manually/how-to/bgp-peering.mdx
index 9e7a129a572af3e..a239372df5725b7 100644
--- a/src/content/docs/magic-wan/configuration/manually/how-to/bgp-peering.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/how-to/bgp-peering.mdx
@@ -19,3 +19,7 @@ import { Render } from "~/components"
productGatewayOrEgress: "Magic WAN with Gateway"
}}
/>
+
+## Next steps
+
+Now that you have configured your tunnels and BGP peering, 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/configure-static-routes.mdx b/src/content/docs/magic-wan/configuration/manually/how-to/configure-static-routes.mdx
index 30fd9da20f20bfe..fb2a957a1ab8a27 100644
--- a/src/content/docs/magic-wan/configuration/manually/how-to/configure-static-routes.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/how-to/configure-static-routes.mdx
@@ -14,3 +14,7 @@ import { Render } from "~/components"
Configuration", tunnelEndpoints: "/magic-wan/configuration/manually/how-to/configure-tunnels/", ipRanges: "
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/).
" }} />
+
+## Next steps
+
+Now that you have configured your tunnels and static 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/configure-tunnels.mdx b/src/content/docs/magic-wan/configuration/manually/how-to/configure-tunnels.mdx
index 4d60c5e8c555ad6..6e89eb8314b82c9 100644
--- a/src/content/docs/magic-wan/configuration/manually/how-to/configure-tunnels.mdx
+++ b/src/content/docs/magic-wan/configuration/manually/how-to/configure-tunnels.mdx
@@ -87,6 +87,6 @@ import { GlossaryTooltip, Render } from "~/components";
## Next steps
-Now that you have set up your tunnel endpoints, you need to configure static routes to route your traffic through Cloudflare.
+- Now that you have set up your tunnel endpoints, you need to configure static routes to route your traffic through Cloudflare.
If you are connecting to Cloudflare through a [Direct CNI connection](/network-interconnect/express-cni/), you can [configure BGP routing](/magic-wan/configuration/manually/how-to/bgp-peering/) instead.
-If you are connecting to Cloudflare through a [Direct CNI connection](/network-interconnect/express-cni/), you can [configure BGP routing](/magic-wan/configuration/manually/how-to/bgp-peering/) instead.
+- After configuring either static routes or BGP routing, you will have to [set up a site](/magic-wan/configuration/common-settings/sites/).
diff --git a/src/content/partials/magic-transit/tunnel-endpoints/add-tunnels.mdx b/src/content/partials/magic-transit/tunnel-endpoints/add-tunnels.mdx
index 06acd15fe8e2610..831b987136cb00d 100644
--- a/src/content/partials/magic-transit/tunnel-endpoints/add-tunnels.mdx
+++ b/src/content/partials/magic-transit/tunnel-endpoints/add-tunnels.mdx
@@ -24,7 +24,7 @@ import { Details, Markdown, Render, TabItem, Tabs } from "~/components";
5. In **Name**, give your tunnel a descriptive name. This name must be unique, must not contain spaces or special characters, and must be 15 or fewer characters. Hover the mouse over `i` in the dashboard for more information.
6. Give your tunnel a description in **Description**. You do not have character restrictions here.
-7. In **Interface address**, enter the internal IP address for your tunnel along with the interface's prefix length (either `/31` or `/30`). This is used to route traffic through the tunnel on the Cloudflare side. We recommend using an RFC1918 address scheme with a `/31` netmask, as it provides the most efficient use of IP address space.
+7. In **IPv4 Interface address**, enter the internal IP address for your tunnel along with the interface's prefix length (either `/31` or `/30`). This is used to route traffic through the tunnel on the Cloudflare side. We recommend using an RFC1918 address scheme with a `/31` netmask, as it provides the most efficient use of IP address space.
8. In **Customer GRE endpoint**, enter your router's public IP address. This value is not needed if you intend to use a physical or virtual connection like Cloudflare Network Interconnect because Cloudflare will provide it.
9. In **Cloudflare GRE endpoint**, enter the anycast address you received from your account team.
10. Leave the default values for **TTL** and **MTU**.
@@ -43,7 +43,7 @@ import { Details, Markdown, Render, TabItem, Tabs } from "~/components";
5. In **Name**, give your tunnel a descriptive name. This name must be unique, must not contain spaces or special characters, and must be 15 or fewer characters. Hover the mouse over `i` in the dashboard for more information.
6. Give your tunnel a description in **Description**. You do not have character restrictions here.
-7. In **Interface address**, enter the internal IP address for your tunnel along with the interface's prefix length (either `/31` or `/30`). This is used to route traffic through the tunnel on the Cloudflare side. We recommend using an RFC1918 address scheme with a `/31` netmask, as it provides the most efficient use of IP address space.
+7. In **IPv4 Interface address**, enter the internal IP address for your tunnel along with the interface's prefix length (either `/31` or `/30`). This is used to route traffic through the tunnel on the Cloudflare side. We recommend using an RFC1918 address scheme with a `/31` netmask, as it provides the most efficient use of IP address space.
8. In **Customer endpoint**, enter your router's public IP address. This value is only required if your router is using an IKE ID of type `ID_IPV4_ADDR`.
9. In **Cloudflare endpoint**, enter the anycast address you received from your account team.
10. _(Optional)_ **Tunnel health checks** are enabled by default. If you disable Tunnel health checks, your tunnels will appear 100% down in your tunnel health dashboard even when working. Cloudflare will keep sending traffic through the tunnel, without the means to detect if the tunnel goes down. You will have to set up your own system to detect down tunnels, as Cloudflare will not be able to warn you about down tunnels. Refer to Tunnel health checks for more information.
diff --git a/src/content/partials/magic-wan/connector/activate-connector.mdx b/src/content/partials/magic-wan/connector/activate-connector.mdx
index e0bb3adac0bc5f5..b8d84c83d905c57 100644
--- a/src/content/partials/magic-wan/connector/activate-connector.mdx
+++ b/src/content/partials/magic-wan/connector/activate-connector.mdx
@@ -5,9 +5,9 @@ params:
import { Markdown } from "~/components";
-{props.shippedLanguage}, and will only establish a connection to the Cloudflare network when it is activated. Cloudflare recommends leaving it deactivated until you finish [setting it up in the dashboard](#1-create-a-site).
+{props.shippedLanguage}, and will only establish a connection to the Cloudflare network when it is activated. Cloudflare recommends leaving it deactivated until you finish [setting it up in the dashboard](#1-add-a-connector-on-ramp).
-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 in the [site configuration](#1-create-a-site) step.
+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](#1-add-a-connector-on-ramp).
:::caution
Remember to connect Magic WAN Connector through a route that supports DHCP for its first connection to the Internet. Otherwise, the Connector will not work.
diff --git a/src/content/partials/magic-wan/connector/app-aware-policies/add-app.mdx b/src/content/partials/magic-wan/connector/app-aware-policies/add-app.mdx
index b076d10b203ae2e..fe74094de03b259 100644
--- a/src/content/partials/magic-wan/connector/app-aware-policies/add-app.mdx
+++ b/src/content/partials/magic-wan/connector/app-aware-policies/add-app.mdx
@@ -6,7 +6,7 @@ params:
import { Markdown } from "~/components";
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Sites**.
-3. Select the site you want to configure > **Edit**.
+2. Select **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select the Connector you want to configure > **Edit**.
4. Select **Traffic Steering**.
-5. In **{props.featureName}**, select **Add**.
+5. In **{props.featureName}**, select **Add**.
\ No newline at end of file
diff --git a/src/content/partials/magic-wan/connector/app-aware-policies/delete-app.mdx b/src/content/partials/magic-wan/connector/app-aware-policies/delete-app.mdx
index ccfa5e511ed808e..cd3fed14cfa4229 100644
--- a/src/content/partials/magic-wan/connector/app-aware-policies/delete-app.mdx
+++ b/src/content/partials/magic-wan/connector/app-aware-policies/delete-app.mdx
@@ -6,8 +6,8 @@ params:
import { Markdown } from "~/components";
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your account.
-2. Select **Magic WAN** > **Sites**.
-3. Select the site you want to configure > **Edit**.
+2. Select **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select the Connector you want to configure > **Edit**.
4. Select **Traffic Steering**.
5. In **{props.featureName}**, find the application you want to delete, and select the **three dots** next to it.
6. Select **Remove**.
diff --git a/src/content/partials/magic-wan/connector/before-you-begin.mdx b/src/content/partials/magic-wan/connector/before-you-begin.mdx
index 61f97351cf076d8..fe8cbe3f604700e 100644
--- a/src/content/partials/magic-wan/connector/before-you-begin.mdx
+++ b/src/content/partials/magic-wan/connector/before-you-begin.mdx
@@ -8,7 +8,7 @@ You can install up to two Magic WAN Connectors for redundancy at each of your si
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 configuring your dashboard settings. If, at a later stage, you decide to enable redundancy, you will need to delete your site configuration 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 configuring 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.
@@ -21,5 +21,5 @@ You must decide the type of configuration you want for your site from the beginn
:::caution
-You cannot enable high availability for an existing site. To add high availability to an existing site in the Cloudflare dashboard, you need to delete the site and start again. Plan accordingly to create a high availability configuration from the start if needed.
+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.
:::
diff --git a/src/content/partials/magic-wan/connector/create-site.mdx b/src/content/partials/magic-wan/connector/connector-onramps.mdx
similarity index 69%
rename from src/content/partials/magic-wan/connector/create-site.mdx
rename to src/content/partials/magic-wan/connector/connector-onramps.mdx
index c3b6aa24299cd8a..a1b6be736572852 100644
--- a/src/content/partials/magic-wan/connector/create-site.mdx
+++ b/src/content/partials/magic-wan/connector/connector-onramps.mdx
@@ -7,66 +7,22 @@ params:
import { GlossaryTooltip, Markdown, Render, TabItem, Tabs } from "~/components";
-### 1. Create a site
+### 1. Add a Connector on-ramp
-Sites represent the local network where you have installed your Magic WAN Connector - for example, a branch office location.
+You need to add your Connector to your Cloudflare dashboard and configure its settings before connecting it to the Internet.
-You need to create a site and set up all the settings associated with it before you can connect your Magic WAN Connector to the Internet.
-
-To add a site:
-
-
+To add a Connector on-ramp:
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Go to **Magic WAN** > **Sites**.
-3. Select **Create** to create a new site and start the configuration wizard.
-4. Add a name and description for your new site.
-5. (Optional) In **Site location**, you can add the geographical coordinates for your site. If you add geographical coordinates, your site will show up in the [Site Analytics overview map](/magic-wan/analytics/site-analytics/).
-6. Under **Connector**, select **Add Connector**. This will show you a list of Magic WAN Connector devices associated with your account.
-7. If you have more than one Connector, choose the one that corresponds to the site 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 **Add Connector** when you are ready to proceed.
-8. The Connector will be added to your site 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. Select **Next** to proceed to creating your WAN and LAN networks.
-
-
-
-
-
-Create a `POST` request [using the API](/api/resources/magic_transit/subresources/sites/methods/create/) to create a site.
-
-Example:
-
-```bash
-curl https://api.cloudflare.com/client/v4/accounts/{account_id}/magic/sites \
---header "X-Auth-Email: " \
---header "X-Auth-Key: " \
---header "Content-Type: application/json" \
---data '{
- "name": ""
- "description": "",
-}'
-```
-
-```json output
-{
- "result": {
- "site": {
- "id": "",
- "name": "",
- "description": "",
- "connector_id": null,
- "secondary_connector_id": null,
- "ha_mode": false
- }
- },
- "success": true,
- "errors": [],
- "messages": []
-}
-```
-
-Take note of the site `id` parameter, as you will need it to create WANs and LANs.
-
-
+2. Go to **Magic WAN** > **Connector on-ramps (beta)**.
+3. Select **Add**.
+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.
+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.
+10. Select **Continue** to proceed to creating your WAN and LAN networks.
### 2. Create a WAN
@@ -132,7 +88,7 @@ curl https://api.cloudflare.com/client/v4/accounts/{account_id}/magic/sites/{sit
- **Next hop**: The address of the L3 router to which the Connector should forward packets for this subnet.
- **Static NAT prefix**: Optional setting. If you want to enable NAT for a routed subnet, supply an "external" prefix for the overlay-facing side of the NAT to use. It must be the same size as **Prefix**.
Refer to [Routed subnets](/magic-wan/configuration/connector/network-options/routed-subnets/) for more information.
8. Select **Save**.
-9. Select **Save and exit** to finish your configuration. Tunnels and static routes will be automatically created and associated with your site once the Magic WAN Connector boots up (refer to the next step).
+9. Select **Done** to finish your configuration. Tunnels and static routes will be automatically created for your Magic WAN Connector, once it boots up.
@@ -173,3 +129,7 @@ Magic WAN Connector supports different types of DHCP configurations. Connector c
- [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.
+
+### 4. Add your Connector to a site
+
+After finishing your Connector configuration, you need to add it to a site.
\ No newline at end of file
diff --git a/src/content/partials/magic-wan/connector/ha-configs.mdx b/src/content/partials/magic-wan/connector/ha-configs.mdx
index eff9d4767cf64fb..4cd0732d6888785 100644
--- a/src/content/partials/magic-wan/connector/ha-configs.mdx
+++ b/src/content/partials/magic-wan/connector/ha-configs.mdx
@@ -26,17 +26,18 @@ You cannot enable high availability for an existing site. To add high availabili
To set up a high availability configuration:
-1. Follow the steps in [Create a site](#1-create-a-site) up until step 4.
-2. After naming your site, select **Enable high availability**.
-3. Under **Connector**, select **Add Connector**.
-4. From the list, choose your first Connector > **Add Connector**.
-5. Back on the previous screen, select **Add secondary Connector**.
-6. From the list, choose your second Connector > **Add Connector**.
-7. Select **Next** to [Create a WAN](#2-create-a-wan). If you are configuring a static IP, configure the IP for the primary node as the static address, and the IP for the secondary node as the secondary static address.
-8. To create a LAN, follow the steps mentioned above in [Create a LAN](#3-create-a-lan) up until step 4.
-9. In **Static address**, enter the IP for the primary node in your site. For example, `192.168.10.1/24`.
-10. In **Secondary static address**, enter the IP for the secondary node in your site. For example, `192.168.10.2/24`.
-11. In **Virtual static address**, enter the IP that the LAN south of the Connector will forward traffic to. For example, `192.168.10.3/24`.
-12. Select **Save**.
-13. From the **High availability probing link** drop-down menu, select the port that should be used to monitor the node's health. Cloudflare recommends you choose a reliable interface as the HA probing link. The primary and secondary node's probing link should be connected over a switch, and cannot be a direct connection.
-14.
+1. Follow the steps in [Add a Connector on-ramp](#1-add-a-connector-on-ramp) up until step 4.
+2. After naming your site, select **Turn on high availability**.
+3. Select **Create and continue**.
+4. Select **Add Connector**.
+5. From the list, choose your first Connector > **Add Connector**.
+6. Back on the previous screen, select **Add secondary Connector**.
+7. From the list, choose your second Connector > **Add Connector**.
+8. Select **Continue** to [Create a WAN](#2-create-a-wan). If you are configuring a static IP, configure the IP for the primary node as the static address, and the IP for the secondary node as the secondary static address.
+9. To create a LAN, follow the steps mentioned above in [Create a LAN](#3-create-a-lan) up until step 4.
+10. In **Static address**, enter the IP for the primary node in your site. For example, `192.168.10.1/24`.
+11. In **Secondary static address**, enter the IP for the secondary node in your site. For example, `192.168.10.2/24`.
+12. In **Virtual static address**, enter the IP that the LAN south of the Connector will forward traffic to. For example, `192.168.10.3/24`.
+13. Select **Save**.
+14. From the **High availability probing link** drop-down menu, select the port that should be used to monitor the node's health. Cloudflare recommends you choose a reliable interface as the HA probing link. The primary and secondary node's probing link should be connected over a switch, and cannot be a direct connection.
+15.
diff --git a/src/content/partials/magic-wan/sites-brief.mdx b/src/content/partials/magic-wan/sites-brief.mdx
new file mode 100644
index 000000000000000..438f10623c90a6a
--- /dev/null
+++ b/src/content/partials/magic-wan/sites-brief.mdx
@@ -0,0 +1,7 @@
+---
+{}
+---
+
+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.
+
+Refer to [Set up a site](/magic-wan/configuration/common-settings/sites/) for more information.
\ No newline at end of file