From 209b38be4b507be5dbf967d77caa5551210761a4 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 6 Jan 2025 10:38:45 +0100 Subject: [PATCH 1/5] docs(cpt): update following pricing plans deprecation --- faq/cockpit.mdx | 16 ++++++---------- macros/cockpit/plan-deprecation.mdx | 8 ++++---- .../cockpit/how-to/change-data-retention.mdx | 10 +++++----- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/faq/cockpit.mdx b/faq/cockpit.mdx index 4280ef2294..099546622a 100644 --- a/faq/cockpit.mdx +++ b/faq/cockpit.mdx @@ -25,24 +25,20 @@ Refer to the [dedicated documentation page](/observability/cockpit/reference-con ## How am I billed for using Cockpit with my Scaleway data? -Cockpit is billed based on [pricing plans](https://console.scaleway.com/cockpit/plans). +Using Cockpit with your Scaleway data for data ingestion is billed as follows: -Pricing plans specify: +- Custom metrics are billed €0.15 per million samples of metrics ingested, per month. +- Custom logs and traces are billed €0.35 per GB ingested, per month. -- Retention time for your data: - * includes data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and your custom data -- Monitoring and alerting for your Scaleway data: - * includes data from [Scaleway resources integrated with Cockpit only](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) +During beta, the [retention](/observability/cockpit/concepts/#retention) period for your data (data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit)) is free of charge. Additional costs apply for sending custom data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources. -Pricing plans are scoped per [Project](/identity-and-access-management/organizations-and-projects/concepts/#project). - ## How am I billed for using Cockpit with custom data? Custom data is any data that is external to Scaleway, or **data from Scaleway resources not integrated with Cockpit**. Refer to the [dedicated documentation page](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit. -The retention time for your custom data depends on the [pricing plan](https://console.scaleway.com/cockpit/plans) you have selected. +During beta, the [retention](/observability/cockpit/concepts/#retention) period for your custom data is free of charge. You will not be charged for **querying** custom data. @@ -50,7 +46,7 @@ You will not be charged for **querying** custom data. - Custom logs are billed €0.35 per GB ingested, per month. - Custom traces are billed €0.35 per GB ingested, per month. -**Starting April 2024, Scaleway will apply volume discounts to bill custom metrics**. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.** +Scaleway applies volume discounts to bill custom metrics. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.** | Levels | Range | Monthly pricing with volume discounts | |--------------|----------------------------------------------|------------------------------------------| diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index 741679ac53..ce96e2f4b4 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -2,11 +2,11 @@ macro: cockpit-plan-deprecation --- - + - **Cockpit pricing plans are scheduled for deprecation on January 1st 2025**

+ **Cockpit pricing plans have been deprecated on January 1st 2025**

- The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces will remain the same after that date.

- You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

+ You can change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

Find out [how to change data retention period](/observability/cockpit/how-to/change-data-retention/) in the dedicated documentation. diff --git a/observability/cockpit/how-to/change-data-retention.mdx b/observability/cockpit/how-to/change-data-retention.mdx index 6d36918d9c..47f7dc47c9 100644 --- a/observability/cockpit/how-to/change-data-retention.mdx +++ b/observability/cockpit/how-to/change-data-retention.mdx @@ -13,14 +13,14 @@ dates: posted: 2024-11-25 --- -This page shows you how to change the [retention](/observability/cockpit/concepts/#retention) period for your data sources. **This feature will be available only starting January 1st 2025**. +This page shows you how to change the [retention](/observability/cockpit/concepts/#retention) period for your data sources. - + - **Cockpit pricing plans are scheduled for deprecation on January 1st 2025**

+ **Cockpit pricing plans have been deprecated on January 1st 2025**

- The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces will remain the same after that date.

- You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

+ You can change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

From 62bbb902f180e6f26b5746b526f06878c67633c7 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 6 Jan 2025 10:43:52 +0100 Subject: [PATCH 2/5] Revert "docs(cpt): update following pricing plans deprecation" This reverts commit 209b38be4b507be5dbf967d77caa5551210761a4. --- faq/cockpit.mdx | 16 ++++++++++------ macros/cockpit/plan-deprecation.mdx | 8 ++++---- .../cockpit/how-to/change-data-retention.mdx | 10 +++++----- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/faq/cockpit.mdx b/faq/cockpit.mdx index 099546622a..4280ef2294 100644 --- a/faq/cockpit.mdx +++ b/faq/cockpit.mdx @@ -25,20 +25,24 @@ Refer to the [dedicated documentation page](/observability/cockpit/reference-con ## How am I billed for using Cockpit with my Scaleway data? -Using Cockpit with your Scaleway data for data ingestion is billed as follows: +Cockpit is billed based on [pricing plans](https://console.scaleway.com/cockpit/plans). -- Custom metrics are billed €0.15 per million samples of metrics ingested, per month. -- Custom logs and traces are billed €0.35 per GB ingested, per month. +Pricing plans specify: -During beta, the [retention](/observability/cockpit/concepts/#retention) period for your data (data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit)) is free of charge. +- Retention time for your data: + * includes data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and your custom data +- Monitoring and alerting for your Scaleway data: + * includes data from [Scaleway resources integrated with Cockpit only](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) Additional costs apply for sending custom data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources. +Pricing plans are scoped per [Project](/identity-and-access-management/organizations-and-projects/concepts/#project). + ## How am I billed for using Cockpit with custom data? Custom data is any data that is external to Scaleway, or **data from Scaleway resources not integrated with Cockpit**. Refer to the [dedicated documentation page](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit. -During beta, the [retention](/observability/cockpit/concepts/#retention) period for your custom data is free of charge. +The retention time for your custom data depends on the [pricing plan](https://console.scaleway.com/cockpit/plans) you have selected. You will not be charged for **querying** custom data. @@ -46,7 +50,7 @@ You will not be charged for **querying** custom data. - Custom logs are billed €0.35 per GB ingested, per month. - Custom traces are billed €0.35 per GB ingested, per month. -Scaleway applies volume discounts to bill custom metrics. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.** +**Starting April 2024, Scaleway will apply volume discounts to bill custom metrics**. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.** | Levels | Range | Monthly pricing with volume discounts | |--------------|----------------------------------------------|------------------------------------------| diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index ce96e2f4b4..741679ac53 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -2,11 +2,11 @@ macro: cockpit-plan-deprecation --- - + - **Cockpit pricing plans have been deprecated on January 1st 2025**

+ **Cockpit pricing plans are scheduled for deprecation on January 1st 2025**

- The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

- You can change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces will remain the same after that date.

+ You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

Find out [how to change data retention period](/observability/cockpit/how-to/change-data-retention/) in the dedicated documentation. diff --git a/observability/cockpit/how-to/change-data-retention.mdx b/observability/cockpit/how-to/change-data-retention.mdx index 47f7dc47c9..6d36918d9c 100644 --- a/observability/cockpit/how-to/change-data-retention.mdx +++ b/observability/cockpit/how-to/change-data-retention.mdx @@ -13,14 +13,14 @@ dates: posted: 2024-11-25 --- -This page shows you how to change the [retention](/observability/cockpit/concepts/#retention) period for your data sources. +This page shows you how to change the [retention](/observability/cockpit/concepts/#retention) period for your data sources. **This feature will be available only starting January 1st 2025**. - + - **Cockpit pricing plans have been deprecated on January 1st 2025**

+ **Cockpit pricing plans are scheduled for deprecation on January 1st 2025**

- The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

- You can change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces will remain the same after that date.

+ You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

From f4036e7e6950887d894c0e4cefe4fceac5201e6f Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 6 Jan 2025 11:32:20 +0100 Subject: [PATCH 3/5] docs(cpt): updates --- .../how-to/monitor-deployment.mdx | 2 -- .../how-to/send-metrics-logs-to-cockpit.mdx | 2 -- .../kubernetes/how-to/access-audit-logs.mdx | 2 -- faq/cockpit.mdx | 17 ++++++----------- macros/cockpit/plan-deprecation.mdx | 6 +++--- macros/cockpit/update-dashboards.mdx | 11 ----------- .../load-balancer/how-to/monitor-lb-cockpit.mdx | 2 -- .../cockpit/how-to/change-data-retention.mdx | 8 ++++---- .../reference-content/cockpit-limitations.mdx | 2 +- .../messaging/how-to/monitor-mnq-cockpit.mdx | 2 -- storage/object/how-to/monitor-consumption.mdx | 2 -- .../index.mdx | 1 - 12 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 macros/cockpit/update-dashboards.mdx diff --git a/ai-data/managed-inference/how-to/monitor-deployment.mdx b/ai-data/managed-inference/how-to/monitor-deployment.mdx index cc330e3019..947d57b845 100644 --- a/ai-data/managed-inference/how-to/monitor-deployment.mdx +++ b/ai-data/managed-inference/how-to/monitor-deployment.mdx @@ -15,8 +15,6 @@ categories: This documentation page shows you how to monitor your Managed Inference deployment with [Cockpit](/observability/cockpit/quickstart/). - - - A Scaleway account logged into the [console](https://console.scaleway.com) diff --git a/bare-metal/elastic-metal/how-to/send-metrics-logs-to-cockpit.mdx b/bare-metal/elastic-metal/how-to/send-metrics-logs-to-cockpit.mdx index 91735abe36..f107d06d28 100644 --- a/bare-metal/elastic-metal/how-to/send-metrics-logs-to-cockpit.mdx +++ b/bare-metal/elastic-metal/how-to/send-metrics-logs-to-cockpit.mdx @@ -17,8 +17,6 @@ Monitoring your dedicated servers with [Scaleway Cockpit](/observability/cockpit Cockpit provides a user-friendly interface for real-time monitoring of CPU, memory, disk usage, and network activity, enhancing the reliability and performance of bare metal servers. - - - A Scaleway account logged into the [console](https://console.scaleway.com) diff --git a/containers/kubernetes/how-to/access-audit-logs.mdx b/containers/kubernetes/how-to/access-audit-logs.mdx index c16f9bca43..abfa0ab41c 100644 --- a/containers/kubernetes/how-to/access-audit-logs.mdx +++ b/containers/kubernetes/how-to/access-audit-logs.mdx @@ -37,8 +37,6 @@ All logs are centralized in [Cockpit](/observability/cockpit/quickstart/). Monitoring calls to the `kube-apiserver` is a matter of security compliance and perhaps a hard requirement for some of the certifications you are keen to obtain. - - - A Scaleway account logged into the [console](https://console.scaleway.com) diff --git a/faq/cockpit.mdx b/faq/cockpit.mdx index 4280ef2294..c422a4a815 100644 --- a/faq/cockpit.mdx +++ b/faq/cockpit.mdx @@ -25,32 +25,27 @@ Refer to the [dedicated documentation page](/observability/cockpit/reference-con ## How am I billed for using Cockpit with my Scaleway data? -Cockpit is billed based on [pricing plans](https://console.scaleway.com/cockpit/plans). +Using Cockpit with your Scaleway data is free of charge. -Pricing plans specify: - -- Retention time for your data: - * includes data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and your custom data -- Monitoring and alerting for your Scaleway data: - * includes data from [Scaleway resources integrated with Cockpit only](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) +During the beta of retention period edition, the retention period you set for your data (from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and custom data) is free of charge. Additional costs apply for sending custom data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources. -Pricing plans are scoped per [Project](/identity-and-access-management/organizations-and-projects/concepts/#project). - ## How am I billed for using Cockpit with custom data? Custom data is any data that is external to Scaleway, or **data from Scaleway resources not integrated with Cockpit**. Refer to the [dedicated documentation page](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit. -The retention time for your custom data depends on the [pricing plan](https://console.scaleway.com/cockpit/plans) you have selected. +During the beta of retention period edition, the retention period you set for your custom data is free of charge. You will not be charged for **querying** custom data. +Data ingestion is billed as follows: + - Custom metrics are billed €0.15 per million samples of metrics ingested, per month. - Custom logs are billed €0.35 per GB ingested, per month. - Custom traces are billed €0.35 per GB ingested, per month. -**Starting April 2024, Scaleway will apply volume discounts to bill custom metrics**. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.** +Scaleway applies volume discounts to bill custom metrics. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.** | Levels | Range | Monthly pricing with volume discounts | |--------------|----------------------------------------------|------------------------------------------| diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index 741679ac53..6bddeb47f3 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -4,9 +4,9 @@ macro: cockpit-plan-deprecation - **Cockpit pricing plans are scheduled for deprecation on January 1st 2025**

+ **Cockpit pricing plans have been deprecated on January 1st 2025**

- The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces will remain the same after that date.

- You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

+ You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025).

Find out [how to change data retention period](/observability/cockpit/how-to/change-data-retention/) in the dedicated documentation. diff --git a/macros/cockpit/update-dashboards.mdx b/macros/cockpit/update-dashboards.mdx deleted file mode 100644 index eccc996fe4..0000000000 --- a/macros/cockpit/update-dashboards.mdx +++ /dev/null @@ -1,11 +0,0 @@ ---- -macro: cockpit-update-dashboards ---- - - -**Cockpit dashboard updates**

- - Starting April 2024, a **new version of Cockpit will be released**.

- - In this version, the concept of **regionalization** will be introduced to offer you more flexibility and resilience for seamless monitoring. If you have created customized dashboards with data for your Scaleway resources before April 2024, you will need to update your queries in Grafana, with the new regionalized [data sources](/observability/cockpit/concepts/#data-sources). - diff --git a/network/load-balancer/how-to/monitor-lb-cockpit.mdx b/network/load-balancer/how-to/monitor-lb-cockpit.mdx index 5e163b6070..3021a3fca2 100644 --- a/network/load-balancer/how-to/monitor-lb-cockpit.mdx +++ b/network/load-balancer/how-to/monitor-lb-cockpit.mdx @@ -15,8 +15,6 @@ categories: You can view your Load Balancer's metrics and logs by using [Scaleway Cockpit](/observability/cockpit/quickstart/). Load Balancer is fully integrated into Cockpit, and allows you to monitor your Load Balancers frontends, backends, and backend servers at a glance, and visualize your metrics, traffic and logs. This page explains how to get started with Scaleway Cockpit for viewing your Load Balancers metrics and logs. - - - A Scaleway account logged into the [console](https://console.scaleway.com) diff --git a/observability/cockpit/how-to/change-data-retention.mdx b/observability/cockpit/how-to/change-data-retention.mdx index 6d36918d9c..45d878265e 100644 --- a/observability/cockpit/how-to/change-data-retention.mdx +++ b/observability/cockpit/how-to/change-data-retention.mdx @@ -13,14 +13,14 @@ dates: posted: 2024-11-25 --- -This page shows you how to change the [retention](/observability/cockpit/concepts/#retention) period for your data sources. **This feature will be available only starting January 1st 2025**. +This page shows you how to change the [retention](/observability/cockpit/concepts/#retention) period for your data sources. - **Cockpit pricing plans are scheduled for deprecation on January 1st 2025**

+ **Cockpit pricing plans have been deprecated on January 1st 2025**

- The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces will remain the same after that date.

- You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025).

+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

+ You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025).

diff --git a/observability/cockpit/reference-content/cockpit-limitations.mdx b/observability/cockpit/reference-content/cockpit-limitations.mdx index 5d98579c31..6a97af69e3 100644 --- a/observability/cockpit/reference-content/cockpit-limitations.mdx +++ b/observability/cockpit/reference-content/cockpit-limitations.mdx @@ -19,7 +19,7 @@ This page provides information about the capabilities and limits of Scaleway's O ## Retention period of your data -Scaleway offers several retention periods, depending on your [data types](/observability/cockpit/concepts/#data-types). The retention period varies depending on the [pricing plan](https://console.scaleway.com/cockpit/plans) you have selected. +Scaleway offers several retention periods, depending on your [data types](/observability/cockpit/concepts/#data-types). Find out more information about how Cockpit is billed depending on your data types in the [FAQ](/faq/cockpit/#how-am-i-billed-for-using-cockpit-with-my-scaleway-data). diff --git a/serverless/messaging/how-to/monitor-mnq-cockpit.mdx b/serverless/messaging/how-to/monitor-mnq-cockpit.mdx index 46367b3416..25bea41266 100644 --- a/serverless/messaging/how-to/monitor-mnq-cockpit.mdx +++ b/serverless/messaging/how-to/monitor-mnq-cockpit.mdx @@ -20,8 +20,6 @@ You can view metrics for your NATS, Queues, and Topics and Events services via [ These steps are described below. - - - A Scaleway account logged into the [console](https://console.scaleway.com) diff --git a/storage/object/how-to/monitor-consumption.mdx b/storage/object/how-to/monitor-consumption.mdx index 2bc9f37714..e684c2a568 100644 --- a/storage/object/how-to/monitor-consumption.mdx +++ b/storage/object/how-to/monitor-consumption.mdx @@ -18,8 +18,6 @@ You can view your Object Storage's metrics and logs using [Scaleway Cockpit](/ob Cockpit is available in all [regions](/storage/object/concepts/#region-and-availability-zone) for Object Storage. - - - A Scaleway account logged into the [console](https://console.scaleway.com) diff --git a/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx b/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx index 34372c9601..eacf3bf6d6 100644 --- a/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx +++ b/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx @@ -16,7 +16,6 @@ dates: This page shows you how to push your metrics and logs from a [Scaleway Instance](/compute/instances/concepts/#instance). You can also use this tutorial to **push metrics and logs from external Instances (i.e. Instances outside of Scaleway)**. - From 734610fabfe901fca4d78986c4d9498ca9eb4005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9da?= <87707325+nerda-codes@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:16:42 +0100 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: ldecarvalho-doc <82805470+ldecarvalho-doc@users.noreply.github.com> --- faq/cockpit.mdx | 4 ++-- macros/cockpit/plan-deprecation.mdx | 2 +- observability/cockpit/how-to/change-data-retention.mdx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/faq/cockpit.mdx b/faq/cockpit.mdx index c422a4a815..975de1058e 100644 --- a/faq/cockpit.mdx +++ b/faq/cockpit.mdx @@ -27,7 +27,7 @@ Refer to the [dedicated documentation page](/observability/cockpit/reference-con Using Cockpit with your Scaleway data is free of charge. -During the beta of retention period edition, the retention period you set for your data (from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and custom data) is free of charge. +During the beta of the retention period edition feature, the retention period you set for your data (from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and custom data) is free of charge. Additional costs apply for sending custom data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources. @@ -35,7 +35,7 @@ Additional costs apply for sending custom data to Cockpit. This means that you w Custom data is any data that is external to Scaleway, or **data from Scaleway resources not integrated with Cockpit**. Refer to the [dedicated documentation page](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit. -During the beta of retention period edition, the retention period you set for your custom data is free of charge. +During the beta of the retention period edition feature, the retention period you set for your custom data is free of charge. You will not be charged for **querying** custom data. diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index 6bddeb47f3..8f1e38bbd7 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -4,7 +4,7 @@ macro: cockpit-plan-deprecation - **Cockpit pricing plans have been deprecated on January 1st 2025**

+ **Cockpit pricing plans were deprecated on January 1st 2025**

The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025).

diff --git a/observability/cockpit/how-to/change-data-retention.mdx b/observability/cockpit/how-to/change-data-retention.mdx index 45d878265e..261dc4d89a 100644 --- a/observability/cockpit/how-to/change-data-retention.mdx +++ b/observability/cockpit/how-to/change-data-retention.mdx @@ -17,7 +17,7 @@ This page shows you how to change the [retention](/observability/cockpit/concept - **Cockpit pricing plans have been deprecated on January 1st 2025**

+ **Cockpit pricing plans were deprecated on January 1st 2025**

The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same.

You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025).

From 45e3e50fec06dec3287e3ba3edceb28cf2da9129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9da?= <87707325+nerda-codes@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:46:32 +0100 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Benedikt Rollik --- faq/cockpit.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faq/cockpit.mdx b/faq/cockpit.mdx index 975de1058e..35f7e95635 100644 --- a/faq/cockpit.mdx +++ b/faq/cockpit.mdx @@ -27,7 +27,7 @@ Refer to the [dedicated documentation page](/observability/cockpit/reference-con Using Cockpit with your Scaleway data is free of charge. -During the beta of the retention period edition feature, the retention period you set for your data (from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and custom data) is free of charge. +During the beta phase of the retention period edition feature, the retention period you set for your data - whether from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) or custom data - will be free of charge. Additional costs apply for sending custom data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources.