Skip to content

Commit d80ed61

Browse files
authored
feat(cockpit): update wording (scaleway#1027)
1 parent 2e3e895 commit d80ed61

File tree

4 files changed

+30
-40
lines changed

4 files changed

+30
-40
lines changed

scaleway-async/scaleway_async/cockpit/v1/api.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -633,16 +633,13 @@ async def create_data_source(
633633
) -> DataSource:
634634
"""
635635
Create a data source.
636-
You must specify the data source type upon creation. Available data source types include:
637-
- metrics
638-
- logs
639-
- traces
636+
You must specify the data source name and type (metrics, logs, traces) upon creation.
640637
The name of the data source will then be used as reference to name the associated Grafana data source.
641638
:param name: Data source name.
642639
:param region: Region to target. If none is passed will use default region from the config.
643640
:param project_id: ID of the Project the data source belongs to.
644641
:param type_: Data source type.
645-
:param retention_days: Default values are 30 days for metrics, 7 days for logs and traces.
642+
:param retention_days: Default values are 31 days for metrics, 7 days for logs and traces.
646643
:return: :class:`DataSource <DataSource>`
647644
648645
Usage:
@@ -717,7 +714,7 @@ async def delete_data_source(
717714
) -> None:
718715
"""
719716
Delete a data source.
720-
Delete a given data source, specified by the data source ID. Note that deleting a data source is irreversible, and cannot be undone.
717+
Delete a given data source. Note that this action will permanently delete this data source and any data associated with it.
721718
:param data_source_id: ID of the data source to delete.
722719
:param region: Region to target. If none is passed will use default region from the config.
723720
@@ -755,14 +752,13 @@ async def list_data_sources(
755752
"""
756753
List data sources.
757754
Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
758-
You can list data sources by Project, type and origin.
759755
:param region: Region to target. If none is passed will use default region from the config.
760756
:param page: Page number to return, from the paginated results.
761757
:param page_size: Number of data sources to return per page.
762758
:param order_by: Sort order for data sources in the response.
763759
:param project_id: Project ID to filter for, only data sources from this Project will be returned.
764-
:param origin: Origin to filter for, only data sources with matching origin will be returned.
765-
:param types: Types to filter for, only data sources with matching types will be returned.
760+
:param origin: Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned.
761+
:param types: Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned.
766762
:return: :class:`ListDataSourcesResponse <ListDataSourcesResponse>`
767763
768764
Usage:
@@ -805,14 +801,13 @@ async def list_data_sources_all(
805801
"""
806802
List data sources.
807803
Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
808-
You can list data sources by Project, type and origin.
809804
:param region: Region to target. If none is passed will use default region from the config.
810805
:param page: Page number to return, from the paginated results.
811806
:param page_size: Number of data sources to return per page.
812807
:param order_by: Sort order for data sources in the response.
813808
:param project_id: Project ID to filter for, only data sources from this Project will be returned.
814-
:param origin: Origin to filter for, only data sources with matching origin will be returned.
815-
:param types: Types to filter for, only data sources with matching types will be returned.
809+
:param origin: Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned.
810+
:param types: Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned.
816811
:return: :class:`List[DataSource] <List[DataSource]>`
817812
818813
Usage:
@@ -846,11 +841,11 @@ async def update_data_source(
846841
) -> DataSource:
847842
"""
848843
Update a data source.
849-
Update a given data source name, specified by the data source ID.
844+
Update a given data source attributes (name and/or retention_days).
850845
:param data_source_id: ID of the data source to update.
851846
:param region: Region to target. If none is passed will use default region from the config.
852847
:param name: Updated name of the data source.
853-
:param retention_days: BETA - Duration for which the data will be retained in the data source.
848+
:param retention_days: Duration for which the data will be retained in the data source.
854849
:return: :class:`DataSource <DataSource>`
855850
856851
Usage:
@@ -892,7 +887,7 @@ async def get_usage_overview(
892887
) -> UsageOverview:
893888
"""
894889
Get data source usage overview.
895-
Retrieve the data source usage overview per type for the specified Project.
890+
Retrieve the volume of data ingested for each of your data sources in the specified project and region.
896891
:param region: Region to target. If none is passed will use default region from the config.
897892
:param project_id:
898893
:param interval:

scaleway-async/scaleway_async/cockpit/v1/types.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class DataSource:
292292

293293
retention_days: int
294294
"""
295-
BETA - Duration for which the data will be retained in the data source.
295+
Duration for which the data will be retained in the data source.
296296
"""
297297

298298
region: ScwRegion
@@ -986,7 +986,7 @@ class RegionalApiCreateDataSourceRequest:
986986

987987
retention_days: Optional[int]
988988
"""
989-
Default values are 30 days for metrics, 7 days for logs and traces.
989+
Default values are 31 days for metrics, 7 days for logs and traces.
990990
"""
991991

992992

@@ -1346,12 +1346,12 @@ class RegionalApiListDataSourcesRequest:
13461346

13471347
origin: Optional[DataSourceOrigin]
13481348
"""
1349-
Origin to filter for, only data sources with matching origin will be returned.
1349+
Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned.
13501350
"""
13511351

13521352
types: Optional[List[DataSourceType]]
13531353
"""
1354-
Types to filter for, only data sources with matching types will be returned.
1354+
Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned.
13551355
"""
13561356

13571357

@@ -1456,7 +1456,7 @@ class RegionalApiUpdateDataSourceRequest:
14561456

14571457
retention_days: Optional[int]
14581458
"""
1459-
BETA - Duration for which the data will be retained in the data source.
1459+
Duration for which the data will be retained in the data source.
14601460
"""
14611461

14621462

scaleway/scaleway/cockpit/v1/api.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -633,16 +633,13 @@ def create_data_source(
633633
) -> DataSource:
634634
"""
635635
Create a data source.
636-
You must specify the data source type upon creation. Available data source types include:
637-
- metrics
638-
- logs
639-
- traces
636+
You must specify the data source name and type (metrics, logs, traces) upon creation.
640637
The name of the data source will then be used as reference to name the associated Grafana data source.
641638
:param name: Data source name.
642639
:param region: Region to target. If none is passed will use default region from the config.
643640
:param project_id: ID of the Project the data source belongs to.
644641
:param type_: Data source type.
645-
:param retention_days: Default values are 30 days for metrics, 7 days for logs and traces.
642+
:param retention_days: Default values are 31 days for metrics, 7 days for logs and traces.
646643
:return: :class:`DataSource <DataSource>`
647644
648645
Usage:
@@ -717,7 +714,7 @@ def delete_data_source(
717714
) -> None:
718715
"""
719716
Delete a data source.
720-
Delete a given data source, specified by the data source ID. Note that deleting a data source is irreversible, and cannot be undone.
717+
Delete a given data source. Note that this action will permanently delete this data source and any data associated with it.
721718
:param data_source_id: ID of the data source to delete.
722719
:param region: Region to target. If none is passed will use default region from the config.
723720
@@ -755,14 +752,13 @@ def list_data_sources(
755752
"""
756753
List data sources.
757754
Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
758-
You can list data sources by Project, type and origin.
759755
:param region: Region to target. If none is passed will use default region from the config.
760756
:param page: Page number to return, from the paginated results.
761757
:param page_size: Number of data sources to return per page.
762758
:param order_by: Sort order for data sources in the response.
763759
:param project_id: Project ID to filter for, only data sources from this Project will be returned.
764-
:param origin: Origin to filter for, only data sources with matching origin will be returned.
765-
:param types: Types to filter for, only data sources with matching types will be returned.
760+
:param origin: Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned.
761+
:param types: Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned.
766762
:return: :class:`ListDataSourcesResponse <ListDataSourcesResponse>`
767763
768764
Usage:
@@ -805,14 +801,13 @@ def list_data_sources_all(
805801
"""
806802
List data sources.
807803
Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
808-
You can list data sources by Project, type and origin.
809804
:param region: Region to target. If none is passed will use default region from the config.
810805
:param page: Page number to return, from the paginated results.
811806
:param page_size: Number of data sources to return per page.
812807
:param order_by: Sort order for data sources in the response.
813808
:param project_id: Project ID to filter for, only data sources from this Project will be returned.
814-
:param origin: Origin to filter for, only data sources with matching origin will be returned.
815-
:param types: Types to filter for, only data sources with matching types will be returned.
809+
:param origin: Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned.
810+
:param types: Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned.
816811
:return: :class:`List[DataSource] <List[DataSource]>`
817812
818813
Usage:
@@ -846,11 +841,11 @@ def update_data_source(
846841
) -> DataSource:
847842
"""
848843
Update a data source.
849-
Update a given data source name, specified by the data source ID.
844+
Update a given data source attributes (name and/or retention_days).
850845
:param data_source_id: ID of the data source to update.
851846
:param region: Region to target. If none is passed will use default region from the config.
852847
:param name: Updated name of the data source.
853-
:param retention_days: BETA - Duration for which the data will be retained in the data source.
848+
:param retention_days: Duration for which the data will be retained in the data source.
854849
:return: :class:`DataSource <DataSource>`
855850
856851
Usage:
@@ -892,7 +887,7 @@ def get_usage_overview(
892887
) -> UsageOverview:
893888
"""
894889
Get data source usage overview.
895-
Retrieve the data source usage overview per type for the specified Project.
890+
Retrieve the volume of data ingested for each of your data sources in the specified project and region.
896891
:param region: Region to target. If none is passed will use default region from the config.
897892
:param project_id:
898893
:param interval:

scaleway/scaleway/cockpit/v1/types.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class DataSource:
292292

293293
retention_days: int
294294
"""
295-
BETA - Duration for which the data will be retained in the data source.
295+
Duration for which the data will be retained in the data source.
296296
"""
297297

298298
region: ScwRegion
@@ -986,7 +986,7 @@ class RegionalApiCreateDataSourceRequest:
986986

987987
retention_days: Optional[int]
988988
"""
989-
Default values are 30 days for metrics, 7 days for logs and traces.
989+
Default values are 31 days for metrics, 7 days for logs and traces.
990990
"""
991991

992992

@@ -1346,12 +1346,12 @@ class RegionalApiListDataSourcesRequest:
13461346

13471347
origin: Optional[DataSourceOrigin]
13481348
"""
1349-
Origin to filter for, only data sources with matching origin will be returned.
1349+
Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned.
13501350
"""
13511351

13521352
types: Optional[List[DataSourceType]]
13531353
"""
1354-
Types to filter for, only data sources with matching types will be returned.
1354+
Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned.
13551355
"""
13561356

13571357

@@ -1456,7 +1456,7 @@ class RegionalApiUpdateDataSourceRequest:
14561456

14571457
retention_days: Optional[int]
14581458
"""
1459-
BETA - Duration for which the data will be retained in the data source.
1459+
Duration for which the data will be retained in the data source.
14601460
"""
14611461

14621462

0 commit comments

Comments
 (0)