Skip to content

add cross org uuids to timeseries query #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2024
Merged

add cross org uuids to timeseries query #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adadf20
Regenerate client from commit acfbfe3f of spec repo
Jul 1, 2024
0f89641
Merge branch 'master' into datadog-api-spec/generated/2839
api-clients-generation-pipeline[bot] Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-07-01 12:39:43.463031",
"spec_repo_commit": "f54c0bf3"
"regenerated": "2024-07-01 17:39:18.962558",
"spec_repo_commit": "acfbfe3f"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-07-01 12:39:43.480910",
"spec_repo_commit": "f54c0bf3"
"regenerated": "2024-07-01 17:39:18.980610",
"spec_repo_commit": "acfbfe3f"
}
}
}
25 changes: 25 additions & 0 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,17 @@ components:
type: string
readOnly: true
type: object
CrossOrgUuids:
description: The source organization UUID for cross organization queries. Feature
in Private Beta.
example:
- 6434abde-xxxx-yyyy-zzzz-da7ad0900001
items:
description: The source organization UUID.
example: 6434abde-xxxx-yyyy-zzzz-da7ad0900001
type: string
maxItems: 1
type: array
Dashboard:
description: "A dashboard is Datadog\u2019s tool for visually tracking, analyzing,
and displaying\nkey performance metrics, which enable you to monitor the health
Expand Down Expand Up @@ -2519,6 +2530,8 @@ components:
FormulaAndFunctionApmDependencyStatsQueryDefinition:
description: A formula and functions APM dependency stats query.
properties:
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionApmDependencyStatsDataSource'
env:
Expand Down Expand Up @@ -2606,6 +2619,8 @@ components:
FormulaAndFunctionApmResourceStatsQueryDefinition:
description: APM resource stats query using formulas and functions.
properties:
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionApmResourceStatsDataSource'
env:
Expand Down Expand Up @@ -2671,6 +2686,8 @@ components:
properties:
aggregator:
$ref: '#/components/schemas/WidgetAggregator'
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionCloudCostDataSource'
name:
Expand Down Expand Up @@ -2721,6 +2738,8 @@ components:
properties:
compute:
$ref: '#/components/schemas/FormulaAndFunctionEventQueryDefinitionCompute'
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionEventsDataSource'
group_by:
Expand Down Expand Up @@ -2877,6 +2896,8 @@ components:
properties:
aggregator:
$ref: '#/components/schemas/FormulaAndFunctionMetricAggregation'
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionMetricDataSource'
name:
Expand Down Expand Up @@ -2907,6 +2928,8 @@ components:
properties:
aggregator:
$ref: '#/components/schemas/FormulaAndFunctionMetricAggregation'
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionProcessQueryDataSource'
is_normalized_cpu:
Expand Down Expand Up @@ -3014,6 +3037,8 @@ components:
description: Additional filters applied to the SLO query.
example: host:host_a,env:prod
type: string
cross_org_uuids:
$ref: '#/components/schemas/CrossOrgUuids'
data_source:
$ref: '#/components/schemas/FormulaAndFunctionSLODataSource'
group_mode:
Expand Down
18 changes: 18 additions & 0 deletions src/datadogV1/model/model_formula_and_function_apm_dependency_stats_query_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ use std::fmt::{self, Formatter};
#[skip_serializing_none]
#[derive(Clone, Debug, PartialEq, Serialize)]
pub struct FormulaAndFunctionApmDependencyStatsQueryDefinition {
/// The source organization UUID for cross organization queries. Feature in Private Beta.
#[serde(rename = "cross_org_uuids")]
pub cross_org_uuids: Option<Vec<String>>,
/// Data source for APM dependency stats queries.
#[serde(rename = "data_source")]
pub data_source: crate::datadogV1::model::FormulaAndFunctionApmDependencyStatsDataSource,
Expand Down Expand Up @@ -57,6 +60,7 @@ impl FormulaAndFunctionApmDependencyStatsQueryDefinition {
stat: crate::datadogV1::model::FormulaAndFunctionApmDependencyStatName,
) -> FormulaAndFunctionApmDependencyStatsQueryDefinition {
FormulaAndFunctionApmDependencyStatsQueryDefinition {
cross_org_uuids: None,
data_source,
env,
is_upstream: None,
Expand All @@ -71,6 +75,11 @@ impl FormulaAndFunctionApmDependencyStatsQueryDefinition {
}
}

pub fn cross_org_uuids(mut self, value: Vec<String>) -> Self {
self.cross_org_uuids = Some(value);
self
}

pub fn is_upstream(mut self, value: bool) -> Self {
self.is_upstream = Some(value);
self
Expand Down Expand Up @@ -104,6 +113,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionApmDependencyStatsQueryDefiniti
where
M: MapAccess<'a>,
{
let mut cross_org_uuids: Option<Vec<String>> = None;
let mut data_source: Option<
crate::datadogV1::model::FormulaAndFunctionApmDependencyStatsDataSource,
> = None;
Expand All @@ -122,6 +132,13 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionApmDependencyStatsQueryDefiniti

while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
match k.as_str() {
"cross_org_uuids" => {
if v.is_null() {
continue;
}
cross_org_uuids =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"data_source" => {
data_source =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
Expand Down Expand Up @@ -198,6 +215,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionApmDependencyStatsQueryDefiniti
let stat = stat.ok_or_else(|| M::Error::missing_field("stat"))?;

let content = FormulaAndFunctionApmDependencyStatsQueryDefinition {
cross_org_uuids,
data_source,
env,
is_upstream,
Expand Down
18 changes: 18 additions & 0 deletions src/datadogV1/model/model_formula_and_function_apm_resource_stats_query_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ use std::fmt::{self, Formatter};
#[skip_serializing_none]
#[derive(Clone, Debug, PartialEq, Serialize)]
pub struct FormulaAndFunctionApmResourceStatsQueryDefinition {
/// The source organization UUID for cross organization queries. Feature in Private Beta.
#[serde(rename = "cross_org_uuids")]
pub cross_org_uuids: Option<Vec<String>>,
/// Data source for APM resource stats queries.
#[serde(rename = "data_source")]
pub data_source: crate::datadogV1::model::FormulaAndFunctionApmResourceStatsDataSource,
Expand Down Expand Up @@ -55,6 +58,7 @@ impl FormulaAndFunctionApmResourceStatsQueryDefinition {
stat: crate::datadogV1::model::FormulaAndFunctionApmResourceStatName,
) -> FormulaAndFunctionApmResourceStatsQueryDefinition {
FormulaAndFunctionApmResourceStatsQueryDefinition {
cross_org_uuids: None,
data_source,
env,
group_by: None,
Expand All @@ -69,6 +73,11 @@ impl FormulaAndFunctionApmResourceStatsQueryDefinition {
}
}

pub fn cross_org_uuids(mut self, value: Vec<String>) -> Self {
self.cross_org_uuids = Some(value);
self
}

pub fn group_by(mut self, value: Vec<String>) -> Self {
self.group_by = Some(value);
self
Expand Down Expand Up @@ -112,6 +121,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionApmResourceStatsQueryDefinition
where
M: MapAccess<'a>,
{
let mut cross_org_uuids: Option<Vec<String>> = None;
let mut data_source: Option<
crate::datadogV1::model::FormulaAndFunctionApmResourceStatsDataSource,
> = None;
Expand All @@ -130,6 +140,13 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionApmResourceStatsQueryDefinition

while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
match k.as_str() {
"cross_org_uuids" => {
if v.is_null() {
continue;
}
cross_org_uuids =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"data_source" => {
data_source =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
Expand Down Expand Up @@ -207,6 +224,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionApmResourceStatsQueryDefinition
let stat = stat.ok_or_else(|| M::Error::missing_field("stat"))?;

let content = FormulaAndFunctionApmResourceStatsQueryDefinition {
cross_org_uuids,
data_source,
env,
group_by,
Expand Down
18 changes: 18 additions & 0 deletions src/datadogV1/model/model_formula_and_function_cloud_cost_query_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ pub struct FormulaAndFunctionCloudCostQueryDefinition {
/// Aggregator used for the request.
#[serde(rename = "aggregator")]
pub aggregator: Option<crate::datadogV1::model::WidgetAggregator>,
/// The source organization UUID for cross organization queries. Feature in Private Beta.
#[serde(rename = "cross_org_uuids")]
pub cross_org_uuids: Option<Vec<String>>,
/// Data source for Cloud Cost queries.
#[serde(rename = "data_source")]
pub data_source: crate::datadogV1::model::FormulaAndFunctionCloudCostDataSource,
Expand All @@ -36,6 +39,7 @@ impl FormulaAndFunctionCloudCostQueryDefinition {
) -> FormulaAndFunctionCloudCostQueryDefinition {
FormulaAndFunctionCloudCostQueryDefinition {
aggregator: None,
cross_org_uuids: None,
data_source,
name,
query,
Expand All @@ -47,6 +51,11 @@ impl FormulaAndFunctionCloudCostQueryDefinition {
self.aggregator = Some(value);
self
}

pub fn cross_org_uuids(mut self, value: Vec<String>) -> Self {
self.cross_org_uuids = Some(value);
self
}
}

impl<'de> Deserialize<'de> for FormulaAndFunctionCloudCostQueryDefinition {
Expand All @@ -67,6 +76,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionCloudCostQueryDefinition {
M: MapAccess<'a>,
{
let mut aggregator: Option<crate::datadogV1::model::WidgetAggregator> = None;
let mut cross_org_uuids: Option<Vec<String>> = None;
let mut data_source: Option<
crate::datadogV1::model::FormulaAndFunctionCloudCostDataSource,
> = None;
Expand All @@ -92,6 +102,13 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionCloudCostQueryDefinition {
}
}
}
"cross_org_uuids" => {
if v.is_null() {
continue;
}
cross_org_uuids =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"data_source" => {
data_source =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
Expand Down Expand Up @@ -120,6 +137,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionCloudCostQueryDefinition {

let content = FormulaAndFunctionCloudCostQueryDefinition {
aggregator,
cross_org_uuids,
data_source,
name,
query,
Expand Down
18 changes: 18 additions & 0 deletions src/datadogV1/model/model_formula_and_function_event_query_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ pub struct FormulaAndFunctionEventQueryDefinition {
/// Compute options.
#[serde(rename = "compute")]
pub compute: crate::datadogV1::model::FormulaAndFunctionEventQueryDefinitionCompute,
/// The source organization UUID for cross organization queries. Feature in Private Beta.
#[serde(rename = "cross_org_uuids")]
pub cross_org_uuids: Option<Vec<String>>,
/// Data source for event platform-based queries.
#[serde(rename = "data_source")]
pub data_source: crate::datadogV1::model::FormulaAndFunctionEventsDataSource,
Expand Down Expand Up @@ -45,6 +48,7 @@ impl FormulaAndFunctionEventQueryDefinition {
) -> FormulaAndFunctionEventQueryDefinition {
FormulaAndFunctionEventQueryDefinition {
compute,
cross_org_uuids: None,
data_source,
group_by: None,
indexes: None,
Expand All @@ -55,6 +59,11 @@ impl FormulaAndFunctionEventQueryDefinition {
}
}

pub fn cross_org_uuids(mut self, value: Vec<String>) -> Self {
self.cross_org_uuids = Some(value);
self
}

pub fn group_by(
mut self,
value: Vec<crate::datadogV1::model::FormulaAndFunctionEventQueryGroupBy>,
Expand Down Expand Up @@ -102,6 +111,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionEventQueryDefinition {
let mut compute: Option<
crate::datadogV1::model::FormulaAndFunctionEventQueryDefinitionCompute,
> = None;
let mut cross_org_uuids: Option<Vec<String>> = None;
let mut data_source: Option<
crate::datadogV1::model::FormulaAndFunctionEventsDataSource,
> = None;
Expand All @@ -121,6 +131,13 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionEventQueryDefinition {
"compute" => {
compute = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"cross_org_uuids" => {
if v.is_null() {
continue;
}
cross_org_uuids =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"data_source" => {
data_source =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
Expand Down Expand Up @@ -170,6 +187,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionEventQueryDefinition {

let content = FormulaAndFunctionEventQueryDefinition {
compute,
cross_org_uuids,
data_source,
group_by,
indexes,
Expand Down
18 changes: 18 additions & 0 deletions src/datadogV1/model/model_formula_and_function_metric_query_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ pub struct FormulaAndFunctionMetricQueryDefinition {
/// The aggregation methods available for metrics queries.
#[serde(rename = "aggregator")]
pub aggregator: Option<crate::datadogV1::model::FormulaAndFunctionMetricAggregation>,
/// The source organization UUID for cross organization queries. Feature in Private Beta.
#[serde(rename = "cross_org_uuids")]
pub cross_org_uuids: Option<Vec<String>>,
/// Data source for metrics queries.
#[serde(rename = "data_source")]
pub data_source: crate::datadogV1::model::FormulaAndFunctionMetricDataSource,
Expand All @@ -36,6 +39,7 @@ impl FormulaAndFunctionMetricQueryDefinition {
) -> FormulaAndFunctionMetricQueryDefinition {
FormulaAndFunctionMetricQueryDefinition {
aggregator: None,
cross_org_uuids: None,
data_source,
name,
query,
Expand All @@ -50,6 +54,11 @@ impl FormulaAndFunctionMetricQueryDefinition {
self.aggregator = Some(value);
self
}

pub fn cross_org_uuids(mut self, value: Vec<String>) -> Self {
self.cross_org_uuids = Some(value);
self
}
}

impl<'de> Deserialize<'de> for FormulaAndFunctionMetricQueryDefinition {
Expand All @@ -72,6 +81,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionMetricQueryDefinition {
let mut aggregator: Option<
crate::datadogV1::model::FormulaAndFunctionMetricAggregation,
> = None;
let mut cross_org_uuids: Option<Vec<String>> = None;
let mut data_source: Option<
crate::datadogV1::model::FormulaAndFunctionMetricDataSource,
> = None;
Expand All @@ -95,6 +105,13 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionMetricQueryDefinition {
}
}
}
"cross_org_uuids" => {
if v.is_null() {
continue;
}
cross_org_uuids =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"data_source" => {
data_source =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
Expand Down Expand Up @@ -123,6 +140,7 @@ impl<'de> Deserialize<'de> for FormulaAndFunctionMetricQueryDefinition {

let content = FormulaAndFunctionMetricQueryDefinition {
aggregator,
cross_org_uuids,
data_source,
name,
query,
Expand Down
Loading