From f5edf84539096cfd94865891ac9d6b9990ce3540 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Wed, 26 Mar 2025 17:03:18 +0100 Subject: [PATCH 01/13] docs(add): add info --- pages/cockpit/concepts.mdx | 37 +++++++++++++++---------------------- pages/cockpit/faq.mdx | 4 ++-- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index bcb4a28438..f01f1de3e4 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -56,6 +56,10 @@ A Cockpit is an instance of the Observability product that stores metrics, logs, Contact points define who is notified when an alert fires, according to the region in which you have added them. Contact points include emails, Slack, on-call systems, and texts. When an alert fires, all contact points are notified. +## Custom data + +Custom data is any data (metrics, logs or traces) that you may push to Cockpit. It can be data collected from your applications hosted at Scaleway or elsewhere. + ## Data sources Data sources are regionalized backends that allow you to store and fetch your metrics, logs, and traces. By default, **Scaleway data sources** are enabled if you are using [Scaleway resources integrated with Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) on your Project. @@ -102,14 +106,6 @@ A Grafana user is any individual who can log in to [Grafana](https://grafana.com Loki is the log aggregation system used by [Grafana](https://grafana.com/docs/grafana/latest/introduction/) to store and query your logs. -## Loki Remote Write - -`Loki Remote Write` is the protocol used to push your logs to your Cockpit's logs' endpoint. - -## LogQL - -LogQL is [Grafana Loki’s language](https://grafana.com/docs/loki/latest/logql/) for querying logs. LogQL uses labels and operators for filtering. - ## Logs Logs are a data type that provides a record of all events and errors taking place during the lifecycle of your resources. They represent an excellent source of visibility if you want to know when a problem occurred, or which events correlate with it. @@ -142,10 +138,6 @@ A preconfigured dashboard is a set of one or more panels that Scaleway sets up a `Prometheus Remote Write` is the protocol used to push your metrics to your Cockpit's metrics' endpoint. -## PromQL - -PromQL, short for Prometheus Querying Language, is the main way to query metrics within Prometheus. It is designed for building queries for graphs and alerts. - ## Receivers Receivers are hubs consisting of contact points. You can associate one or several alerts with one or more receivers. This allows you to diversify your alerts. @@ -166,22 +158,27 @@ Retention or data retention refers to the duration for which data, such as metri The minimum and maximum retention periods for each data source type are as follows: -| Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | -|------------------------------------------------|---------------------------------------------|------------------------------------------------|---------------------------------------------| -| Minimum retention period: 1 day | Minimum retention period: 1 day | Minimum retention period: 31 days | Minimum retention period: 1 day | -| Maximum retention period: 365 days (12 months) | Maximum retention period: 31 days (1 month) | Maximum retention period: 365 days (12 months) | Maximum retention period: 31 days (1 month) | -| Default retention period: 31 days | Default retention period: 7 days | Default retention period: 31 days | Default retention period: 7 days | +| Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | +|------------------------------------------------|----------------------------------------------|------------------------------------------------|-----------------------------------------------| +| Minimum retention period: 1 day | Minimum retention period: 1 day | Minimum retention period: 31 days | Minimum retention period: 1 day | +| Maximum retention period: 1825 days (5 years) | Maximum retention period: 1825 days (5 years)| Maximum retention period: 1825 days (5 years) | Maximum retention period: 1825 days (5 years) | +| Default retention period: 31 days | Default retention period: 7 days | Default retention period: 31 days | Default retention period: 7 days | ## Samples A sample is a unique measuring point on a time series. +## Scaleway data + +Scaleway data is the observability data (metrics and/or logs) that is natively collected by all Scaleway products, integrated with Cockpit. +Refer to the dedicated documentation page to find out which resources are integrated with Cockpit. + ## Tempo Tempo is [Grafana's open source](https://grafana.com/docs/tempo/latest/) tracing tool that allows you to search for traces, generate metrics from them, and link your tracing data with logs and metrics. Tempo can be used with open-source tracing protocols such as [Jaeger](https://www.jaegertracing.io/docs/1.50/), [Zipkin](https://zipkin.io/), and [OpenTelemetry](https://opentelemetry.io/docs/what-is-opentelemetry/). - During the beta of the traces feature, only the [OpenTelemetry](https://opentelemetry.io/docs/what-is-opentelemetry/) HTTP push path is supported. Scaleway is working on implementing the [Open Telemetry gRPC](https://opentelemetry.io/docs/specs/semconv/rpc/grpc/), [Zipkin](https://zipkin.io/) and [Jaeger](https://www.jaegertracing.io/docs/1.50/) protocols. + Only the [OpenTelemetry](https://opentelemetry.io/docs/what-is-opentelemetry/) HTTP push path is supported. Scaleway is working on implementing the [Open Telemetry gRPC](https://opentelemetry.io/docs/specs/semconv/rpc/grpc/), [Zipkin](https://zipkin.io/) and [Jaeger](https://www.jaegertracing.io/docs/1.50/) protocols. ## Time series @@ -197,10 +194,6 @@ Tokens are regionalized secret keys that allow you to authenticate against your - **Rules**: allow you to configure alerting and recording rules. - **Alerts**: allow you to set up the alert manager. -## TraceQL - -[TraceQL](https://grafana.com/docs/tempo/latest/traceql/) is Grafana Tempo's query language designed for searching and extracting traces. - ## Traces Traces are detailed records of your **requests' behavior**, as they move through distributed systems such as microservices and containers. diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index d492e19f15..19475e4587 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -5,7 +5,7 @@ meta: content: h1: Cockpit FAQ dates: - validation: 2024-11-25 + validation: 2025-03-27 category: observability productIcon: CockpitProductIcon --- @@ -27,7 +27,7 @@ Refer to the [dedicated documentation page](/cockpit/reference-content/cockpit-l Using Cockpit with your Scaleway 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](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) or custom data - will be free of charge. +The retention period you set for your data - whether from [Scaleway resources integrated with Cockpit](/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. From 616d5b17384d8b39542bff0a287cf822e2f60266 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Wed, 2 Apr 2025 18:05:05 +0200 Subject: [PATCH 02/13] docs(cpt): retention pricing updates --- macros/cockpit/plan-deprecation.mdx | 12 ++++-- pages/cockpit/concepts.mdx | 24 ++--------- pages/cockpit/faq.mdx | 42 +++++++++++++++---- .../cockpit/how-to/change-data-retention.mdx | 16 +++---- 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index 45617ae8dd..f35a8bbbcc 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -4,9 +4,13 @@ macro: cockpit-plan-deprecation - **Cockpit pricing plans were deprecated on January 1st 2025**

+ **Pricing update for Cockpit data custom retention**

- The [retention](/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](/cockpit/how-to/change-data-retention/) in the dedicated documentation. + On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. + On May 1st, 2025, this feature reaches general availability and becomes billable. + + **Logs and traces**: free retention for 7 days, then charged €0.002/GB/day + **Metrics**: free retention for 31 days, then charged €0.0002/10 million samples/day + + Refer to the [dedicated documentation](/cockpit/how-to/change-data-retention/) to adjust retention settings and learn more about new pricing. diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index f01f1de3e4..edccee48d3 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -12,10 +12,6 @@ categories: - observability --- -## Active series - -Active series refer to [time series](#time-series) for which the latest [samples](#samples) received by your Cockpit are less than 10 minutes old. - ## Agent An agent is a software component that runs on your systems to gather [data types](#data-types) from the host system or applications running on it. The agent then forwards this data to Cockpit for analysis and visualization. @@ -28,16 +24,12 @@ An agent is a software component that runs on your systems to gather [data types Alerting detects complex conditions defined by a rule and keeps you aware of issues in your environments. When a condition defined by a rule is met, the rule tracks it as an alert and responds by triggering one or more actions. - - The **Grafana alert manager** on the Grafana interface is inactive. We strongly recommend that you select the **Scaleway Alerting** alert manager if you want to manage your alerts using Grafana. - - ## Alert manager Scaleway's regionalized alert manager allows you to manage and respond to alerts according to the regions you have enabled it in. It handles alerts sent when the alerting rules we run are firing. The alert manager triggers alerts (e.g. emails or texts) if a criteria you have configured on your applications' metrics and logs is activated. - The **Grafana alert manager** on the Grafana interface is inactive. We strongly recommend that you select the **Scaleway Alerting** alert manager if you want to manage your alerts using Grafana. + Scaleway does not support the **Grafana alert manager** on the Grafana interface. You must select the **Scaleway Alerting** alert manager if you want to manage your alerts using Grafana. ## Alerting rules @@ -134,18 +126,10 @@ You can push metrics with any Prometheus-compatible agent such as [Prometheus](h A preconfigured dashboard is a set of one or more panels that Scaleway sets up and updates for you to visualize the metrics and logs associated with your Scaleway products. -## Prometheus Remote Write - -`Prometheus Remote Write` is the protocol used to push your metrics to your Cockpit's metrics' endpoint. - ## Receivers Receivers are hubs consisting of contact points. You can associate one or several alerts with one or more receivers. This allows you to diversify your alerts. -## Recording rules - -Recording rules allow you to precompute frequently needed or computationally expensive expressions and save their results as a new set of time series. - ## Region A region is the geographical area in which your Cockpit data is stored. They are duplicated on all Availability Zones of the selected regions (Paris, Amsterdam, or Warsaw). @@ -177,15 +161,13 @@ Refer to the dedicated documentation page to find out which resources are integr Tempo is [Grafana's open source](https://grafana.com/docs/tempo/latest/) tracing tool that allows you to search for traces, generate metrics from them, and link your tracing data with logs and metrics. Tempo can be used with open-source tracing protocols such as [Jaeger](https://www.jaegertracing.io/docs/1.50/), [Zipkin](https://zipkin.io/), and [OpenTelemetry](https://opentelemetry.io/docs/what-is-opentelemetry/). - - Only the [OpenTelemetry](https://opentelemetry.io/docs/what-is-opentelemetry/) HTTP push path is supported. Scaleway is working on implementing the [Open Telemetry gRPC](https://opentelemetry.io/docs/specs/semconv/rpc/grpc/), [Zipkin](https://zipkin.io/) and [Jaeger](https://www.jaegertracing.io/docs/1.50/) protocols. - +Scaleway only supports the OpenTelemetry HTTP push path. ## Time series A time series is a sequence of numerical data points in successive order, that tracks the value of a parameter over time. Example of parameter: the disk usage of a machine hosting a database, expressed in percentage. -## Tokens +## Cockpit tokens Tokens are regionalized secret keys that allow you to authenticate against your Cockpit's endpoints (metrics, logs, alerts). You can generate new tokens and select token permissions such as: diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index 19475e4587..c15f1dfeeb 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -23,27 +23,35 @@ Cockpit integrates seamlessly with Scaleway’s ecosystem. It provides pre-built Refer to the [dedicated documentation page](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) for the whole list of Scaleway resources integrated with Cockpit. +## What is Scaleway data? + +Scaleway data is the observability data (metrics and/or logs) that is natively collected by all [Scaleway products integrated with Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit). + ## How am I billed for using Cockpit with my Scaleway data? -Using Cockpit with your Scaleway data is free of charge. +Scaleway data is collected and is available in Cockpit free of charge. Retention for Scaleway data is also free of charge as long as the retention period does not exceed the default one. The default retention period is 31 days for Scaleway metrics, and 7 days for Scaleway logs and traces. -The retention period you set for your data - whether from [Scaleway resources integrated with Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) or custom data - will be free of charge. +Your Scaleway data can be retained between 1 day and 5 years. You can change the retention period at any time. From May 1st 2025, any data retained beyond the default retention period will be charged based on the volume of data stored daily. 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. +## What is custom data? + +Custom data is any data (metrics, logs, and traces) that you push to Cockpit. It can be data collected from your applications hosted at Scaleway or elsewhere. + ## 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](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit. +Retention for custom data is free of charge as long as the retention period does not exceed the default one. The default retention period is 31 days for custom metrics, and 7 days for custom logs and traces. -During the beta of the retention period edition feature, the retention period you set for your custom data is free of charge. +Your custom data can be retained between 1 day and 5 years. You can change the retention period at any time. From May 1st 2025, any data retained beyond the default retention period will be charged based on the volume of data stored daily. You will not be charged for **querying** custom data. -Data ingestion is billed as follows: +Ingestion for custom data 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. +- Custom metrics are billed €0.15 per million samples of metrics ingested +- Custom logs are billed €0.35 per GB ingested +- Custom traces are billed €0.35 per GB ingested 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.** @@ -67,6 +75,24 @@ Here is an example of how you would be billed for sending 52 billion custom metr **Total:** €6.650 per month with volume discounts instead of €7.800 without volume discounts. +## How am I billed for increasing data retention period? + +Data ingested, whether it is Scaleway or custom data, is retained for free during: + +- 31 days for metrics +- 7 days for logs and traces + +From May 1st 2025, any data retained beyond these default values will be charged as follows based on the volume of data stored daily: + +- Metrics: 0.0002€/10 million samples/day +- Logs and traces: 0.002€/GB/day + +If you delete your data source or reduce its retention period below the default value, data will be deleted and you will no longer be charged for extended retention. + +For example, if you ingest an average of 2GB of logs daily and you increase your retention period to 10 days, retention will not be charged during the first 7 days after ingestion. You will only be charged for the remaining 3 days, then your data will be deleted. +Your estimated cost is `retention_cost` = 2 GB x (10 days - 7 days) x 0.002€ x 30 days = 0.36€/month +If you want to store your logs for 3 months, your estimated cost is: `retention_cost` = 2 GB x (90 days - 7 days) x 0.002€ x 30 days = 9.96€/month + ## Why are Cockpit pricing plans being deprecated? From January 1st 2025, Cockpit is transitioning away from fixed pricing plans to offer you more flexibility and granularity for managing data [retention](/cockpit/concepts/#retention). diff --git a/pages/cockpit/how-to/change-data-retention.mdx b/pages/cockpit/how-to/change-data-retention.mdx index f610f02c7f..47f1b24cfd 100644 --- a/pages/cockpit/how-to/change-data-retention.mdx +++ b/pages/cockpit/how-to/change-data-retention.mdx @@ -9,18 +9,15 @@ tags: cockpit data-retention retention-period edit-retention categories: - observability dates: - validation: 2024-11-25 + validation: 2025-04-02 posted: 2024-11-25 --- This page shows you how to change the [retention](/cockpit/concepts/#retention) period for your data sources. - - **Cockpit pricing plans were deprecated on January 1st 2025**

- - The [retention](/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).

+ On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. + On May 1st, 2025, this feature reaches general availability and becomes billable. Refer to the [Cockpit FAQ](/cockpit/faq/) to find out about new pricing. @@ -42,9 +39,6 @@ This page shows you how to change the [retention](/cockpit/concepts/#retention) - Reducing the retention period of a data source will permanently delete all observability data in that data source beyond the selected timeframe. This deletion is irreversible and takes effect a few minutes after the retention period is reduced, even if the retention period is later increased. - Find out about the [retention periods available for each data source type](/cockpit/concepts/#retention). + - Adjusting data retention beyond the default period is billed based on the volume of data stored. Check the [Cockpit FAQ](/cockpit/faq/) for information on data retention billing. -6. Click **Edit retention period** to confirm. - - - Adjusting data retention is free of charge during Beta. - \ No newline at end of file +6. Click **Edit retention period** to confirm. \ No newline at end of file From 56db5c7750c6fc4383743ea25970a13cb5fb9d99 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Thu, 3 Apr 2025 17:32:44 +0200 Subject: [PATCH 03/13] docs(cpt): add more info --- macros/cockpit/plan-deprecation.mdx | 11 +++-- pages/cockpit/concepts.mdx | 4 +- pages/cockpit/faq.mdx | 46 +++++++++++-------- .../cockpit/how-to/change-data-retention.mdx | 12 ++--- 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index f35a8bbbcc..afa252b275 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -2,15 +2,18 @@ macro: cockpit-plan-deprecation --- - + **Pricing update for Cockpit data custom retention**

On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. - On May 1st, 2025, this feature reaches general availability and becomes billable. + On May 1st, 2025, this feature reaches general availability and **becomes billable**.

+ + **Logs and traces**: free retention for 7 days, then charged €0.002/GB/days - **Logs and traces**: free retention for 7 days, then charged €0.002/GB/day **Metrics**: free retention for 31 days, then charged €0.0002/10 million samples/day - Refer to the [dedicated documentation](/cockpit/how-to/change-data-retention/) to adjust retention settings and learn more about new pricing. + Custom data ingestion remains billable at [the current pricing](/cockpit/faq/#how-am-i-billed-for-using-cockpit-with-custom-data). + + Refer to the [dedicated documentation](/cockpit/how-to/change-data-retention/) to adjust retention settings. diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index edccee48d3..6653330dca 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -7,7 +7,7 @@ content: paragraph: Explore Scaleway Observability concepts including metrics, logs, and alerts management through Cockpit. Learn about agents, alerting rules, Grafana integration, and data types for comprehensive monitoring. tags: observability alert-manager contact-points endpoint grafana loki logql prometheus promql tokens dates: - validation: 2024-12-26 + validation: 2025-04-03 categories: - observability --- @@ -138,7 +138,7 @@ You can decide in which region to enable the [alert manager](#alert-manager) and ## Retention -Retention or data retention refers to the duration for which data, such as metrics, logs, or traces, is stored before being automatically deleted. Retention allows you to manage the lifecycle of your Scaleway and custom data by selecting storage periods that align with your needs. +Retention or data retention refers to the duration for which the data (metrics, logs, and traces) you push to Cockpit is stored before being automatically deleted. Retention allows you to manage the lifecycle of your Scaleway and custom data by selecting storage periods that align with your needs. The minimum and maximum retention periods for each data source type are as follows: diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index c15f1dfeeb..8e2aea58c2 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -29,23 +29,21 @@ Scaleway data is the observability data (metrics and/or logs) that is natively c ## How am I billed for using Cockpit with my Scaleway data? -Scaleway data is collected and is available in Cockpit free of charge. Retention for Scaleway data is also free of charge as long as the retention period does not exceed the default one. The default retention period is 31 days for Scaleway metrics, and 7 days for Scaleway logs and traces. +Scaleway data is collected and available in Cockpit for free. Retention is also free as long as it stays within the default period: 31 days for metrics and 7 days for logs and traces. -Your Scaleway data can be retained between 1 day and 5 years. You can change the retention period at any time. From May 1st 2025, any data retained beyond the default retention period will be charged based on the volume of data stored daily. +You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day to 5 years. However, starting May 1, 2025, data stored beyond the default period will incur charges based on daily storage volume. -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. +Sending custom data to Cockpit (such as data from non-integrated Scaleway resources or external sources) also incurs additional costs. ## What is custom data? -Custom data is any data (metrics, logs, and traces) that you push to Cockpit. It can be data collected from your applications hosted at Scaleway or elsewhere. +Custom data refers to any metrics, logs, or traces that you manually push to Cockpit. This can include data from applications hosted at Scaleway or any other platform. ## How am I billed for using Cockpit with custom data? -Retention for custom data is free of charge as long as the retention period does not exceed the default one. The default retention period is 31 days for custom metrics, and 7 days for custom logs and traces. +Retention of custom data is free within the default period: 31 days for custom metrics and 7 days for custom logs and traces. You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day to 5 years. However, starting May 1, 2025, data stored beyond the default period will be charged based on daily storage volume. -Your custom data can be retained between 1 day and 5 years. You can change the retention period at any time. From May 1st 2025, any data retained beyond the default retention period will be charged based on the volume of data stored daily. - -You will not be charged for **querying** custom data. +Querying custom data is always free. Ingestion for custom data is billed as follows: @@ -67,7 +65,6 @@ Scaleway applies volume discounts to bill custom metrics. This means that the mo Here is an example of how you would be billed for **sending 52 billion custom metrics samples per month**: -Here is an example of how you would be billed for sending 52 billion custom metrics samples per month: - 10 billion samples at €0.15 per million samples: €1.500 - 15 billion samples at €0.13 per million samples: €1.950 - 25 billion samples at €0.12 per million samples: €3.000 @@ -77,21 +74,32 @@ Here is an example of how you would be billed for sending 52 billion custom metr ## How am I billed for increasing data retention period? -Data ingested, whether it is Scaleway or custom data, is retained for free during: - -- 31 days for metrics -- 7 days for logs and traces +All ingested data, whether from Scaleway or custom sources, is retained for free within the default periods: +- **Metrics:** 31 days +- **Logs and traces:** 7 days -From May 1st 2025, any data retained beyond these default values will be charged as follows based on the volume of data stored daily: +Starting May 1, 2025, data retained beyond these periods will be charged based on daily storage volume: -- Metrics: 0.0002€/10 million samples/day -- Logs and traces: 0.002€/GB/day +- **Metrics:** €0.0002 per 10 million samples/day +- **Logs and traces:** €0.002 per GB/day If you delete your data source or reduce its retention period below the default value, data will be deleted and you will no longer be charged for extended retention. -For example, if you ingest an average of 2GB of logs daily and you increase your retention period to 10 days, retention will not be charged during the first 7 days after ingestion. You will only be charged for the remaining 3 days, then your data will be deleted. -Your estimated cost is `retention_cost` = 2 GB x (10 days - 7 days) x 0.002€ x 30 days = 0.36€/month -If you want to store your logs for 3 months, your estimated cost is: `retention_cost` = 2 GB x (90 days - 7 days) x 0.002€ x 30 days = 9.96€/month +**Custom data ingestion remains billable at the current pricing**. + + + ## See custom retention pricing examples + ### For 10 days of retention + If you ingest an average of **2GB of logs daily** and increase retention to **10 days**. Retention is free for the first **7 days**, so you are only charged for the extra **3 days**: + + **Monthly estimated cost:** + `retention_cost` = 2 GB x (10 - 7) x 0.002€ x 30 days = 0.36€/month + + ### For 90 days of retention + If you extend retention to **90 days**, you are charged for the extra **83 days** beyond the free period: + **Monthly estimated cost:** + `retention_cost` = 2 GB x (90 - 7) x 0.002€ x 30 days = 9.96€/month + ## Why are Cockpit pricing plans being deprecated? diff --git a/pages/cockpit/how-to/change-data-retention.mdx b/pages/cockpit/how-to/change-data-retention.mdx index 47f1b24cfd..4ac7a88644 100644 --- a/pages/cockpit/how-to/change-data-retention.mdx +++ b/pages/cockpit/how-to/change-data-retention.mdx @@ -13,7 +13,7 @@ dates: posted: 2024-11-25 --- -This page shows you how to change the [retention](/cockpit/concepts/#retention) period for your data sources. +This page shows you how to change the [retention](/cockpit/concepts/#retention) period for your data sources. Refer to the Cockpit FAQ for detailed information on custom retention pricing. On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. @@ -24,6 +24,7 @@ This page shows you how to change the [retention](/cockpit/concepts/#retention) - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/iam/concepts/#owner) status or [IAM permissions](/iam/concepts/#permission) allowing you to perform actions in the intended Organization + - [Created](/cockpit/how-to/create-external-data-sources) Scaleway or custom data sources 1. Click **Cockpit** in the Observability section of the [console](https://console.scaleway.com/) side menu. The **Cockpit** overview page displays. 2. Click the **Data sources** tab. @@ -32,13 +33,12 @@ This page shows you how to change the [retention](/cockpit/concepts/#retention) You can change the retention period for both Scaleway and custom data sources. Each data source can have a different retention period. 4. Click **More info**. The **Data source information** page displays. -5. Click the **Edit retention** button and drag the slider to adjust the retention period: - - Drag the slider to the **right to increase** your retention period, or - - Drag the slider to the **left to decrease** the retention period. - +5. Click the **Edit retention** button and: +6. Enter the number of days, months or years you want your retention period to last +7. Select either `days`, `months`, or `years` in the drop-down. - Reducing the retention period of a data source will permanently delete all observability data in that data source beyond the selected timeframe. This deletion is irreversible and takes effect a few minutes after the retention period is reduced, even if the retention period is later increased. - Find out about the [retention periods available for each data source type](/cockpit/concepts/#retention). - Adjusting data retention beyond the default period is billed based on the volume of data stored. Check the [Cockpit FAQ](/cockpit/faq/) for information on data retention billing. -6. Click **Edit retention period** to confirm. \ No newline at end of file +8. Click **Edit retention period** to confirm. \ No newline at end of file From 8006f1d4f134fb8bea24c7c77290145f1ee2f965 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Fri, 4 Apr 2025 16:43:39 +0200 Subject: [PATCH 04/13] docs(cpt): add more information --- macros/cockpit/plan-deprecation.mdx | 6 ++--- pages/cockpit/faq.mdx | 2 +- .../cockpit/how-to/change-data-retention.mdx | 24 ++++++++++++------- .../how-to/create-external-data-sources.mdx | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/macros/cockpit/plan-deprecation.mdx b/macros/cockpit/plan-deprecation.mdx index afa252b275..ad4809a827 100644 --- a/macros/cockpit/plan-deprecation.mdx +++ b/macros/cockpit/plan-deprecation.mdx @@ -4,16 +4,16 @@ macro: cockpit-plan-deprecation - **Pricing update for Cockpit data custom retention**

+ **Pricing update for Cockpit custom retention**

On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. On May 1st, 2025, this feature reaches general availability and **becomes billable**.

- **Logs and traces**: free retention for 7 days, then charged €0.002/GB/days + **Logs and traces**: free retention for 7 days, then charged €0.002/GB/day **Metrics**: free retention for 31 days, then charged €0.0002/10 million samples/day - Custom data ingestion remains billable at [the current pricing](/cockpit/faq/#how-am-i-billed-for-using-cockpit-with-custom-data). + Ingestion of custom data remains billable at [the current pricing](/cockpit/faq/#how-am-i-billed-for-using-cockpit-with-custom-data). Refer to the [dedicated documentation](/cockpit/how-to/change-data-retention/) to adjust retention settings. diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index 8e2aea58c2..96921ef703 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -78,7 +78,7 @@ All ingested data, whether from Scaleway or custom sources, is retained for free - **Metrics:** 31 days - **Logs and traces:** 7 days -Starting May 1, 2025, data retained beyond these periods will be charged based on daily storage volume: +**Starting May 1, 2025, data retained beyond these periods will be charged** based on daily storage volume: - **Metrics:** €0.0002 per 10 million samples/day - **Logs and traces:** €0.002 per GB/day diff --git a/pages/cockpit/how-to/change-data-retention.mdx b/pages/cockpit/how-to/change-data-retention.mdx index 4ac7a88644..595203bdb4 100644 --- a/pages/cockpit/how-to/change-data-retention.mdx +++ b/pages/cockpit/how-to/change-data-retention.mdx @@ -15,9 +15,17 @@ dates: This page shows you how to change the [retention](/cockpit/concepts/#retention) period for your data sources. Refer to the Cockpit FAQ for detailed information on custom retention pricing. - - On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. - On May 1st, 2025, this feature reaches general availability and becomes billable. Refer to the [Cockpit FAQ](/cockpit/faq/) to find out about new pricing. + + **Pricing update for Cockpit custom retention**

+ + On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta. + On May 1st, 2025, this feature reaches general availability and **becomes billable**.

+ + **Logs and traces**: free retention for 7 days, then charged €0.002/GB/day + + **Metrics**: free retention for 31 days, then charged €0.0002/10 million samples/day + + Ingestion of custom data remains billable at [the current pricing](/cockpit/faq/#how-am-i-billed-for-using-cockpit-with-custom-data). @@ -33,12 +41,12 @@ This page shows you how to change the [retention](/cockpit/concepts/#retention) You can change the retention period for both Scaleway and custom data sources. Each data source can have a different retention period. 4. Click **More info**. The **Data source information** page displays. -5. Click the **Edit retention** button and: -6. Enter the number of days, months or years you want your retention period to last -7. Select either `days`, `months`, or `years` in the drop-down. +5. Click the **Edit retention** button. +6. Drag the slider to adjust the [retention period](/cockpit/concepts/#retention) for your data source: + - Drag the slider to the **right to increase** your retention period, or + - Drag the slider to the **left to decrease** the retention period. - Reducing the retention period of a data source will permanently delete all observability data in that data source beyond the selected timeframe. This deletion is irreversible and takes effect a few minutes after the retention period is reduced, even if the retention period is later increased. - Find out about the [retention periods available for each data source type](/cockpit/concepts/#retention). - - Adjusting data retention beyond the default period is billed based on the volume of data stored. Check the [Cockpit FAQ](/cockpit/faq/) for information on data retention billing. -8. Click **Edit retention period** to confirm. \ No newline at end of file +7. Click **Edit retention period** to confirm. \ No newline at end of file diff --git a/pages/cockpit/how-to/create-external-data-sources.mdx b/pages/cockpit/how-to/create-external-data-sources.mdx index 5524c365c8..f0e2dc6a65 100644 --- a/pages/cockpit/how-to/create-external-data-sources.mdx +++ b/pages/cockpit/how-to/create-external-data-sources.mdx @@ -8,7 +8,7 @@ content: categories: - observability dates: - validation: 2025-03-26 + validation: 2025-04-04 posted: 2024-04-05 --- From 6a2e272c8d2860a2b32807001fec05b797f15553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9da?= <87707325+nerda-codes@users.noreply.github.com> Date: Fri, 4 Apr 2025 17:04:38 +0200 Subject: [PATCH 05/13] Update pages/cockpit/how-to/change-data-retention.mdx --- pages/cockpit/how-to/change-data-retention.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/cockpit/how-to/change-data-retention.mdx b/pages/cockpit/how-to/change-data-retention.mdx index 595203bdb4..c015d2409a 100644 --- a/pages/cockpit/how-to/change-data-retention.mdx +++ b/pages/cockpit/how-to/change-data-retention.mdx @@ -13,7 +13,7 @@ dates: posted: 2024-11-25 --- -This page shows you how to change the [retention](/cockpit/concepts/#retention) period for your data sources. Refer to the Cockpit FAQ for detailed information on custom retention pricing. +This page shows you how to change the [retention](/cockpit/concepts/#retention) period for your data sources. Refer to the [Cockpit FAQ](/cockpit/faq/) for detailed information on pricing. **Pricing update for Cockpit custom retention**

From d831a34f866f3fec6d6cebc73efcac467061f4d7 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 10:46:55 +0200 Subject: [PATCH 06/13] docs(cpt): fix --- pages/cockpit/concepts.mdx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index 6653330dca..75ca24a7c2 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -145,9 +145,11 @@ The minimum and maximum retention periods for each data source type are as follo | Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | |------------------------------------------------|----------------------------------------------|------------------------------------------------|-----------------------------------------------| | Minimum retention period: 1 day | Minimum retention period: 1 day | Minimum retention period: 31 days | Minimum retention period: 1 day | -| Maximum retention period: 1825 days (5 years) | Maximum retention period: 1825 days (5 years)| Maximum retention period: 1825 days (5 years) | Maximum retention period: 1825 days (5 years) | +| Maximum retention period: 365 days (1 year) | Maximum retention period: 365 days (1 year)| Maximum retention period: 365 days (1 year) | Maximum retention period: 365 days (1 year) | | Default retention period: 31 days | Default retention period: 7 days | Default retention period: 31 days | Default retention period: 7 days | +**Starting May 1, 2025, the maximum retention period for custom and Scaleway metrics, logs and traces will be of 1825 days (5 years)**. The information on the table above will be updated accordingly. + ## Samples A sample is a unique measuring point on a time series. From df2c7b976674e6961bbee160b3c933ddd3bd0833 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 14:59:51 +0200 Subject: [PATCH 07/13] docs(cpt): feedback sophie --- pages/cockpit/concepts.mdx | 16 +++++++------- pages/cockpit/faq.mdx | 22 +++++++++---------- .../cockpit/how-to/change-data-retention.mdx | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index 75ca24a7c2..96fdac409e 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -138,15 +138,15 @@ You can decide in which region to enable the [alert manager](#alert-manager) and ## Retention -Retention or data retention refers to the duration for which the data (metrics, logs, and traces) you push to Cockpit is stored before being automatically deleted. Retention allows you to manage the lifecycle of your Scaleway and custom data by selecting storage periods that align with your needs. +Retention or data retention refers to the duration for which the data (metrics, logs, and traces) pushed to Cockpit (by Scaleway products or yourself) is stored before being automatically deleted. Retention allows you to manage the lifecycle of your Scaleway and custom data by selecting storage periods that align with your needs. The minimum and maximum retention periods for each data source type are as follows: -| Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | -|------------------------------------------------|----------------------------------------------|------------------------------------------------|-----------------------------------------------| -| Minimum retention period: 1 day | Minimum retention period: 1 day | Minimum retention period: 31 days | Minimum retention period: 1 day | -| Maximum retention period: 365 days (1 year) | Maximum retention period: 365 days (1 year)| Maximum retention period: 365 days (1 year) | Maximum retention period: 365 days (1 year) | -| Default retention period: 31 days | Default retention period: 7 days | Default retention period: 31 days | Default retention period: 7 days | +| Retention period | Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | +|-------------------|-------------------|--------------------|-------------------|----------------------| +| Minimum retention | 1 day | 1 days | 31 days | 1 day | +| Maximum retention | 365 days (1 year) | 365 days (1 year) | 365 days (1 year) | 365 days (1 year) | +| Default retention | 31 days | 7 days | 31 days | 7 days | **Starting May 1, 2025, the maximum retention period for custom and Scaleway metrics, logs and traces will be of 1825 days (5 years)**. The information on the table above will be updated accordingly. @@ -157,7 +157,7 @@ A sample is a unique measuring point on a time series. ## Scaleway data Scaleway data is the observability data (metrics and/or logs) that is natively collected by all Scaleway products, integrated with Cockpit. -Refer to the dedicated documentation page to find out which resources are integrated with Cockpit. +Refer to the [dedicated documentation page](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit. ## Tempo @@ -171,7 +171,7 @@ A time series is a sequence of numerical data points in successive order, that t ## Cockpit tokens -Tokens are regionalized secret keys that allow you to authenticate against your Cockpit's endpoints (metrics, logs, alerts). You can generate new tokens and select token permissions such as: +Tokens are regionalized secret keys that allow you to authenticate against the endpoints of your Cockpit's datasources (metrics, logs, alerts). You can generate new tokens and select token permissions such as: - **Push**: allows you to send your metrics, logs, and traces to your Cockpit. - **Query**: allows you to fetch your metrics, logs, and traces from your Cockpit. diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index 96921ef703..d98a5516d9 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -23,25 +23,27 @@ Cockpit integrates seamlessly with Scaleway’s ecosystem. It provides pre-built Refer to the [dedicated documentation page](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) for the whole list of Scaleway resources integrated with Cockpit. -## What is Scaleway data? +## What is the difference between Scaleway and custom data? + +### Scaleway data Scaleway data is the observability data (metrics and/or logs) that is natively collected by all [Scaleway products integrated with Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit). -## How am I billed for using Cockpit with my Scaleway data? +### Custom data -Scaleway data is collected and available in Cockpit for free. Retention is also free as long as it stays within the default period: 31 days for metrics and 7 days for logs and traces. - -You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day to 5 years. However, starting May 1, 2025, data stored beyond the default period will incur charges based on daily storage volume. +Custom data refers to any metrics, logs, or traces that you manually push to Cockpit. This can include data from applications hosted at Scaleway or any other platform. -Sending custom data to Cockpit (such as data from non-integrated Scaleway resources or external sources) also incurs additional costs. +## How am I billed for using Cockpit with my Scaleway data? -## What is custom data? +Scaleway data is collected and available in Cockpit for free. Retention is also free as long as it stays within the default period: 31 days for metrics and 7 days for logs and traces. -Custom data refers to any metrics, logs, or traces that you manually push to Cockpit. This can include data from applications hosted at Scaleway or any other platform. +You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day (for logs and traces) or 31 days (for metrics) to 1 year. Refer to the [dedicated documentation](/cockpit/concepts/#retention) for more information on available retention periods. However, starting May 1, 2025, data stored beyond the default period will incur charges based on daily storage volume. ## How am I billed for using Cockpit with custom data? -Retention of custom data is free within the default period: 31 days for custom metrics and 7 days for custom logs and traces. You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day to 5 years. However, starting May 1, 2025, data stored beyond the default period will be charged based on daily storage volume. +Sending custom data to Cockpit such as data from non-integrated Scaleway resources or external sources incurs additional costs. + +Retention of custom data is free within the default period: 31 days for custom metrics and 7 days for custom logs and traces. You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day (for logs and traces) and 31 days (for metrics) to 1 year. However, starting May 1, 2025, data stored beyond the default period will be charged based on daily storage volume. Querying custom data is always free. @@ -85,8 +87,6 @@ All ingested data, whether from Scaleway or custom sources, is retained for free If you delete your data source or reduce its retention period below the default value, data will be deleted and you will no longer be charged for extended retention. -**Custom data ingestion remains billable at the current pricing**. - ## See custom retention pricing examples ### For 10 days of retention diff --git a/pages/cockpit/how-to/change-data-retention.mdx b/pages/cockpit/how-to/change-data-retention.mdx index c015d2409a..88c72bac54 100644 --- a/pages/cockpit/how-to/change-data-retention.mdx +++ b/pages/cockpit/how-to/change-data-retention.mdx @@ -32,7 +32,7 @@ This page shows you how to change the [retention](/cockpit/concepts/#retention) - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/iam/concepts/#owner) status or [IAM permissions](/iam/concepts/#permission) allowing you to perform actions in the intended Organization - - [Created](/cockpit/how-to/create-external-data-sources) Scaleway or custom data sources + - Created [Scaleway resources integrated with Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) or [created](/cockpit/how-to/create-external-data-sources) custom data sources 1. Click **Cockpit** in the Observability section of the [console](https://console.scaleway.com/) side menu. The **Cockpit** overview page displays. 2. Click the **Data sources** tab. From 82383111daf6c6be9bac50d85f165f56903c9f47 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 15:03:52 +0200 Subject: [PATCH 08/13] docs(cpt): fix links --- ...2024-05-24-cockpit-added-cockpit-available-in-all-region.mdx | 2 +- pages/cockpit/how-to/create-token.mdx | 2 +- tutorials/pushing-metrics-logs-from-scw-instance/index.mdx | 2 +- tutorials/use-cockpit-with-terraform/index.mdx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog/may2024/2024-05-24-cockpit-added-cockpit-available-in-all-region.mdx b/changelog/may2024/2024-05-24-cockpit-added-cockpit-available-in-all-region.mdx index 2f9bbc4f83..abdb060da7 100644 --- a/changelog/may2024/2024-05-24-cockpit-added-cockpit-available-in-all-region.mdx +++ b/changelog/may2024/2024-05-24-cockpit-added-cockpit-available-in-all-region.mdx @@ -9,5 +9,5 @@ category: observability product: cockpit --- -Cockpit is now available in all three Scaleway regions: Paris, Amsterdam, and Warsaw. From the Scaleway console, you can now decide in which region to enable the [alert manager](/cockpit/concepts/#alert-manager) and your [preconfigured alerts](/cockpit/concepts/#preconfigured-alerts). You can also choose the regions in which to create your [data types](/cockpit/concepts/#data-types), [data sources](/cockpit/concepts/#data-sources), and [tokens](/cockpit/concepts/#tokens). +Cockpit is now available in all three Scaleway regions: Paris, Amsterdam, and Warsaw. From the Scaleway console, you can now decide in which region to enable the [alert manager](/cockpit/concepts/#alert-manager) and your [preconfigured alerts](/cockpit/concepts/#preconfigured-alerts). You can also choose the regions in which to create your [data types](/cockpit/concepts/#data-types), [data sources](/cockpit/concepts/#data-sources), and [tokens](/cockpit/concepts/#cockpit-tokens). diff --git a/pages/cockpit/how-to/create-token.mdx b/pages/cockpit/how-to/create-token.mdx index af7ef0bae7..fcbd2a8c2f 100644 --- a/pages/cockpit/how-to/create-token.mdx +++ b/pages/cockpit/how-to/create-token.mdx @@ -13,7 +13,7 @@ dates: posted: 2022-10-31 --- -This page shows you how to create [tokens](/cockpit/concepts/#tokens), to grant other cloud providers’ services and platforms access to your [Cockpit](/cockpit/concepts/#cockpit). +This page shows you how to create [tokens](/cockpit/concepts/#cockpit-tokens), to grant other cloud providers’ services and platforms access to your [Cockpit](/cockpit/concepts/#cockpit). diff --git a/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx b/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx index d715e1c3e5..12edc8eb2f 100644 --- a/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx +++ b/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx @@ -51,7 +51,7 @@ The `tuto-cockpit-instance` directory contains a `workshop` folder with several - `nginx.conf` specifies server settings - `run.sh` executes the Grafana agent with the specified configuration file (agent.yaml). -The only file we will be editing in this tutorial is the `agent.yaml` file to add your Cockpit [token](/cockpit/concepts/#tokens). +The only file we will be editing in this tutorial is the `agent.yaml` file to add your Cockpit [token](/cockpit/concepts/#cockpit-tokens). 1. Open another terminal and type the following command to clone our `tuto-cockpit-instance` directory on your local machine: diff --git a/tutorials/use-cockpit-with-terraform/index.mdx b/tutorials/use-cockpit-with-terraform/index.mdx index c569cd77a1..b51aa2d370 100644 --- a/tutorials/use-cockpit-with-terraform/index.mdx +++ b/tutorials/use-cockpit-with-terraform/index.mdx @@ -17,7 +17,7 @@ In this tutorial, you will learn how to get started with Cockpit using a Terrafo - A [Grafana user](/cockpit/concepts/#grafana-users) - A folder in the Grafana user interface -- A Cockpit [token](/cockpit/concepts/#tokens) with permission to query and push metrics +- A Cockpit [token](/cockpit/concepts/#cockpit-tokens) with permission to query and push metrics - A metric [data source](/cockpit/concepts/#data-sources) From 35748bc4c6b551fa03045adfa2a4a7c5fd3e80e1 Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 15:07:48 +0200 Subject: [PATCH 09/13] docs(cpt): fix concept --- pages/cockpit/concepts.mdx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index 96fdac409e..0d20070ebc 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -44,6 +44,15 @@ Alerting rules allow you to define criteria that determine whether an alert is t A Cockpit is an instance of the Observability product that stores metrics, logs, and traces and provides a dedicated dashboarding system on Grafana to visualize them. A Scaleway Project can have only one Cockpit, which is automatically activated when you are using [Scaleway resources that are integrated into Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit). +## Cockpit tokens + +Tokens are regionalized secret keys that allow you to authenticate against the endpoints of your Cockpit's datasources (metrics, logs, alerts). You can generate new tokens and select token permissions such as: + +- **Push**: allows you to send your metrics, logs, and traces to your Cockpit. +- **Query**: allows you to fetch your metrics, logs, and traces from your Cockpit. +- **Rules**: allow you to configure alerting and recording rules. +- **Alerts**: allow you to set up the alert manager. + ## Contact points Contact points define who is notified when an alert fires, according to the region in which you have added them. Contact points include emails, Slack, on-call systems, and texts. When an alert fires, all contact points are notified. @@ -169,15 +178,6 @@ Scaleway only supports the OpenTelemetry HTTP push path. A time series is a sequence of numerical data points in successive order, that tracks the value of a parameter over time. Example of parameter: the disk usage of a machine hosting a database, expressed in percentage. -## Cockpit tokens - -Tokens are regionalized secret keys that allow you to authenticate against the endpoints of your Cockpit's datasources (metrics, logs, alerts). You can generate new tokens and select token permissions such as: - -- **Push**: allows you to send your metrics, logs, and traces to your Cockpit. -- **Query**: allows you to fetch your metrics, logs, and traces from your Cockpit. -- **Rules**: allow you to configure alerting and recording rules. -- **Alerts**: allow you to set up the alert manager. - ## Traces Traces are detailed records of your **requests' behavior**, as they move through distributed systems such as microservices and containers. From 6f9a9b646fe2e82a9a061df35a05cbec3c0dda2c Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 15:30:59 +0200 Subject: [PATCH 10/13] docs(cpt): add difference between scw and custom data --- pages/cockpit/faq.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index d98a5516d9..2c0dc5100f 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -25,6 +25,8 @@ Refer to the [dedicated documentation page](/cockpit/reference-content/cockpit-l ## What is the difference between Scaleway and custom data? +[Scaleway data](#scaleway-data) is collected automatically from Scaleway products, while [custom data](#custom-data) is manually pushed from your own sources. + ### Scaleway data Scaleway data is the observability data (metrics and/or logs) that is natively collected by all [Scaleway products integrated with Cockpit](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit). From 2534c300d4f9afdc14b8e8c31a9036731c59847b Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 15:36:22 +0200 Subject: [PATCH 11/13] docs(cpt): fix data source typo --- pages/cockpit/concepts.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index 0d20070ebc..6e4e2a7575 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -46,7 +46,7 @@ A Cockpit is an instance of the Observability product that stores metrics, logs, ## Cockpit tokens -Tokens are regionalized secret keys that allow you to authenticate against the endpoints of your Cockpit's datasources (metrics, logs, alerts). You can generate new tokens and select token permissions such as: +Tokens are regionalized secret keys that allow you to authenticate against the endpoints of your Cockpit's [data sources](#data-sources) (metrics, logs, alerts). You can generate new tokens and select token permissions such as: - **Push**: allows you to send your metrics, logs, and traces to your Cockpit. - **Query**: allows you to fetch your metrics, logs, and traces from your Cockpit. From a6fe1310bfbead0de5456af768591603c68f49cb Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 15:38:55 +0200 Subject: [PATCH 12/13] docs(fix): typo --- pages/cockpit/concepts.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index 6e4e2a7575..549d768f83 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -154,7 +154,7 @@ The minimum and maximum retention periods for each data source type are as follo | Retention period | Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | |-------------------|-------------------|--------------------|-------------------|----------------------| | Minimum retention | 1 day | 1 days | 31 days | 1 day | -| Maximum retention | 365 days (1 year) | 365 days (1 year) | 365 days (1 year) | 365 days (1 year) | +| Maximum retention | 365 days (1 year) | 31 days | 365 days (1 year) | 31 days | | Default retention | 31 days | 7 days | 31 days | 7 days | **Starting May 1, 2025, the maximum retention period for custom and Scaleway metrics, logs and traces will be of 1825 days (5 years)**. The information on the table above will be updated accordingly. From b6c886d3ee843eed6ae9b94d0370081eea02f67d Mon Sep 17 00:00:00 2001 From: nerda-codes Date: Mon, 7 Apr 2025 16:40:28 +0200 Subject: [PATCH 13/13] fix(cpt): rm traces --- pages/cockpit/concepts.mdx | 2 +- pages/cockpit/faq.mdx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/cockpit/concepts.mdx b/pages/cockpit/concepts.mdx index 549d768f83..9911549258 100644 --- a/pages/cockpit/concepts.mdx +++ b/pages/cockpit/concepts.mdx @@ -151,7 +151,7 @@ Retention or data retention refers to the duration for which the data (metrics, The minimum and maximum retention periods for each data source type are as follows: -| Retention period | Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces | +| Retention period | Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs | |-------------------|-------------------|--------------------|-------------------|----------------------| | Minimum retention | 1 day | 1 days | 31 days | 1 day | | Maximum retention | 365 days (1 year) | 31 days | 365 days (1 year) | 31 days | diff --git a/pages/cockpit/faq.mdx b/pages/cockpit/faq.mdx index 2c0dc5100f..291207d206 100644 --- a/pages/cockpit/faq.mdx +++ b/pages/cockpit/faq.mdx @@ -37,9 +37,9 @@ Custom data refers to any metrics, logs, or traces that you manually push to Coc ## How am I billed for using Cockpit with my Scaleway data? -Scaleway data is collected and available in Cockpit for free. Retention is also free as long as it stays within the default period: 31 days for metrics and 7 days for logs and traces. +Scaleway data is collected and available in Cockpit for free. Retention is also free as long as it stays within the default period: 31 days for metrics and 7 days for logs. -You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day (for logs and traces) or 31 days (for metrics) to 1 year. Refer to the [dedicated documentation](/cockpit/concepts/#retention) for more information on available retention periods. However, starting May 1, 2025, data stored beyond the default period will incur charges based on daily storage volume. +You can [adjust the retention period](/cockpit/how-to/change-data-retention) from 1 day (for logs) or 31 days (for metrics) to 1 year. Refer to the [dedicated documentation](/cockpit/concepts/#retention) for more information on available retention periods. However, starting May 1, 2025, data stored beyond the default period will incur charges based on daily storage volume. ## How am I billed for using Cockpit with custom data?