Skip to content

Add cross_org_uuids to v2 query endpoints #3488

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

Open
api-clients-generation-pipeline wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add cross_org_uuids to v2 query endpoints #3488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4231,6 +4231,8 @@ components:
description: >-
A query for APM dependency statistics between services, such as call latency and error rates.
properties:
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ApmDependencyStatsDataSource"
env:
Expand Down Expand Up @@ -4289,6 +4291,8 @@ components:
description: >-
A query for APM trace metrics such as hits, errors, and latency percentiles, aggregated across services.
properties:
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ApmMetricsDataSource"
group_by:
Expand Down Expand Up @@ -4439,6 +4443,8 @@ components:
description: >-
A query for APM resource statistics such as latency, error rate, and hit count, grouped by resource name.
properties:
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ApmResourceStatsDataSource"
env:
Expand Down Expand Up @@ -15258,6 +15264,8 @@ components:
properties:
aggregator:
$ref: "#/components/schemas/MetricsAggregator"
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ContainerDataSource"
is_normalized_cpu:
Expand Down Expand Up @@ -15295,6 +15303,8 @@ components:
ContainerTimeseriesQuery:
description: A query for container-level metrics such as CPU and memory usage.
properties:
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ContainerDataSource"
is_normalized_cpu:
Expand Down Expand Up @@ -18122,6 +18132,14 @@ components:
nullable: true
type: string
type: object
CrossOrgUuids:
description: >-
Organization UUIDs to query when using [cross-organization visibility](/account_management/org_settings/cross_org_visibility/). Limited to one organization UUID.
items:
description: An organization UUID.
type: string
maxItems: 1
type: array
CsmAgentData:
description: Single Agent Data.
properties:
Expand Down Expand Up @@ -26178,6 +26196,8 @@ components:
properties:
compute:
$ref: "#/components/schemas/EventsCompute"
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/EventsDataSource"
group_by:
Expand Down Expand Up @@ -26231,6 +26251,8 @@ components:
properties:
compute:
$ref: "#/components/schemas/EventsCompute"
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/EventsDataSource"
group_by:
Expand Down Expand Up @@ -44129,6 +44151,8 @@ components:
properties:
aggregator:
$ref: "#/components/schemas/MetricsAggregator"
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/MetricsDataSource"
name:
Expand All @@ -44146,6 +44170,8 @@ components:
MetricsTimeseriesQuery:
description: A query against Datadog custom metrics or Cloud Cost data sources.
properties:
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/MetricsDataSource"
name:
Expand Down Expand Up @@ -55260,6 +55286,8 @@ components:
properties:
aggregator:
$ref: "#/components/schemas/MetricsAggregator"
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ProcessDataSource"
is_normalized_cpu:
Expand Down Expand Up @@ -55383,6 +55411,8 @@ components:
ProcessTimeseriesQuery:
description: A query for host-level process metrics such as CPU and memory usage.
properties:
cross_org_uuids:
$ref: "#/components/schemas/CrossOrgUuids"
data_source:
$ref: "#/components/schemas/ProcessDataSource"
is_normalized_cpu:
Expand Down Expand Up @@ -69808,6 +69838,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/SloDataSource"
group_mode:
Expand Down
16 changes: 15 additions & 1 deletion src/datadog_api_client/v2/model/apm_dependency_stats_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright 2019-Present Datadog, Inc.
from __future__ import annotations

from typing import Union, TYPE_CHECKING
from typing import List, Union, TYPE_CHECKING

from datadog_api_client.model_utils import (
ModelNormal,
Expand All @@ -19,12 +19,19 @@


class ApmDependencyStatsQuery(ModelNormal):
validations = {
"cross_org_uuids": {
"max_items": 1,
},
}

@cached_property
def openapi_types(_):
from datadog_api_client.v2.model.apm_dependency_stats_data_source import ApmDependencyStatsDataSource
from datadog_api_client.v2.model.apm_dependency_stat_name import ApmDependencyStatName

return {
"cross_org_uuids": ([str],),
"data_source": (ApmDependencyStatsDataSource,),
"env": (str,),
"is_upstream": (bool,),
Expand All @@ -38,6 +45,7 @@ def openapi_types(_):
}

attribute_map = {
"cross_org_uuids": "cross_org_uuids",
"data_source": "data_source",
"env": "env",
"is_upstream": "is_upstream",
Expand All @@ -59,6 +67,7 @@ def __init__(
resource_name: str,
service: str,
stat: ApmDependencyStatName,
cross_org_uuids: Union[List[str], UnsetType] = unset,
is_upstream: Union[bool, UnsetType] = unset,
primary_tag_name: Union[str, UnsetType] = unset,
primary_tag_value: Union[str, UnsetType] = unset,
Expand All @@ -67,6 +76,9 @@ def __init__(
"""
A query for APM dependency statistics between services, such as call latency and error rates.

:param cross_org_uuids: Organization UUIDs to query when using `cross-organization visibility </account_management/org_settings/cross_org_visibility/>`_. Limited to one organization UUID.
:type cross_org_uuids: [str], optional

:param data_source: A data source for APM dependency statistics queries.
:type data_source: ApmDependencyStatsDataSource

Expand Down Expand Up @@ -97,6 +109,8 @@ def __init__(
:param stat: The APM dependency statistic to query.
:type stat: ApmDependencyStatName
"""
if cross_org_uuids is not unset:
kwargs["cross_org_uuids"] = cross_org_uuids
if is_upstream is not unset:
kwargs["is_upstream"] = is_upstream
if primary_tag_name is not unset:
Expand Down
14 changes: 14 additions & 0 deletions src/datadog_api_client/v2/model/apm_metrics_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@


class ApmMetricsQuery(ModelNormal):
validations = {
"cross_org_uuids": {
"max_items": 1,
},
}

@cached_property
def openapi_types(_):
from datadog_api_client.v2.model.apm_metrics_data_source import ApmMetricsDataSource
from datadog_api_client.v2.model.apm_metrics_span_kind import ApmMetricsSpanKind
from datadog_api_client.v2.model.apm_metrics_stat import ApmMetricsStat

return {
"cross_org_uuids": ([str],),
"data_source": (ApmMetricsDataSource,),
"group_by": ([str],),
"name": (str,),
Expand All @@ -42,6 +49,7 @@ def openapi_types(_):
}

attribute_map = {
"cross_org_uuids": "cross_org_uuids",
"data_source": "data_source",
"group_by": "group_by",
"name": "name",
Expand All @@ -61,6 +69,7 @@ def __init__(
data_source: ApmMetricsDataSource,
name: str,
stat: ApmMetricsStat,
cross_org_uuids: Union[List[str], UnsetType] = unset,
group_by: Union[List[str], UnsetType] = unset,
operation_mode: Union[str, UnsetType] = unset,
operation_name: Union[str, UnsetType] = unset,
Expand All @@ -75,6 +84,9 @@ def __init__(
"""
A query for APM trace metrics such as hits, errors, and latency percentiles, aggregated across services.

:param cross_org_uuids: Organization UUIDs to query when using `cross-organization visibility </account_management/org_settings/cross_org_visibility/>`_. Limited to one organization UUID.
:type cross_org_uuids: [str], optional

:param data_source: A data source for APM metrics queries.
:type data_source: ApmMetricsDataSource

Expand Down Expand Up @@ -111,6 +123,8 @@ def __init__(
:param stat: The APM metric statistic to query.
:type stat: ApmMetricsStat
"""
if cross_org_uuids is not unset:
kwargs["cross_org_uuids"] = cross_org_uuids
if group_by is not unset:
kwargs["group_by"] = group_by
if operation_mode is not unset:
Expand Down
14 changes: 14 additions & 0 deletions src/datadog_api_client/v2/model/apm_resource_stats_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,19 @@


class ApmResourceStatsQuery(ModelNormal):
validations = {
"cross_org_uuids": {
"max_items": 1,
},
}

@cached_property
def openapi_types(_):
from datadog_api_client.v2.model.apm_resource_stats_data_source import ApmResourceStatsDataSource
from datadog_api_client.v2.model.apm_resource_stat_name import ApmResourceStatName

return {
"cross_org_uuids": ([str],),
"data_source": (ApmResourceStatsDataSource,),
"env": (str,),
"group_by": ([str],),
Expand All @@ -38,6 +45,7 @@ def openapi_types(_):
}

attribute_map = {
"cross_org_uuids": "cross_org_uuids",
"data_source": "data_source",
"env": "env",
"group_by": "group_by",
Expand All @@ -57,6 +65,7 @@ def __init__(
name: str,
service: str,
stat: ApmResourceStatName,
cross_org_uuids: Union[List[str], UnsetType] = unset,
group_by: Union[List[str], UnsetType] = unset,
operation_name: Union[str, UnsetType] = unset,
primary_tag_name: Union[str, UnsetType] = unset,
Expand All @@ -67,6 +76,9 @@ def __init__(
"""
A query for APM resource statistics such as latency, error rate, and hit count, grouped by resource name.

:param cross_org_uuids: Organization UUIDs to query when using `cross-organization visibility </account_management/org_settings/cross_org_visibility/>`_. Limited to one organization UUID.
:type cross_org_uuids: [str], optional

:param data_source: A data source for APM resource statistics queries.
:type data_source: ApmResourceStatsDataSource

Expand Down Expand Up @@ -97,6 +109,8 @@ def __init__(
:param stat: The APM resource statistic to query.
:type stat: ApmResourceStatName
"""
if cross_org_uuids is not unset:
kwargs["cross_org_uuids"] = cross_org_uuids
if group_by is not unset:
kwargs["group_by"] = group_by
if operation_name is not unset:
Expand Down
14 changes: 14 additions & 0 deletions src/datadog_api_client/v2/model/container_scalar_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@


class ContainerScalarQuery(ModelNormal):
validations = {
"cross_org_uuids": {
"max_items": 1,
},
}

@cached_property
def openapi_types(_):
from datadog_api_client.v2.model.metrics_aggregator import MetricsAggregator
Expand All @@ -28,6 +34,7 @@ def openapi_types(_):

return {
"aggregator": (MetricsAggregator,),
"cross_org_uuids": ([str],),
"data_source": (ContainerDataSource,),
"is_normalized_cpu": (bool,),
"limit": (int,),
Expand All @@ -40,6 +47,7 @@ def openapi_types(_):

attribute_map = {
"aggregator": "aggregator",
"cross_org_uuids": "cross_org_uuids",
"data_source": "data_source",
"is_normalized_cpu": "is_normalized_cpu",
"limit": "limit",
Expand All @@ -56,6 +64,7 @@ def __init__(
metric: str,
name: str,
aggregator: Union[MetricsAggregator, UnsetType] = unset,
cross_org_uuids: Union[List[str], UnsetType] = unset,
is_normalized_cpu: Union[bool, UnsetType] = unset,
limit: Union[int, UnsetType] = unset,
sort: Union[QuerySortOrder, UnsetType] = unset,
Expand All @@ -69,6 +78,9 @@ def __init__(
:param aggregator: The type of aggregation that can be performed on metrics-based queries.
:type aggregator: MetricsAggregator, optional

:param cross_org_uuids: Organization UUIDs to query when using `cross-organization visibility </account_management/org_settings/cross_org_visibility/>`_. Limited to one organization UUID.
:type cross_org_uuids: [str], optional

:param data_source: A data source for container-level infrastructure metrics.
:type data_source: ContainerDataSource

Expand All @@ -95,6 +107,8 @@ def __init__(
"""
if aggregator is not unset:
kwargs["aggregator"] = aggregator
if cross_org_uuids is not unset:
kwargs["cross_org_uuids"] = cross_org_uuids
if is_normalized_cpu is not unset:
kwargs["is_normalized_cpu"] = is_normalized_cpu
if limit is not unset:
Expand Down
Loading
Loading