Skip to content

Commit df2c7b9

Browse files
committed
docs(cpt): feedback sophie
1 parent d831a34 commit df2c7b9

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

pages/cockpit/concepts.mdx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ You can decide in which region to enable the [alert manager](#alert-manager) and
138138

139139
## Retention
140140

141-
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.
141+
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.
142142

143143
The minimum and maximum retention periods for each data source type are as follows:
144144

145-
| Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces |
146-
|------------------------------------------------|----------------------------------------------|------------------------------------------------|-----------------------------------------------|
147-
| Minimum retention period: 1 day | Minimum retention period: 1 day | Minimum retention period: 31 days | Minimum retention period: 1 day |
148-
| 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) |
149-
| Default retention period: 31 days | Default retention period: 7 days | Default retention period: 31 days | Default retention period: 7 days |
145+
| Retention period | Custom metrics | Custom logs/traces | Scaleway metrics | Scaleway logs/traces |
146+
|-------------------|-------------------|--------------------|-------------------|----------------------|
147+
| Minimum retention | 1 day | 1 days | 31 days | 1 day |
148+
| Maximum retention | 365 days (1 year) | 365 days (1 year) | 365 days (1 year) | 365 days (1 year) |
149+
| Default retention | 31 days | 7 days | 31 days | 7 days |
150150

151151
**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.
152152

@@ -157,7 +157,7 @@ A sample is a unique measuring point on a time series.
157157
## Scaleway data
158158

159159
Scaleway data is the observability data (metrics and/or logs) that is natively collected by all Scaleway products, integrated with Cockpit.
160-
Refer to the dedicated documentation page to find out which resources are integrated with Cockpit.
160+
Refer to the [dedicated documentation page](/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit.
161161

162162
## Tempo
163163

@@ -171,7 +171,7 @@ A time series is a sequence of numerical data points in successive order, that t
171171

172172
## Cockpit tokens
173173

174-
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:
174+
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:
175175

176176
- **Push**: allows you to send your metrics, logs, and traces to your Cockpit.
177177
- **Query**: allows you to fetch your metrics, logs, and traces from your Cockpit.

pages/cockpit/faq.mdx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,27 @@ Cockpit integrates seamlessly with Scaleway’s ecosystem. It provides pre-built
2323

2424
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.
2525

26-
## What is Scaleway data?
26+
## What is the difference between Scaleway and custom data?
27+
28+
### Scaleway data
2729

2830
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).
2931

30-
## How am I billed for using Cockpit with my Scaleway data?
32+
### Custom data
3133

32-
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.
33-
34-
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.
34+
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.
3535

36-
Sending custom data to Cockpit (such as data from non-integrated Scaleway resources or external sources) also incurs additional costs.
36+
## How am I billed for using Cockpit with my Scaleway data?
3737

38-
## What is custom data?
38+
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.
3939

40-
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.
40+
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.
4141

4242
## How am I billed for using Cockpit with custom data?
4343

44-
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.
44+
Sending custom data to Cockpit such as data from non-integrated Scaleway resources or external sources incurs additional costs.
45+
46+
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.
4547

4648
Querying custom data is always free.
4749

@@ -85,8 +87,6 @@ All ingested data, whether from Scaleway or custom sources, is retained for free
8587

8688
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.
8789

88-
**Custom data ingestion remains billable at the current pricing**.
89-
9090
<Concept>
9191
## See custom retention pricing examples
9292
### For 10 days of retention

pages/cockpit/how-to/change-data-retention.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This page shows you how to change the [retention](/cockpit/concepts/#retention)
3232

3333
- A Scaleway account logged into the [console](https://console.scaleway.com)
3434
- [Owner](/iam/concepts/#owner) status or [IAM permissions](/iam/concepts/#permission) allowing you to perform actions in the intended Organization
35-
- [Created](/cockpit/how-to/create-external-data-sources) Scaleway or custom data sources
35+
- 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
3636

3737
1. Click **Cockpit** in the Observability section of the [console](https://console.scaleway.com/) side menu. The **Cockpit** overview page displays.
3838
2. Click the **Data sources** tab.

0 commit comments

Comments
 (0)