MNM documentation update for Birthday Week 2024! Let's Go! (#17044)

cdraper-cloudflare · marciocloudflare · hyperlint-ai[bot] · maheshwarip · commit 4ace81cb5627 · 2024-12-02T17:07:01.000-05:00
* MNM documentation update for Birthday Week 2024! Let's Go!

* Apply suggestions from code review

Co-authored-by: hyperlint-ai[bot] &lt;154288675+hyperlint-ai[bot]@users.noreply.github.com&gt;

* Apply suggestions from code review

* Update src/content/docs/magic-network-monitoring/index.mdx

---------

Co-authored-by: marciocloudflare &lt;83226960+marciocloudflare@users.noreply.github.com&gt;
Co-authored-by: hyperlint-ai[bot] &lt;154288675+hyperlint-ai[bot]@users.noreply.github.com&gt;
diff --git a/src/content/docs/magic-network-monitoring/faq.mdx b/src/content/docs/magic-network-monitoring/faq.mdx
@@ -4,9 +4,21 @@ title: FAQ
 structured_data: true
 sidebar:
   order: 11
-
 ---
 
+## Can I send NetFlow/sFlow data to Cloudflare in a secure, encrypted way?
+
+Yes. Both enterprise and free customers can send encrypted network flow data to Cloudflare.
+
+Enterprise customers with Magic Transit or Magic WAN are able to send encrypted network flow data via an IPsec tunnel to Cloudflare's network. You can achieve this by:
+
+1. Configuring your [NetFlow](/magic-network-monitoring/routers/netflow-ipfix-config/) or [sFlow](/magic-network-monitoring/routers/sflow-config/) data to be sent to Cloudflare's network for parsing.
+2. Directing that network flow data to be sent over [Magic Transit IPsec tunnels](/magic-transit/how-to/configure-tunnels/) or [Magic WAN IPsec tunnels](/magic-wan/configuration/manually/how-to/configure-tunnels/) to Cloudflare's network.
+
+Cloudflare's network will then identify this traffic via the destination IP address/port, and direct the network flow traffic to Magic Network Monitoring for parsing.
+
+Free customers can route their network flow traffic through a device that is running the WARP client. Then, network flow traffic can be forwarded from the WARP enabled device to Cloudflare's network flow endpoints. You can learn more about this in the [Encrypt network flow data tutorial](/magic-network-monitoring/tutorials/encrypt-network-flow-data).
+
 ## I have Auto-Advertisement enabled and it was triggered by an attack. Do I have to turn Magic Transit off manually?
 
 Once Auto-Advertisement is activated for an IP prefix that is under attack, the IP prefix will continue to be advertised by Cloudflare even if the attack ends. You will then need to manually disable advertisement for that IP prefix. Refer to [Configure dynamic advertisement](/byoip/concepts/dynamic-advertisement/best-practices/#configure-dynamic-advertisement) to learn how to withdraw your prefixes, and stop using Magic Transit.
@@ -41,14 +53,3 @@ It is recommended that you set your router's public IP address and network flow
 Currently, all data received from a customer's router goes to our servers in the US. If you enable data sovereignty in Europe, you cannot currently use Magic Network Monitoring.
 
 GraphQL analytics is retained for 90 days for enterprise customers. For non-enterprise customers, data retention is seven days. Cloudflare also retains data for six hours in the US, for threshold crossing detection.
-
-## Can I send NetFlow/sFlow data to Cloudflare in a secure, encrypted way?
-
-Yes. Enterprise customers with Magic Transit or Magic WAN are able to send encrypted network flow data via an IPsec tunnel to Cloudflare's network. You can achieve this by:
-
-1. Configuring your [NetFlow](/magic-network-monitoring/routers/netflow-ipfix-config/) or [sFlow](/magic-network-monitoring/routers/sflow-config/) data to be sent to Cloudflare’s network for parsing.
-2. Directing that network flow data to be sent over a [Magic Transit IPsec tunnels](/magic-transit/how-to/configure-tunnels/) or [Magic WAN IPsec tunnels](/magic-wan/configuration/manually/how-to/configure-tunnels/) to Cloudflare's network.
-
-Cloudflare's network will then identify this traffic via the destination IP address/port, and direct the network flow traffic to Magic Network Monitoring for parsing.
-
-This feature is not available to Magic Network Monitoring free customers.
diff --git a/src/content/docs/magic-network-monitoring/get-started.mdx b/src/content/docs/magic-network-monitoring/get-started.mdx
@@ -3,16 +3,13 @@ title: Get started
 pcx_content_type: get-started
 sidebar:
   order: 2
-
 ---
 
-import { GlossaryTooltip } from "~/components"
-
-To begin using Magic Network Monitoring, complete the list of tasks below. If you are an Enterprise customer, Cloudflare can significantly accelerate the timeline during active-attack scenarios.
+import { GlossaryTooltip } from "~/components";
 
-If you are an Enterprise customer and would like to use Magic Network Monitoring and Magic Transit On Demand together, begin by [configuring Magic Transit](/magic-transit/get-started/).
+To begin using Magic Network Monitoring, complete the list of tasks below.
 
-There is also a [free version](/magic-network-monitoring/magic-network-monitoring-free/) of Magic Network Monitoring in a closed beta right now. Refer to it to learn about the functionalities and limits of this version.
+If you are an Enterprise customer, Cloudflare can significantly accelerate the onboarding timeline during active-attack scenarios. Enterprise customers that would like to use Magic Network Monitoring and Magic Transit On Demand together can begin by [configuring Magic Transit](/magic-transit/get-started/).
 
 ## 1. Verify NetFlow or sFlow capabilities
 
diff --git a/src/content/docs/magic-network-monitoring/index.mdx b/src/content/docs/magic-network-monitoring/index.mdx
@@ -6,24 +6,33 @@ sidebar:
 head:
   - tag: title
     content: Cloudflare Magic Network Monitoring
-
 ---
 
-import { CardGrid, Description, Feature, GlossaryTooltip, LinkTitleCard, Plan, RelatedProduct } from "~/components"
+import {
+	CardGrid,
+	Description,
+	Feature,
+	GlossaryTooltip,
+	LinkTitleCard,
+	Plan,
+	RelatedProduct,
+} from "~/components";
 
 <Description>
 
-Detect and receive notifications about attacks based on traffic flows.
+Improve your network visibility and detect DDoS attacks based on traffic flows.
 
 </Description>
 
 <Plan type="all" />
 
 Magic Network Monitoring provides visibility into your network traffic by analyzing network <GlossaryTooltip term="flow data">flow data</GlossaryTooltip> sent from a customer’s routers. Magic Network Monitoring supports NetFlow v5, NetFlow v9, IPFIX, and sFlow.
 
-Enterprise customers can use Magic Network Monitoring with [Magic Transit on-demand](/magic-transit/on-demand/) to monitor their network, identify volumetric DDoS attacks, and activate Magic Transit on-demand to mitigate those attacks.
+Magic Network Monitoring is generally available to everyone with a Cloudflare account by default. You can log in to your Cloudflare dashboard, select your account, then go to **Analytics & Logs** > **Magic Monitoring** to get started.
 
-Magic Network Monitoring is automatically enabled for all Magic Transit and Magic WAN enterprise customers. Any enterprise customers without Magic Transit or Magic WAN that are interested in testing Magic Network Monitoring can receive access to the Magic Network Monitoring [free version](/magic-network-monitoring/magic-network-monitoring-free/) by submitting a request to their Cloudflare account team.
+Everyone can use the [free version](/magic-network-monitoring/magic-network-monitoring-free/) of Magic Network Monitoring in a home network, network lab, or business to get end to end visibility across their network traffic. Potential enterprise customers are encouraged to use the free version to run a proof of concept.
+
+Enterprise customers can use Magic Network Monitoring with [Magic Transit on-demand](/magic-transit/on-demand/) to monitor their network, identify volumetric DDoS attacks, and activate Magic Transit on-demand to mitigate those attacks.
 
 Learn how to [get started](/magic-network-monitoring/get-started/).
 
@@ -56,24 +65,32 @@ Set up notifications to learn about an attack.
 <RelatedProduct header="Magic Transit" href="/magic-transit/" product="magic-transit">
 
 Mitigates L7, L4, and L3 DDoS attacks with Magic Network Monitoring with Magic Transit on-demand.
+
 </RelatedProduct>
 
 <RelatedProduct header="DDoS Protection" href="/ddos-protection/" product="ddos-protection">
 
 Provides HTTP DDoS attack protection for zones onboarded to Cloudflare in addition to L3 and L4 DDoS attack protection.
+
 </RelatedProduct>
 
 <RelatedProduct header="Cloudflare Network Interconnect" href="/network-interconnect/" product="network-interconnect">
 
 Connects your network infrastructure directly with Cloudflare – rather than using the public Internet – for a more reliable and secure experience.
+
 </RelatedProduct>
 
 ## More resources
 
 <CardGrid>
 
-<LinkTitleCard title="Discord" href="https://discord.com/invite/cloudflaredev" icon="discord">
-Connect with the Magic Network Monitoring community on Discord to ask questions, and share feedback.
+<LinkTitleCard
+	title="Discord"
+	href="https://discord.com/invite/cloudflaredev"
+	icon="discord"
+>
+	Connect with the Magic Network Monitoring community on Discord to ask
+	questions, and share feedback.
 </LinkTitleCard>
 
 </CardGrid>
diff --git a/src/content/docs/magic-network-monitoring/magic-network-monitoring-free.mdx b/src/content/docs/magic-network-monitoring/magic-network-monitoring-free.mdx
@@ -3,18 +3,16 @@ title: Free version
 pcx_content_type: reference
 sidebar:
   order: 8
-  badge:
-    text: Beta
 head:
   - tag: title
     content: Magic Network Monitoring free version
 ---
 
-The free version of Magic Network Monitoring (MNM) is currently in a closed beta. All customers with a Cloudflare account can request early access to the free version of MNM by [filling out this form](https://docs.google.com/forms/d/1umsmwHmXgMesP2t4wH94uVExHaT60tb5RTeawqR_9Cg/edit).
+The free version of Magic Network Monitoring (MNM) is generally available to everyone with a Cloudflare account by default.
 
-If you would like your request for early access to MNM to be prioritized, please join [Cloudflare’s Discord server](https://discord.com/invite/cloudflaredev) and ask about early access in the MNM Discord channel. We prioritize Discord community members because Discord creates a great environment for engaging with users, helping with configuration, answering questions, and collecting valuable product feedback.
+All free customers are encouraged to join [Cloudflare's Discord server](https://discord.com/invite/cloudflaredev) to discuss the use cases, configuration, and troubleshooting of Magic Network Monitoring. Free customers are always welcome to provide product feedback and discuss feature requests. The product and engineering team that works on Magic Network Monitoring regularly engages with the Discord community.
 
-You can find the channel by joining the Cloudflare Developers Discord server. Then scroll down in the side bar navigation to the **Products** category and select **magic-network-monitoring**.
+You can find the channel by joining the Cloudflare Developers Discord server. Then scroll down in the side bar navigation to the **Cloudflare One** category and select **magic-network-monitoring**.
 
 ## Access the free version of MNM
 
diff --git a/src/content/docs/magic-network-monitoring/tutorials/ddos-testing-guide.mdx b/src/content/docs/magic-network-monitoring/tutorials/ddos-testing-guide.mdx
@@ -3,7 +3,7 @@ title: DDoS testing guide
 pcx_content_type: tutorial
 updated: 2024-06-18
 sidebar:
-  order: 2
+  order: 3
 head:
   - tag: title
     content: Magic Network Monitoring DDoS testing guide
diff --git a/src/content/docs/magic-network-monitoring/tutorials/encrypt-network-flow-data.mdx b/src/content/docs/magic-network-monitoring/tutorials/encrypt-network-flow-data.mdx
@@ -0,0 +1,14 @@
+---
+title: Encrypt network flow data
+pcx_content_type: tutorial
+updated: 2024-09-23
+sidebar:
+  order: 1
+head:
+  - tag: title
+    content: Magic Network Monitoring encrypt network flow data
+---
+
+Customers can encrypt the network flow data sent from their router to Cloudflare by routing their network flow traffic through a device running the WARP client. Then, encrypted network flow traffic can be forwarded from the WARP enabled device to Cloudflare's network flow endpoints.
+
+To learn more about the WARP client, and to install the WARP client on Linux, macOS, or Windows, you can visit the [WARP client documentation](/cloudflare-one/connections/connect-devices/warp/).
diff --git a/src/content/docs/magic-network-monitoring/tutorials/graphql-analytics.mdx b/src/content/docs/magic-network-monitoring/tutorials/graphql-analytics.mdx
@@ -5,7 +5,7 @@ updated: 2023-01-04
 languages:
   - GraphQL
 sidebar:
-  order: 1
+  order: 2
 head:
   - tag: title
     content: GraphQL Analytics
