Skip to content

Commit 6cfa891

Browse files
authored
Merge branch 'main' into v1.6749.0
2 parents 7cfe86c + be0bbe9 commit 6cfa891

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

packages_generated/applesilicon/src/v1alpha1/api.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class API extends ParentAPI {
136136
)
137137

138138
/**
139-
* Create multiple servers atomically. Create multiple servers in the targeted zone specifying their configurations. If the request cannot entirely be fullfilled, no servers are created.
139+
* Create multiple servers atomically. Create multiple servers in the targeted zone specifying their configurations. If the request cannot entirely be fulfilled, no servers are created.
140140
*
141141
* @param request - The request {@link BatchCreateServersRequest}
142142
* @returns A Promise of BatchCreateServersResponse

packages_generated/cockpit/src/v1/api.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,12 +822,12 @@ If you need to receive alerts for other receivers, you can create additional con
822822
path: `/cockpit/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/alerts`,
823823
urlParams: urlParams(
824824
['data_source_id', request.dataSourceId],
825-
['is_enabled', request.isEnabled],
826825
['is_preconfigured', request.isPreconfigured],
827826
[
828827
'project_id',
829828
request.projectId ?? this.client.settings.defaultProjectId,
830829
],
830+
['rule_status', request.ruleStatus],
831831
['state', request.state],
832832
),
833833
},

packages_generated/cockpit/src/v1/marshalling.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ const unmarshalAlert = (data: unknown): Alert => {
333333
annotations: data.annotations,
334334
dataSourceId: data.data_source_id,
335335
duration: data.duration,
336-
enabled: data.enabled,
337336
name: data.name,
338337
preconfigured: data.preconfigured,
339338
preconfiguredData: data.preconfigured_data
340339
? unmarshalPreconfiguredAlertData(data.preconfigured_data)
341340
: undefined,
342341
region: data.region,
343342
rule: data.rule,
343+
ruleStatus: data.rule_status,
344344
state: data.state ? data.state : undefined,
345345
} as Alert
346346
}

packages_generated/cockpit/src/v1/types.gen.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ import type { Region as ScwRegion } from '@scaleway/sdk-client'
44

55
export type AlertState = 'unknown_state' | 'inactive' | 'pending' | 'firing'
66

7+
export type AlertStatus =
8+
| 'unknown_status'
9+
| 'enabled'
10+
| 'disabled'
11+
| 'enabling'
12+
| 'disabling'
13+
714
export type DataSourceOrigin =
815
| 'unknown_origin'
916
| 'scaleway'
@@ -124,9 +131,9 @@ export interface Alert {
124131
*/
125132
duration: string
126133
/**
127-
* Indicates if the alert is enabled or disabled. Only preconfigured alerts can be disabled.
134+
* Indicates if the alert is enabled, enabling, disabled or disabling. Preconfigured alerts can have any of these values, whereas custom alerts can only have the status "enabled".
128135
*/
129-
enabled: boolean
136+
ruleStatus: AlertStatus
130137
/**
131138
* Current state of the alert. Possible states are `inactive`, `pending`, and `firing`.
132139
*/
@@ -1030,9 +1037,9 @@ export type RegionalApiListAlertsRequest = {
10301037
*/
10311038
projectId?: string
10321039
/**
1033-
* True returns only enabled alerts. False returns only disabled alerts. If omitted, no alert filtering is applied. Other filters may still apply.
1040+
* Returns only alerts with the given activation status. If omitted, no alert filtering is applied. Other filters may still apply.
10341041
*/
1035-
isEnabled?: boolean
1042+
ruleStatus?: AlertStatus
10361043
/**
10371044
* True returns only preconfigured alerts. False returns only custom alerts. If omitted, no filtering is applied on alert types. Other filters may still apply.
10381045
*/

0 commit comments

Comments
 (0)