Skip to content

Commit 1eaa126

Browse files
authored
Merge branch 'main' into v1.6580.0
2 parents 4bb1b67 + cdbc59f commit 1eaa126

File tree

7 files changed

+119
-93
lines changed

7 files changed

+119
-93
lines changed

scaleway-async/poetry.lock

Lines changed: 66 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scaleway-async/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ scaleway-core = "*"
2828

2929
[tool.poetry.group.dev.dependencies]
3030
scaleway-core = { path = "../scaleway-core", develop = true }
31-
ruff = ">=0.5.0,<0.11.8"
31+
ruff = ">=0.5.0,<0.11.13"
3232
mypy = "^1.5.1"
3333

3434
[build-system]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,13 +1450,13 @@ async def list_alerts(
14501450
) -> ListAlertsResponse:
14511451
"""
14521452
List alerts.
1453-
List preconfigured and/or custom alerts for the specified Project.
1453+
List preconfigured and/or custom alerts for the specified Project and data source.
14541454
:param region: Region to target. If none is passed will use default region from the config.
14551455
:param project_id: Project ID to filter for, only alerts from this Project will be returned.
14561456
:param is_enabled: True returns only enabled alerts. False returns only disabled alerts. If omitted, no alert filtering is applied. Other filters may still apply.
14571457
:param is_preconfigured: True returns only preconfigured alerts. False returns only custom alerts. If omitted, no filtering is applied on alert types. Other filters may still apply.
14581458
:param state: Valid values to filter on are `inactive`, `pending` and `firing`. If omitted, no filtering is applied on alert states. Other filters may still apply.
1459-
:param data_source_id: If omitted, only alerts from the default scaleway data source will be listed.
1459+
:param data_source_id: If omitted, only alerts from the default Scaleway metrics data source will be listed.
14601460
:return: :class:`ListAlertsResponse <ListAlertsResponse>`
14611461
14621462
Usage:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ class RegionalApiListAlertsRequest:
12561256

12571257
data_source_id: Optional[str]
12581258
"""
1259-
If omitted, only alerts from the default scaleway data source will be listed.
1259+
If omitted, only alerts from the default Scaleway metrics data source will be listed.
12601260
"""
12611261

12621262

scaleway-core/poetry.lock

Lines changed: 46 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scaleway/scaleway/cockpit/v1/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,13 +1450,13 @@ def list_alerts(
14501450
) -> ListAlertsResponse:
14511451
"""
14521452
List alerts.
1453-
List preconfigured and/or custom alerts for the specified Project.
1453+
List preconfigured and/or custom alerts for the specified Project and data source.
14541454
:param region: Region to target. If none is passed will use default region from the config.
14551455
:param project_id: Project ID to filter for, only alerts from this Project will be returned.
14561456
:param is_enabled: True returns only enabled alerts. False returns only disabled alerts. If omitted, no alert filtering is applied. Other filters may still apply.
14571457
:param is_preconfigured: True returns only preconfigured alerts. False returns only custom alerts. If omitted, no filtering is applied on alert types. Other filters may still apply.
14581458
:param state: Valid values to filter on are `inactive`, `pending` and `firing`. If omitted, no filtering is applied on alert states. Other filters may still apply.
1459-
:param data_source_id: If omitted, only alerts from the default scaleway data source will be listed.
1459+
:param data_source_id: If omitted, only alerts from the default Scaleway metrics data source will be listed.
14601460
:return: :class:`ListAlertsResponse <ListAlertsResponse>`
14611461
14621462
Usage:

scaleway/scaleway/cockpit/v1/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ class RegionalApiListAlertsRequest:
12561256

12571257
data_source_id: Optional[str]
12581258
"""
1259-
If omitted, only alerts from the default scaleway data source will be listed.
1259+
If omitted, only alerts from the default Scaleway metrics data source will be listed.
12601260
"""
12611261

12621262

0 commit comments

Comments
 (0)