Skip to content

Add cross_org_uuids to v2 query endpoints #3800

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 #3800

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
42 changes: 41 additions & 1 deletion src/main/java/com/datadog/api/client/v2/model/ApmDependencyStatsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/** A query for APM dependency statistics between services, such as call latency and error rates. */
@JsonPropertyOrder({
ApmDependencyStatsQuery.JSON_PROPERTY_CROSS_ORG_UUIDS,
ApmDependencyStatsQuery.JSON_PROPERTY_DATA_SOURCE,
ApmDependencyStatsQuery.JSON_PROPERTY_ENV,
ApmDependencyStatsQuery.JSON_PROPERTY_IS_UPSTREAM,
Expand All @@ -34,6 +37,9 @@
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
public class ApmDependencyStatsQuery {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_CROSS_ORG_UUIDS = "cross_org_uuids";
private List<String> crossOrgUuids = null;

public static final String JSON_PROPERTY_DATA_SOURCE = "data_source";
private ApmDependencyStatsDataSource dataSource =
ApmDependencyStatsDataSource.APM_DEPENDENCY_STATS;
Expand Down Expand Up @@ -88,6 +94,37 @@ public ApmDependencyStatsQuery(
this.unparsed |= !stat.isValid();
}

public ApmDependencyStatsQuery crossOrgUuids(List<String> crossOrgUuids) {
this.crossOrgUuids = crossOrgUuids;
return this;
}

public ApmDependencyStatsQuery addCrossOrgUuidsItem(String crossOrgUuidsItem) {
if (this.crossOrgUuids == null) {
this.crossOrgUuids = new ArrayList<>();
}
this.crossOrgUuids.add(crossOrgUuidsItem);
return this;
}

/**
* Organization UUIDs to query when using <a
* href="/account_management/org_settings/cross_org_visibility/">cross-organization
* visibility</a>. Limited to one organization UUID.
*
* @return crossOrgUuids
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_CROSS_ORG_UUIDS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<String> getCrossOrgUuids() {
return crossOrgUuids;
}

public void setCrossOrgUuids(List<String> crossOrgUuids) {
this.crossOrgUuids = crossOrgUuids;
}

public ApmDependencyStatsQuery dataSource(ApmDependencyStatsDataSource dataSource) {
this.dataSource = dataSource;
this.unparsed |= !dataSource.isValid();
Expand Down Expand Up @@ -358,7 +395,8 @@ public boolean equals(Object o) {
return false;
}
ApmDependencyStatsQuery apmDependencyStatsQuery = (ApmDependencyStatsQuery) o;
return Objects.equals(this.dataSource, apmDependencyStatsQuery.dataSource)
return Objects.equals(this.crossOrgUuids, apmDependencyStatsQuery.crossOrgUuids)
&& Objects.equals(this.dataSource, apmDependencyStatsQuery.dataSource)
&& Objects.equals(this.env, apmDependencyStatsQuery.env)
&& Objects.equals(this.isUpstream, apmDependencyStatsQuery.isUpstream)
&& Objects.equals(this.name, apmDependencyStatsQuery.name)
Expand All @@ -374,6 +412,7 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
return Objects.hash(
crossOrgUuids,
dataSource,
env,
isUpstream,
Expand All @@ -391,6 +430,7 @@ public int hashCode() {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ApmDependencyStatsQuery {\n");
sb.append(" crossOrgUuids: ").append(toIndentedString(crossOrgUuids)).append("\n");
sb.append(" dataSource: ").append(toIndentedString(dataSource)).append("\n");
sb.append(" env: ").append(toIndentedString(env)).append("\n");
sb.append(" isUpstream: ").append(toIndentedString(isUpstream)).append("\n");
Expand Down
40 changes: 39 additions & 1 deletion src/main/java/com/datadog/api/client/v2/model/ApmMetricsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* services.
*/
@JsonPropertyOrder({
ApmMetricsQuery.JSON_PROPERTY_CROSS_ORG_UUIDS,
ApmMetricsQuery.JSON_PROPERTY_DATA_SOURCE,
ApmMetricsQuery.JSON_PROPERTY_GROUP_BY,
ApmMetricsQuery.JSON_PROPERTY_NAME,
Expand All @@ -41,6 +42,9 @@
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
public class ApmMetricsQuery {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_CROSS_ORG_UUIDS = "cross_org_uuids";
private List<String> crossOrgUuids = null;

public static final String JSON_PROPERTY_DATA_SOURCE = "data_source";
private ApmMetricsDataSource dataSource = ApmMetricsDataSource.APM_METRICS;

Expand Down Expand Up @@ -92,6 +96,37 @@ public ApmMetricsQuery(
this.unparsed |= !stat.isValid();
}

public ApmMetricsQuery crossOrgUuids(List<String> crossOrgUuids) {
this.crossOrgUuids = crossOrgUuids;
return this;
}

public ApmMetricsQuery addCrossOrgUuidsItem(String crossOrgUuidsItem) {
if (this.crossOrgUuids == null) {
this.crossOrgUuids = new ArrayList<>();
}
this.crossOrgUuids.add(crossOrgUuidsItem);
return this;
}

/**
* Organization UUIDs to query when using <a
* href="/account_management/org_settings/cross_org_visibility/">cross-organization
* visibility</a>. Limited to one organization UUID.
*
* @return crossOrgUuids
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_CROSS_ORG_UUIDS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<String> getCrossOrgUuids() {
return crossOrgUuids;
}

public void setCrossOrgUuids(List<String> crossOrgUuids) {
this.crossOrgUuids = crossOrgUuids;
}

public ApmMetricsQuery dataSource(ApmMetricsDataSource dataSource) {
this.dataSource = dataSource;
this.unparsed |= !dataSource.isValid();
Expand Down Expand Up @@ -426,7 +461,8 @@ public boolean equals(Object o) {
return false;
}
ApmMetricsQuery apmMetricsQuery = (ApmMetricsQuery) o;
return Objects.equals(this.dataSource, apmMetricsQuery.dataSource)
return Objects.equals(this.crossOrgUuids, apmMetricsQuery.crossOrgUuids)
&& Objects.equals(this.dataSource, apmMetricsQuery.dataSource)
&& Objects.equals(this.groupBy, apmMetricsQuery.groupBy)
&& Objects.equals(this.name, apmMetricsQuery.name)
&& Objects.equals(this.operationMode, apmMetricsQuery.operationMode)
Expand All @@ -444,6 +480,7 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
return Objects.hash(
crossOrgUuids,
dataSource,
groupBy,
name,
Expand All @@ -463,6 +500,7 @@ public int hashCode() {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ApmMetricsQuery {\n");
sb.append(" crossOrgUuids: ").append(toIndentedString(crossOrgUuids)).append("\n");
sb.append(" dataSource: ").append(toIndentedString(dataSource)).append("\n");
sb.append(" groupBy: ").append(toIndentedString(groupBy)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
Expand Down
40 changes: 39 additions & 1 deletion src/main/java/com/datadog/api/client/v2/model/ApmResourceStatsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* resource name.
*/
@JsonPropertyOrder({
ApmResourceStatsQuery.JSON_PROPERTY_CROSS_ORG_UUIDS,
ApmResourceStatsQuery.JSON_PROPERTY_DATA_SOURCE,
ApmResourceStatsQuery.JSON_PROPERTY_ENV,
ApmResourceStatsQuery.JSON_PROPERTY_GROUP_BY,
Expand All @@ -39,6 +40,9 @@
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
public class ApmResourceStatsQuery {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_CROSS_ORG_UUIDS = "cross_org_uuids";
private List<String> crossOrgUuids = null;

public static final String JSON_PROPERTY_DATA_SOURCE = "data_source";
private ApmResourceStatsDataSource dataSource = ApmResourceStatsDataSource.APM_RESOURCE_STATS;

Expand Down Expand Up @@ -88,6 +92,37 @@ public ApmResourceStatsQuery(
this.unparsed |= !stat.isValid();
}

public ApmResourceStatsQuery crossOrgUuids(List<String> crossOrgUuids) {
this.crossOrgUuids = crossOrgUuids;
return this;
}

public ApmResourceStatsQuery addCrossOrgUuidsItem(String crossOrgUuidsItem) {
if (this.crossOrgUuids == null) {
this.crossOrgUuids = new ArrayList<>();
}
this.crossOrgUuids.add(crossOrgUuidsItem);
return this;
}

/**
* Organization UUIDs to query when using <a
* href="/account_management/org_settings/cross_org_visibility/">cross-organization
* visibility</a>. Limited to one organization UUID.
*
* @return crossOrgUuids
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_CROSS_ORG_UUIDS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<String> getCrossOrgUuids() {
return crossOrgUuids;
}

public void setCrossOrgUuids(List<String> crossOrgUuids) {
this.crossOrgUuids = crossOrgUuids;
}

public ApmResourceStatsQuery dataSource(ApmResourceStatsDataSource dataSource) {
this.dataSource = dataSource;
this.unparsed |= !dataSource.isValid();
Expand Down Expand Up @@ -368,7 +403,8 @@ public boolean equals(Object o) {
return false;
}
ApmResourceStatsQuery apmResourceStatsQuery = (ApmResourceStatsQuery) o;
return Objects.equals(this.dataSource, apmResourceStatsQuery.dataSource)
return Objects.equals(this.crossOrgUuids, apmResourceStatsQuery.crossOrgUuids)
&& Objects.equals(this.dataSource, apmResourceStatsQuery.dataSource)
&& Objects.equals(this.env, apmResourceStatsQuery.env)
&& Objects.equals(this.groupBy, apmResourceStatsQuery.groupBy)
&& Objects.equals(this.name, apmResourceStatsQuery.name)
Expand All @@ -384,6 +420,7 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
return Objects.hash(
crossOrgUuids,
dataSource,
env,
groupBy,
Expand All @@ -401,6 +438,7 @@ public int hashCode() {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ApmResourceStatsQuery {\n");
sb.append(" crossOrgUuids: ").append(toIndentedString(crossOrgUuids)).append("\n");
sb.append(" dataSource: ").append(toIndentedString(dataSource)).append("\n");
sb.append(" env: ").append(toIndentedString(env)).append("\n");
sb.append(" groupBy: ").append(toIndentedString(groupBy)).append("\n");
Expand Down
Loading
Loading