From b64a634789541e4dcc1433b837310cc25186fc2d Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Thu, 17 Apr 2025 11:22:07 +0100 Subject: [PATCH 1/3] feat: added monitor traffic note Added traffic block note to relevant Upsun and Platform pages --- .../platform/src/administration/pricing/_index.md | 14 ++++++++++++++ sites/platform/src/domains/cdn/managed-fastly.md | 14 ++++++++++++++ .../src/administration/billing/monitor-billing.md | 8 ++++++++ 3 files changed, 36 insertions(+) diff --git a/sites/platform/src/administration/pricing/_index.md b/sites/platform/src/administration/pricing/_index.md index b249528998..edd55f6ad8 100644 --- a/sites/platform/src/administration/pricing/_index.md +++ b/sites/platform/src/administration/pricing/_index.md @@ -137,6 +137,20 @@ Plans with a Fastly CDN service or the extra Fastly Service include the followin *Plans without the Fastly Service are instead charged at the following origin prices.* +{{< note theme="note" title="Monitor monthly traffic usage">}} + +You can access a clear summary of your monthly traffic metrics under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor traffic, control costs, and understand usage patterns more effectively. In this summary, you will find specific details about: + +- **Origin Bandwidth:** Data transferred from origin servers. + +- **Origin Requests:** Requests served by origin servers. + +- **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. + +These metrics are updated daily and will reflect your traffic usage throughout the billing period. + +{{< /note >}} + ### Overage prices | SKU | Description | USD | EUR | AUD | CAD | GBP | diff --git a/sites/platform/src/domains/cdn/managed-fastly.md b/sites/platform/src/domains/cdn/managed-fastly.md index b208ff254c..b77aaa5dc1 100644 --- a/sites/platform/src/domains/cdn/managed-fastly.md +++ b/sites/platform/src/domains/cdn/managed-fastly.md @@ -19,6 +19,20 @@ open a [support ticket](/learn/overview/get-support.md). To add a managed Fastly CDN to your project, [contact sales](https://platform.sh/contact/). +{{< note theme="note" title="Monitor CDN metrics">}} + +You can access a clear summary of your monthly traffic metrics under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor traffic, control costs, and understand usage patterns more effectively. In this summary, you will find specific details about: + +- **Origin Bandwidth:** Data transferred from origin servers. + +- **Origin Requests:** Requests served by origin servers. + +- **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. + +These metrics are updated daily and will reflect your traffic usage throughout the billing period. + +{{< /note >}} + ### Domain control validation When you request for a new domain to be added to your Fastly service, diff --git a/sites/upsun/src/administration/billing/monitor-billing.md b/sites/upsun/src/administration/billing/monitor-billing.md index 44b369ade4..41dd9c85f5 100644 --- a/sites/upsun/src/administration/billing/monitor-billing.md +++ b/sites/upsun/src/administration/billing/monitor-billing.md @@ -101,6 +101,14 @@ All items used for the calculation are displayed in the [**Overview** tab](#acce {{< /codetabs >}} +{{< note theme="note" title="Monitor usage metrics">}} + +You can access a clear summary of your monthly usage metrics at the Project level inside [Console](https://console.upsun.com). This will help you control costs and understand usage patterns more effectively. + +These metrics are updated daily and will reflect your usage throughout the billing period. + +{{< /note >}} + ### Next month estimate From the [**Overview** tab](#access-your-organization-billing-information), you can also access an estimate for next month. From c5a7d5332213fc77424bde6cca96e0cd32ede620 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Fri, 23 May 2025 14:24:25 +0100 Subject: [PATCH 2/3] feat: added Nicolas edits Added edits requested by nicolas --- .../platform/src/administration/pricing/_index.md | 14 +++++++------- sites/platform/src/domains/cdn/managed-fastly.md | 11 +++++++---- .../src/administration/billing/monitor-billing.md | 12 +++++++++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/sites/platform/src/administration/pricing/_index.md b/sites/platform/src/administration/pricing/_index.md index edd55f6ad8..95d17d82c7 100644 --- a/sites/platform/src/administration/pricing/_index.md +++ b/sites/platform/src/administration/pricing/_index.md @@ -137,19 +137,19 @@ Plans with a Fastly CDN service or the extra Fastly Service include the followin *Plans without the Fastly Service are instead charged at the following origin prices.* -{{< note theme="note" title="Monitor monthly traffic usage">}} +### Monitor monthly traffic usage -You can access a clear summary of your monthly traffic metrics under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor traffic, control costs, and understand usage patterns more effectively. In this summary, you will find specific details about: +You can access a summary of your monthly traffic usage under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor your monthly bandwidth and requests consumption. -- **Origin Bandwidth:** Data transferred from origin servers. +In this summary, you will find specific details about: -- **Origin Requests:** Requests served by origin servers. +- **Origin Bandwidth:** Data transferred from origin servers (in TB). -- **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. +- **Origin Requests:** Requests served by origin servers. (This will be a million requests.) -These metrics are updated daily and will reflect your traffic usage throughout the billing period. +- **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. -{{< /note >}} +This data is updated daily and will reflect your traffic usage throughout the billing period. ### Overage prices diff --git a/sites/platform/src/domains/cdn/managed-fastly.md b/sites/platform/src/domains/cdn/managed-fastly.md index b77aaa5dc1..bea2c54bc8 100644 --- a/sites/platform/src/domains/cdn/managed-fastly.md +++ b/sites/platform/src/domains/cdn/managed-fastly.md @@ -21,15 +21,18 @@ To add a managed Fastly CDN to your project, {{< note theme="note" title="Monitor CDN metrics">}} -You can access a clear summary of your monthly traffic metrics under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor traffic, control costs, and understand usage patterns more effectively. In this summary, you will find specific details about: +You can access a summary of your monthly traffic usage under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor your monthly bandwidth and requests consumption. -- **Origin Bandwidth:** Data transferred from origin servers. +In this summary, you will find specific details about: -- **Origin Requests:** Requests served by origin servers. +- **Origin Bandwidth:** Data transferred from origin servers (in TB). + +- **Origin Requests:** Requests served by origin servers. (This will be a million requests.) - **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. -These metrics are updated daily and will reflect your traffic usage throughout the billing period. +This data is updated daily and will reflect your traffic usage throughout the billing period. + {{< /note >}} diff --git a/sites/upsun/src/administration/billing/monitor-billing.md b/sites/upsun/src/administration/billing/monitor-billing.md index 41dd9c85f5..4104496ca3 100644 --- a/sites/upsun/src/administration/billing/monitor-billing.md +++ b/sites/upsun/src/administration/billing/monitor-billing.md @@ -82,6 +82,12 @@ The following formula is used to estimate how much accumulated resource usage ma All items used for the calculation are displayed in the [**Overview** tab](#access-your-organization-billing-information). +{{< note theme="note" title="Monitor CDN metrics">}} + +You can also access a summary of your monthly resource usage under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). + +{{< /note >}} + <---> +++ @@ -101,11 +107,11 @@ All items used for the calculation are displayed in the [**Overview** tab](#acce {{< /codetabs >}} -{{< note theme="note" title="Monitor usage metrics">}} +{{< note theme="note" title="Monitor usage">}} -You can access a clear summary of your monthly usage metrics at the Project level inside [Console](https://console.upsun.com). This will help you control costs and understand usage patterns more effectively. +You can access a summary of your monthly usage at the Project level inside [Console](https://console.upsun.com). This will help you monitor your monthly bandwidth and requests consumption. -These metrics are updated daily and will reflect your usage throughout the billing period. +The data is updated daily and will reflect your usage throughout the billing period. {{< /note >}} From 1337641bcd92f48eae227037de500133032d50d4 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Fri, 6 Jun 2025 13:42:31 +0100 Subject: [PATCH 3/3] feat: made suggested changes made changes suggested by Nicolas --- .../src/administration/pricing/_index.md | 20 +++++++++---------- .../src/domains/cdn/managed-fastly.md | 2 +- .../administration/billing/monitor-billing.md | 11 ++-------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/sites/platform/src/administration/pricing/_index.md b/sites/platform/src/administration/pricing/_index.md index 95d17d82c7..47b5a03a04 100644 --- a/sites/platform/src/administration/pricing/_index.md +++ b/sites/platform/src/administration/pricing/_index.md @@ -137,6 +137,15 @@ Plans with a Fastly CDN service or the extra Fastly Service include the followin *Plans without the Fastly Service are instead charged at the following origin prices.* +### Overage prices + +| SKU | Description | USD | EUR | AUD | CAD | GBP | +|-----------------|-----------------------------------------------------------------------------------------|------|------|--------|--------|------| +| `EDGE-ORN-OVERAGE-1TB` | Origin Egress Bandwidth: 1TB | $209 | €155 | AU$303 | CA$284 | £161 | +| `EDGE-BDW-OVERAGE-1TB` | Edge Egress Bandwidth: 1TB | $88 | €65 | AU$128 | CA$119 | £68 | +| `EDGE-REQ-OVERAGE-50M` | Ingress Requests: 50M | $66 | €49 | AU$96 | CA$90 | £51 | + + ### Monitor monthly traffic usage You can access a summary of your monthly traffic usage under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). This will help you monitor your monthly bandwidth and requests consumption. @@ -145,21 +154,12 @@ In this summary, you will find specific details about: - **Origin Bandwidth:** Data transferred from origin servers (in TB). -- **Origin Requests:** Requests served by origin servers. (This will be a million requests.) +- **Origin Requests:** Requests served by origin servers (in millions of requests). - **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. This data is updated daily and will reflect your traffic usage throughout the billing period. -### Overage prices - -| SKU | Description | USD | EUR | AUD | CAD | GBP | -|-----------------|-----------------------------------------------------------------------------------------|------|------|--------|--------|------| -| `EDGE-ORN-OVERAGE-1TB` | Origin Egress Bandwidth: 1TB | $209 | €155 | AU$303 | CA$284 | £161 | -| `EDGE-BDW-OVERAGE-1TB` | Edge Egress Bandwidth: 1TB | $88 | €65 | AU$128 | CA$119 | £68 | -| `EDGE-REQ-OVERAGE-50M` | Ingress Requests: 50M | $66 | €49 | AU$96 | CA$90 | £51 | - - ### DDoS surge protection If your site is suffering from a DDoS attack, overages may apply. diff --git a/sites/platform/src/domains/cdn/managed-fastly.md b/sites/platform/src/domains/cdn/managed-fastly.md index bea2c54bc8..c45573853f 100644 --- a/sites/platform/src/domains/cdn/managed-fastly.md +++ b/sites/platform/src/domains/cdn/managed-fastly.md @@ -27,7 +27,7 @@ In this summary, you will find specific details about: - **Origin Bandwidth:** Data transferred from origin servers (in TB). -- **Origin Requests:** Requests served by origin servers. (This will be a million requests.) +- **Origin Requests:** Requests served by origin servers (in millions of requests). - **CDN Bandwidth & CDN Requests:** Shown if you have Fastly CDN enabled. diff --git a/sites/upsun/src/administration/billing/monitor-billing.md b/sites/upsun/src/administration/billing/monitor-billing.md index 4104496ca3..1f6d3a9751 100644 --- a/sites/upsun/src/administration/billing/monitor-billing.md +++ b/sites/upsun/src/administration/billing/monitor-billing.md @@ -82,9 +82,9 @@ The following formula is used to estimate how much accumulated resource usage ma All items used for the calculation are displayed in the [**Overview** tab](#access-your-organization-billing-information). -{{< note theme="note" title="Monitor CDN metrics">}} +{{< note theme="note" title="Monitor monthly traffic usage">}} -You can also access a summary of your monthly resource usage under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). +You can also access a summary of your monthly traffic usage under the "Traffic this month" section at the Project level inside [Console](https://console.platform.sh). {{< /note >}} @@ -107,13 +107,6 @@ All items used for the calculation are displayed in the [**Overview** tab](#acce {{< /codetabs >}} -{{< note theme="note" title="Monitor usage">}} - -You can access a summary of your monthly usage at the Project level inside [Console](https://console.upsun.com). This will help you monitor your monthly bandwidth and requests consumption. - -The data is updated daily and will reflect your usage throughout the billing period. - -{{< /note >}} ### Next month estimate