feat(cockpit): updates (#4172)

nerda-codes · web-flow · commit b49be35e9c15 · 2025-01-07T10:10:33.000+01:00
diff --git 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/).
 
-<Macro id="cockpit-update-dashboards" />
-
 <Macro id="requirements" />
 
   - 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
@@ -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.
 
-<Macro id="cockpit-update-dashboards" />
-
 <Macro id="requirements" />
 
 - 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
@@ -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.
 </Message>
 
-<Macro id="cockpit-update-dashboards" />
-
 <Macro id="requirements" />
 
 - A Scaleway account logged into the [console](https://console.scaleway.com)
diff --git 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 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.
 
-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 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.
 
+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
@@ -4,9 +4,9 @@ macro: cockpit-plan-deprecation
 
 <Message type="important">
 
- **Cockpit pricing plans are scheduled for deprecation on January 1st 2025** <br /><br />
+ **Cockpit pricing plans were deprecated on January 1st 2025** <br /><br />
 
- 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. <br /><br />
- You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025). <br /><br />
+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same. <br /><br />
+ You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025). <br /><br />
  Find out [how to change data retention period](/observability/cockpit/how-to/change-data-retention/) in the dedicated documentation.
 </Message>
diff --git a/macros/cockpit/update-dashboards.mdx b/macros/cockpit/update-dashboards.mdx
diff --git 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.
 
-<Macro id="cockpit-update-dashboards" />
-
 <Macro id="requirements" />
 
 - 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
@@ -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.
 
 <Message type="important">
 
- **Cockpit pricing plans are scheduled for deprecation on January 1st 2025** <br /><br />
+ **Cockpit pricing plans were deprecated on January 1st 2025** <br /><br />
 
- 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. <br /><br />
- You will be able to change the retention period for your metrics, logs, and traces for free during Beta (starting January 1st 2025). <br /><br />
+ The [retention](/observability/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same. <br /><br />
+ You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025). <br /><br />
 </Message>
 
 <Macro id="requirements" />
diff --git 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
@@ -20,8 +20,6 @@ You can view metrics for your NATS, Queues, and Topics and Events services via [
 
 These steps are described below.
 
-<Macro id="cockpit-update-dashboards" />
-
 <Macro id="requirements" />
 
 - 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
@@ -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.
 
-<Macro id="cockpit-update-dashboards" />
-
 <Macro id="requirements" />
 
 - 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
@@ -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)**.
 
-<Macro id="cockpit-update-dashboards" />
 
 <Macro id="requirements" />
 
