feat(edge): continue waf

Author: RoRoJ

pages/edge-services/how-to/subscribe-edge-services.mdx

@@ -13,16 +13,22 @@ categories:
   - network
 ---
 
-Edge Services is an additional feature for Scaleway Load Balancers and Object Storage buckets. It lets you benefit from a powerful caching service to reduce the load on your origin servers and streamline delivery. On top of this, you get a customizable Edge Services endpoint and can set it to a subdomain of your choice, securing it with an SSL/TLS certificate.
+Edge Services is an additional feature for Scaleway Load Balancers and Object Storage buckets. It provides:
+- A [caching service](/edge-services/how-to/configure-cache/) to improve performance by reducing load on your [origin](#origin)
+- A [Web Application Firewall (WAF)](/edge-services/how-to/configure-waf/) to protect your origin from threats and malicious activity
+- A customizable and secure [endpoint](#endpoint) for accessing content via Edge Services, which can be set to a subdomain of your choice
 
 To use Edge Services, you must subscribe to a [pricing plan](https://www.scaleway.com/en/pricing/network/#edge-services). Within its monthly price, each pricing plan includes:
 
 - A fixed number of Edge Services [pipelines](/edge-services/concepts/#pipeline). You can create pipelines for either Load Balancers, Object Storage buckets, or a mixture of both, with your subscription plan.
-- A certain amount of egress [cache](/edge-services/concepts/#cache) data (the quantity of data transferred from Edge Services' caches, not including the transfer from the origin bucket or Load Balancer).
-- TODO
-- A custom domain and SSL certificate (managed or custom) for each pipeline.
+- A certain amount of egress cache data (the quantity of data transferred from Edge Services' caches, not including the transfer from the origin bucket or Load Balancer).
+- A certain amount of WAF requests (the number of requests that can be filtered through WAF across all your pipelines)
 
-If you create more pipelines than are included in your plan, or your pipelines' caches egress more data than is included, you will be charged additionally for this. The rates per pipeline/GB of data are indicated on the [pricing](https://www.scaleway.com/en/pricing/network/#edge-services) page.
+If you create more pipelines than are included in your plan, or your pipelines' caches egress more data than is included, or you make more WAF requests than are included, you will be charged additionally for this. The rates per pipeline/GB of data are indicated on the [pricing](https://www.scaleway.com/en/pricing/network/#edge-services) page.
+
+<Message type="tip">
+The Starter plan does not include any WAF requests. Nonetheless, you can purchase an add-on that gives you a certain amount of requests for a fixed monthly price. The option to purchase the add-on is displayed when you enable WAF on a pipeline.
+</Message>
 
 Subscriptions are pro-rata, meaning you can cancel your subscription or change your plan at any time, and you will be charged proportionally.
 
@@ -49,11 +55,13 @@ You can subscribe to Edge Services from the Object Storage or Load Balancer dash
 
     Your subscription is created, and you are returned to the Edge Services dashboard, on the **Pipelines** tab. All your Edge Services pipelines will display here.
 
+    <Lightbox src="TODO" alt="The Edge Services dashboard pf the Scaleway console, where the Pipeline tab is in view. At the top are 'Pipelines used', 'Cache used' and 'WAF used' indicator bars, which show how much of your plan's limits you have consumed so far this month." />
+
 ## How to change your subscription plan
 
 You can change your Edge Services subscription plan at any time. Subscriptions are pro-rata: the monthly price will be applied based on the proportion of the month you are subscribed to the plan. 
 
-If you upgrade your plan, any additional charges (for extra pipelines or cache data) that you had already accumulated before the time of upgrade will still stand.
+If you upgrade your plan, any additional charges (for extra pipelines, cache data or WAF requests) that you had already accumulated before the time of upgrade will still stand.
 
 Find out more about how Edge Service subscription plans and billing works, including scenarios for changing your plan mid-month, on our [Understanding Edge Services pricing](/edge-services/reference-content/understanding-pricing/) page.
 

pages/edge-services/quickstart.mdx

@@ -7,17 +7,20 @@ content:
   paragraph: Quickly set up Scaleway Edge Services for Object Storage buckets or Load Balancer origins with our guide. Learn to configure pipelines, customize endpoints, and manage caching for optimal performance.
 tags: edge-services edge services pipeline custom-domain cache
 dates:
-  validation: 2024-10-15
+  validation: 2025-03-03
   creation: 2024-07-24
 categories:
   - networks
 ---
 
-Edge Services is an additional feature for Scaleway Load Balancers and Object Storage buckets. It provides a [caching service](/edge-services/how-to/configure-cache/) to improve performance by reducing load on your [origin](/edge-services/concepts/#origin), and a customizable and secure [endpoint](/edge-services/concepts/#endpoint) for accessing content via Edge Services, which can be set to a subdomain of your choice.
+Edge Services is an additional feature for Scaleway Load Balancers and Object Storage buckets. It provides:
+- A [caching service](/edge-services/how-to/configure-cache/) to improve performance by reducing load on your [origin](#origin)
+- A [Web Application Firewall (WAF)](/edge-services/how-to/configure-waf/) to protect your origin from threats and malicious activity
+- A customizable and secure [endpoint](#endpoint) for accessing content via Edge Services, which can be set to a subdomain of your choice
 
 To use Edge Services, you must take out a subscription plan, which then enables you to create a certain number of Edge Services pipelines towards your Load Balancer origins or Object Storage buckets.
 
-<Lightbox src="scaleway-edge-services-pipeline.webp" alt="A diagram shows the elements and workflow of an Edge Services pipeline. The user connects to the customizable Edge Services endpoint (with its SSL/TLS certificate), which fetches content from the Edge Services cache, which itself fetches content to cache from an origin which is either an Object Storage bucket or Load Balancer" />
+<Lightbox src="scaleway-edge-services-pipeline.webp" alt="A diagram shows the elements and workflow of an Edge Services pipeline. The user connects to the customizable Edge Services endpoint (with its SSL/TLS certificate), which fetches content from the Edge Services cache, which itself fetches content to cache from an origin which is either an Object Storage bucket or Load Balancer. A Web Application Firewall sits between the cache and origin, protecting the origin from threats." />
 
 <Macro id="requirements" />
 
@@ -27,7 +30,7 @@ To use Edge Services, you must take out a subscription plan, which then enables
 
 ## How to subscribe to Edge Services
 
-To use Edge Services, you must subscribe to a [pricing plan](https://www.scaleway.com/en/pricing/network/#edge-services). Within its monthly price, each pricing plan includes a fixed number of pipelines, and a certain amount of egress cache data. Any consumption that exceeds the limits of the plan is charged at an additional rate.
+To use Edge Services, you must subscribe to a [pricing plan](https://www.scaleway.com/en/pricing/network/#edge-services). Within its monthly price, each pricing plan includes a fixed number of pipelines, and a certain amount of egress cache data and WAF requests. Any consumption that exceeds the limits of the plan is charged at an additional rate. 
 
 Find out more about how Edge Service subscription plans and billing works on our [Understanding Edge Services pricing](/edge-services/reference-content/understanding-pricing/) page, or follow the steps below to subscribe.
 
@@ -39,6 +42,8 @@ Find out more about how Edge Service subscription plans and billing works on our
 
     Your subscription is created, and you are returned to the Edge Services dashboard, on the **Pipelines** tab. All your Edge Services pipelines will display here.
 
+    <Lightbox src="TODO" alt="The Edge Services dashboard pf the Scaleway console, where the Pipeline tab is in view. At the top are 'Pipelines used', 'Cache used' and 'WAF used' indicator bars, which show how much of your plan's limits you have consumed so far this month." />
+
 ## How to create an Edge Services pipeline
 
 You can create [pipelines](/edge-services/concepts/#pipeline) for either Object Storage buckets or Load Balancer origins.
@@ -187,6 +192,10 @@ The cache is now enabled.
 
 For information on purging your cache, see our [dedicated documentation](/edge-services/how-to/configure-cache/).
 
+## How to configure WAF
+
+TODO
+
 ## How to delete an Edge Services pipeline
 
 1. Click **Edge Services** in the **Network** section of the [Scaleway console](https://console.scaleway.com/) side menu. The **Pipelines** tab displays.

pages/edge-services/reference-content/understanding-pricing.mdx

@@ -41,7 +41,17 @@ For full details of the price and limits of each plan, refer to the [pricing pag
 
 ## Keeping track of your Edge Services consumption
 
-You can check the number of pipelines you have at any one time in the **Pipelines** tab of the Edge Services dashboard in the Scaleway console. [Scaleway Cockpit](/edge-services/how-to/monitor-cockpit/) can be used to monitor the data egressing from your Edge Services caches.
+We provide a number of ways to keep track of your Edge Services consumption:
+
+- View, in relation to your plan's limit, how many pipelines you currently have and how much cache data you have consumed so far this month, in the **Pipelines** tab of your [Edge Services dashboard](https://console.scaleway.com/edge-services)
+
+    <Lightbox src="TODO CHECK scaleway-pipelines-limit.webp" alt="In the Edge Services section of the Scaleway console, bar indicators show how many pipelines and how much cache data has been consumed this month" />
+
+- View the details of your current plan, your last monthly invoice, and the costs accumulated so far for Edge Services this month, in the **Plans** tab of your [Edge Services dashboard](https://console.scaleway.com/edge-services)
+
+    <Lightbox src="TODO CHECK scaleway-current-conso.webp" alt="In the Edge Services section of the Scaleway console, information displays about your current plan, last monthly invoice, and charges accumulated this month for Edge Services" />
+
+- Use [Scaleway Cockpit](/network/edge-services/how-to/monitor-cockpit/) to monitor the data egressing from your Edge Services caches.
 
 ## WAF add-on
 
@@ -51,6 +61,8 @@ This add-on then lets you enable WAF on all your pipelines, and use a fixed amou
 
 WAF is only compatible with Load Balancer origin pipelines, not with Object Storage bucket pipelines.
 
+TODO ADD INFO ABOUT HOW TO ACTIVATE AND IF IT IS COMPULSORY
+
 ## Included usage vs additional charges
 
 Additional charges apply when you either: