Skip to content

Commit 61dfacf

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 2648f54 of spec repo
1 parent 061d7ad commit 61dfacf

10 files changed

Lines changed: 317 additions & 57 deletions

.generator/schemas/v1/openapi.yaml

Lines changed: 64 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4884,6 +4884,8 @@ components:
48844884
- sds_scanned_bytes_usage
48854885
- serverless_apps_usage
48864886
- serverless_apps_apm_usage
4887+
- siem_12mo_retention_usage
4888+
- siem_6mo_retention_usage
48874889
- siem_analyzed_logs_add_on_usage
48884890
- siem_ingested_bytes_usage
48894891
- snmp_usage
@@ -4973,6 +4975,8 @@ components:
49734975
- SDS_SCANNED_BYTES_USAGE
49744976
- SERVERLESS_APPS_USAGE
49754977
- SERVERLESS_APPS_APM_USAGE
4978+
- SIEM_12MO_RETENTION_USAGE
4979+
- SIEM_6MO_RETENTION_USAGE
49764980
- SIEM_ANALYZED_LOGS_ADD_ON_USAGE
49774981
- SIEM_INGESTED_BYTES_USAGE
49784982
- SNMP_USAGE
@@ -9229,19 +9233,11 @@ components:
92299233
description: The monitor `CRITICAL` threshold.
92309234
format: double
92319235
type: number
9232-
critical_query:
9233-
description: Query evaluated as a dynamic `CRITICAL` threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview.
9234-
example: 'formula("2 * query1").rollup("avg").last("6mo")'
9235-
type: string
92369236
critical_recovery:
92379237
description: The monitor `CRITICAL` recovery threshold.
92389238
format: double
92399239
nullable: true
92409240
type: number
9241-
critical_recovery_query:
9242-
description: Query evaluated as a dynamic `CRITICAL` recovery threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview.
9243-
example: 'formula("1.5 * query1").rollup("avg").last("3mo")'
9244-
type: string
92459241
ok:
92469242
description: The monitor `OK` threshold.
92479243
format: double
@@ -9605,6 +9601,10 @@ components:
96059601
- rum_browser_mobile_sessions_percentage
96069602
- ingested_spans_bytes_usage
96079603
- ingested_spans_bytes_percentage
9604+
- siem_12mo_retention_usage
9605+
- siem_12mo_retention_percentage
9606+
- siem_6mo_retention_usage
9607+
- siem_6mo_retention_percentage
96089608
- siem_analyzed_logs_add_on_usage
96099609
- siem_analyzed_logs_add_on_percentage
96109610
- siem_ingested_bytes_usage
@@ -9774,6 +9774,10 @@ components:
97749774
- RUM_BROWSER_MOBILE_SESSIONS_PERCENTAGE
97759775
- INGESTED_SPANS_BYTES_USAGE
97769776
- INGESTED_SPANS_BYTES_PERCENTAGE
9777+
- SIEM_12MO_RETENTION_USAGE
9778+
- SIEM_12MO_RETENTION_PERCENTAGE
9779+
- SIEM_6MO_RETENTION_USAGE
9780+
- SIEM_6MO_RETENTION_PERCENTAGE
97779781
- SIEM_ANALYZED_LOGS_ADD_ON_USAGE
97789782
- SIEM_ANALYZED_LOGS_ADD_ON_PERCENTAGE
97799783
- SIEM_INGESTED_BYTES_USAGE
@@ -10403,6 +10407,22 @@ components:
1040310407
description: The total Serverless Apps usage by tag(s).
1040410408
format: double
1040510409
type: number
10410+
siem_12mo_retention_percentage:
10411+
description: The percentage of Cloud SIEM Indexed Logs (12-month retention) usage by tag(s).
10412+
format: double
10413+
type: number
10414+
siem_12mo_retention_usage:
10415+
description: The Cloud SIEM Indexed Logs (12-month retention) usage by tag(s).
10416+
format: double
10417+
type: number
10418+
siem_6mo_retention_percentage:
10419+
description: The percentage of Cloud SIEM Indexed Logs (6-month retention) usage by tag(s).
10420+
format: double
10421+
type: number
10422+
siem_6mo_retention_usage:
10423+
description: The Cloud SIEM Indexed Logs (6-month retention) usage by tag(s).
10424+
format: double
10425+
type: number
1040610426
siem_analyzed_logs_add_on_percentage:
1040710427
description: The percentage of log events analyzed by Cloud SIEM usage by tag(s).
1040810428
format: double
@@ -22467,6 +22487,10 @@ components:
2246722487
description: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current date for the given org.
2246822488
format: int64
2246922489
type: integer
22490+
cloud_siem_indexed_logs_sum:
22491+
description: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current date for the given org.
22492+
format: int64
22493+
type: integer
2247022494
code_analysis_sa_committers_hwm:
2247122495
description: Shows the high-water mark of all Static Analysis committers over all hours in the current date for the given org.
2247222496
format: int64
@@ -23231,6 +23255,14 @@ components:
2323123255
description: Shows the average number of Serverless Apps for Azure and Google Cloud for the given date and given org.
2323223256
format: int64
2323323257
type: integer
23258+
siem_12mo_retention_sum:
23259+
description: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current date for the given org.
23260+
format: int64
23261+
type: integer
23262+
siem_6mo_retention_sum:
23263+
description: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current date for the given org.
23264+
format: int64
23265+
type: integer
2323423266
siem_analyzed_logs_add_on_count_sum:
2323523267
description: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current date for the given org.
2323623268
format: int64
@@ -23480,6 +23512,10 @@ components:
2348023512
description: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current date for the given org.
2348123513
format: int64
2348223514
type: integer
23515+
cloud_siem_indexed_logs_sum:
23516+
description: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current date for the given org.
23517+
format: int64
23518+
type: integer
2348323519
code_analysis_sa_committers_hwm:
2348423520
description: Shows the high-water mark of all Static Analysis committers over all hours in the current date for the given org.
2348523521
format: int64
@@ -24256,6 +24292,14 @@ components:
2425624292
description: Shows the average number of Serverless Apps for Azure and Google Cloud for the given date and given org.
2425724293
format: int64
2425824294
type: integer
24295+
siem_12mo_retention_sum:
24296+
description: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current date for the given org.
24297+
format: int64
24298+
type: integer
24299+
siem_6mo_retention_sum:
24300+
description: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current date for the given org.
24301+
format: int64
24302+
type: integer
2425924303
siem_analyzed_logs_add_on_count_sum:
2426024304
description: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current date for the given org.
2426124305
format: int64
@@ -24503,6 +24547,10 @@ components:
2450324547
description: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current month for all organizations.
2450424548
format: int64
2450524549
type: integer
24550+
cloud_siem_indexed_logs_agg_sum:
24551+
description: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current month for all organizations.
24552+
format: int64
24553+
type: integer
2450624554
code_analysis_sa_committers_hwm_sum:
2450724555
description: Shows the high-water mark of all Static Analysis committers over all hours in the current month for all organizations.
2450824556
format: int64
@@ -25299,6 +25347,14 @@ components:
2529925347
description: Sum of the average number of Serverless Apps for Azure and Google Cloud in the current month for all organizations.
2530025348
format: int64
2530125349
type: integer
25350+
siem_12mo_retention_agg_sum:
25351+
description: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current month for all organizations.
25352+
format: int64
25353+
type: integer
25354+
siem_6mo_retention_agg_sum:
25355+
description: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current month for all organizations.
25356+
format: int64
25357+
type: integer
2530225358
siem_analyzed_logs_add_on_count_agg_sum:
2530325359
description: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current month for all organizations.
2530425360
format: int64
@@ -33708,10 +33764,6 @@ paths:
3370833764
- `operator`: <, <=, >, >=, ==, or !=
3370933765
- `#`: an integer or decimal number used to set the threshold
3371033766

33711-
To use a dynamic threshold on a metric monitor with a formula query, replace `#` with the `threshold` keyword
33712-
(for example, `... > threshold`) and provide the threshold as a query via `critical_query` on `options.thresholds`.
33713-
This feature is in preview.
33714-
3371533767
If you are using the `_change_` or `_pct_change_` time aggregator, instead use `change_aggr(time_aggr(time_window),
3371633768
timeshift):space_aggr:metric{tags} [by {key}] operator #` with:
3371733769

src/datadogV1/api/api_monitors.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -574,10 +574,6 @@ impl MonitorsAPI {
574574
/// - `operator`: <, <=, >, >=, ==, or !=
575575
/// - `#`: an integer or decimal number used to set the threshold
576576
///
577-
/// To use a dynamic threshold on a metric monitor with a formula query, replace `#` with the `threshold` keyword
578-
/// (for example, `... > threshold`) and provide the threshold as a query via `critical_query` on `options.thresholds`.
579-
/// This feature is in preview.
580-
///
581577
/// If you are using the `_change_` or `_pct_change_` time aggregator, instead use `change_aggr(time_aggr(time_window),
582578
/// timeshift):space_aggr:metric{tags} [by {key}] operator #` with:
583579
///
@@ -827,10 +823,6 @@ impl MonitorsAPI {
827823
/// - `operator`: <, <=, >, >=, ==, or !=
828824
/// - `#`: an integer or decimal number used to set the threshold
829825
///
830-
/// To use a dynamic threshold on a metric monitor with a formula query, replace `#` with the `threshold` keyword
831-
/// (for example, `... > threshold`) and provide the threshold as a query via `critical_query` on `options.thresholds`.
832-
/// This feature is in preview.
833-
///
834826
/// If you are using the `_change_` or `_pct_change_` time aggregator, instead use `change_aggr(time_aggr(time_window),
835827
/// timeshift):space_aggr:metric{tags} [by {key}] operator #` with:
836828
///

src/datadogV1/model/model_hourly_usage_attribution_usage_type.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ pub enum HourlyUsageAttributionUsageType {
8888
SDS_SCANNED_BYTES_USAGE,
8989
SERVERLESS_APPS_USAGE,
9090
SERVERLESS_APPS_APM_USAGE,
91+
SIEM_12MO_RETENTION_USAGE,
92+
SIEM_6MO_RETENTION_USAGE,
9193
SIEM_ANALYZED_LOGS_ADD_ON_USAGE,
9294
SIEM_INGESTED_BYTES_USAGE,
9395
SNMP_USAGE,
@@ -205,6 +207,8 @@ impl ToString for HourlyUsageAttributionUsageType {
205207
Self::SDS_SCANNED_BYTES_USAGE => String::from("sds_scanned_bytes_usage"),
206208
Self::SERVERLESS_APPS_USAGE => String::from("serverless_apps_usage"),
207209
Self::SERVERLESS_APPS_APM_USAGE => String::from("serverless_apps_apm_usage"),
210+
Self::SIEM_12MO_RETENTION_USAGE => String::from("siem_12mo_retention_usage"),
211+
Self::SIEM_6MO_RETENTION_USAGE => String::from("siem_6mo_retention_usage"),
208212
Self::SIEM_ANALYZED_LOGS_ADD_ON_USAGE => {
209213
String::from("siem_analyzed_logs_add_on_usage")
210214
}
@@ -328,6 +332,8 @@ impl<'de> Deserialize<'de> for HourlyUsageAttributionUsageType {
328332
"sds_scanned_bytes_usage" => Self::SDS_SCANNED_BYTES_USAGE,
329333
"serverless_apps_usage" => Self::SERVERLESS_APPS_USAGE,
330334
"serverless_apps_apm_usage" => Self::SERVERLESS_APPS_APM_USAGE,
335+
"siem_12mo_retention_usage" => Self::SIEM_12MO_RETENTION_USAGE,
336+
"siem_6mo_retention_usage" => Self::SIEM_6MO_RETENTION_USAGE,
331337
"siem_analyzed_logs_add_on_usage" => Self::SIEM_ANALYZED_LOGS_ADD_ON_USAGE,
332338
"siem_ingested_bytes_usage" => Self::SIEM_INGESTED_BYTES_USAGE,
333339
"snmp_usage" => Self::SNMP_USAGE,

src/datadogV1/model/model_monitor_thresholds.rs

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,13 @@ pub struct MonitorThresholds {
1414
/// The monitor `CRITICAL` threshold.
1515
#[serde(rename = "critical")]
1616
pub critical: Option<f64>,
17-
/// Query evaluated as a dynamic `CRITICAL` threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview.
18-
#[serde(rename = "critical_query")]
19-
pub critical_query: Option<String>,
2017
/// The monitor `CRITICAL` recovery threshold.
2118
#[serde(
2219
rename = "critical_recovery",
2320
default,
2421
with = "::serde_with::rust::double_option"
2522
)]
2623
pub critical_recovery: Option<Option<f64>>,
27-
/// Query evaluated as a dynamic `CRITICAL` recovery threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview.
28-
#[serde(rename = "critical_recovery_query")]
29-
pub critical_recovery_query: Option<String>,
3024
/// The monitor `OK` threshold.
3125
#[serde(rename = "ok", default, with = "::serde_with::rust::double_option")]
3226
pub ok: Option<Option<f64>>,
@@ -62,9 +56,7 @@ impl MonitorThresholds {
6256
pub fn new() -> MonitorThresholds {
6357
MonitorThresholds {
6458
critical: None,
65-
critical_query: None,
6659
critical_recovery: None,
67-
critical_recovery_query: None,
6860
ok: None,
6961
unknown: None,
7062
warning: None,
@@ -79,21 +71,11 @@ impl MonitorThresholds {
7971
self
8072
}
8173

82-
pub fn critical_query(mut self, value: String) -> Self {
83-
self.critical_query = Some(value);
84-
self
85-
}
86-
8774
pub fn critical_recovery(mut self, value: Option<f64>) -> Self {
8875
self.critical_recovery = Some(value);
8976
self
9077
}
9178

92-
pub fn critical_recovery_query(mut self, value: String) -> Self {
93-
self.critical_recovery_query = Some(value);
94-
self
95-
}
96-
9779
pub fn ok(mut self, value: Option<f64>) -> Self {
9880
self.ok = Some(value);
9981
self
@@ -147,9 +129,7 @@ impl<'de> Deserialize<'de> for MonitorThresholds {
147129
M: MapAccess<'a>,
148130
{
149131
let mut critical: Option<f64> = None;
150-
let mut critical_query: Option<String> = None;
151132
let mut critical_recovery: Option<Option<f64>> = None;
152-
let mut critical_recovery_query: Option<String> = None;
153133
let mut ok: Option<Option<f64>> = None;
154134
let mut unknown: Option<Option<f64>> = None;
155135
let mut warning: Option<Option<f64>> = None;
@@ -168,27 +148,13 @@ impl<'de> Deserialize<'de> for MonitorThresholds {
168148
}
169149
critical = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
170150
}
171-
"critical_query" => {
172-
if v.is_null() {
173-
continue;
174-
}
175-
critical_query =
176-
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
177-
}
178151
"critical_recovery" => {
179152
if v.as_str() == Some("") {
180153
continue;
181154
}
182155
critical_recovery =
183156
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
184157
}
185-
"critical_recovery_query" => {
186-
if v.is_null() {
187-
continue;
188-
}
189-
critical_recovery_query =
190-
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
191-
}
192158
"ok" => {
193159
if v.as_str() == Some("") {
194160
continue;
@@ -224,9 +190,7 @@ impl<'de> Deserialize<'de> for MonitorThresholds {
224190

225191
let content = MonitorThresholds {
226192
critical,
227-
critical_query,
228193
critical_recovery,
229-
critical_recovery_query,
230194
ok,
231195
unknown,
232196
warning,

src/datadogV1/model/model_monthly_usage_attribution_supported_metrics.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ pub enum MonthlyUsageAttributionSupportedMetrics {
165165
RUM_BROWSER_MOBILE_SESSIONS_PERCENTAGE,
166166
INGESTED_SPANS_BYTES_USAGE,
167167
INGESTED_SPANS_BYTES_PERCENTAGE,
168+
SIEM_12MO_RETENTION_USAGE,
169+
SIEM_12MO_RETENTION_PERCENTAGE,
170+
SIEM_6MO_RETENTION_USAGE,
171+
SIEM_6MO_RETENTION_PERCENTAGE,
168172
SIEM_ANALYZED_LOGS_ADD_ON_USAGE,
169173
SIEM_ANALYZED_LOGS_ADD_ON_PERCENTAGE,
170174
SIEM_INGESTED_BYTES_USAGE,
@@ -398,6 +402,10 @@ impl ToString for MonthlyUsageAttributionSupportedMetrics {
398402
Self::INGESTED_SPANS_BYTES_PERCENTAGE => {
399403
String::from("ingested_spans_bytes_percentage")
400404
}
405+
Self::SIEM_12MO_RETENTION_USAGE => String::from("siem_12mo_retention_usage"),
406+
Self::SIEM_12MO_RETENTION_PERCENTAGE => String::from("siem_12mo_retention_percentage"),
407+
Self::SIEM_6MO_RETENTION_USAGE => String::from("siem_6mo_retention_usage"),
408+
Self::SIEM_6MO_RETENTION_PERCENTAGE => String::from("siem_6mo_retention_percentage"),
401409
Self::SIEM_ANALYZED_LOGS_ADD_ON_USAGE => {
402410
String::from("siem_analyzed_logs_add_on_usage")
403411
}
@@ -607,6 +615,10 @@ impl<'de> Deserialize<'de> for MonthlyUsageAttributionSupportedMetrics {
607615
}
608616
"ingested_spans_bytes_usage" => Self::INGESTED_SPANS_BYTES_USAGE,
609617
"ingested_spans_bytes_percentage" => Self::INGESTED_SPANS_BYTES_PERCENTAGE,
618+
"siem_12mo_retention_usage" => Self::SIEM_12MO_RETENTION_USAGE,
619+
"siem_12mo_retention_percentage" => Self::SIEM_12MO_RETENTION_PERCENTAGE,
620+
"siem_6mo_retention_usage" => Self::SIEM_6MO_RETENTION_USAGE,
621+
"siem_6mo_retention_percentage" => Self::SIEM_6MO_RETENTION_PERCENTAGE,
610622
"siem_analyzed_logs_add_on_usage" => Self::SIEM_ANALYZED_LOGS_ADD_ON_USAGE,
611623
"siem_analyzed_logs_add_on_percentage" => Self::SIEM_ANALYZED_LOGS_ADD_ON_PERCENTAGE,
612624
"siem_ingested_bytes_usage" => Self::SIEM_INGESTED_BYTES_USAGE,

0 commit comments

Comments
 (0)