diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 32d1be79c7a..1031e3c76ea 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -8915,6 +8915,11 @@ components: nullable: true readOnly: true type: string + attributes: + additionalProperties: {} + description: Additional read-only attributes returned for the series. + readOnly: true + type: object display_name: description: Display name of the metric. example: system.cpu.idle @@ -9020,6 +9025,12 @@ components: example: time_series readOnly: true type: string + resp_version: + description: Version of the response format. + example: 1 + format: int64 + readOnly: true + type: integer series: description: List of timeseries queried. items: @@ -9031,11 +9042,27 @@ components: example: ok readOnly: true type: string + times: + description: |- + Legacy field, always returned as an empty list. Timestamps are returned + in the `pointlist` of each entry of `series`. + items: + description: An unused legacy timestamp. + readOnly: true + type: array to_date: description: End of requested time window, milliseconds since Unix epoch. format: int64 readOnly: true type: integer + values: + description: |- + Legacy field, always returned as an empty list. Timeseries values are + returned in the `pointlist` of each entry of `series`. + items: + description: An unused legacy value. + readOnly: true + type: array type: object MetricsQueryUnit: description: Object containing the metric unit family, scale factor, name, and short name. @@ -9046,6 +9073,12 @@ components: example: time readOnly: true type: string + id: + description: Unit identifier. + example: 17 + format: int64 + readOnly: true + type: integer name: description: Unit name example: minute diff --git a/src/main/java/com/datadog/api/client/v1/model/MetricsQueryMetadata.java b/src/main/java/com/datadog/api/client/v1/model/MetricsQueryMetadata.java index 656f7bfb61a..47da029cbf7 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MetricsQueryMetadata.java +++ b/src/main/java/com/datadog/api/client/v1/model/MetricsQueryMetadata.java @@ -21,6 +21,7 @@ /** Object containing all metric names returned and their associated metadata. */ @JsonPropertyOrder({ MetricsQueryMetadata.JSON_PROPERTY_AGGR, + MetricsQueryMetadata.JSON_PROPERTY_ATTRIBUTES, MetricsQueryMetadata.JSON_PROPERTY_DISPLAY_NAME, MetricsQueryMetadata.JSON_PROPERTY_END, MetricsQueryMetadata.JSON_PROPERTY_EXPRESSION, @@ -41,6 +42,9 @@ public class MetricsQueryMetadata { public static final String JSON_PROPERTY_AGGR = "aggr"; private JsonNullable aggr = JsonNullable.undefined(); + public static final String JSON_PROPERTY_ATTRIBUTES = "attributes"; + private Map attributes = null; + public static final String JSON_PROPERTY_DISPLAY_NAME = "display_name"; private String displayName; @@ -103,6 +107,18 @@ private void setAggr_JsonNullable(JsonNullable aggr) { this.aggr = aggr; } + /** + * Additional read-only attributes returned for the series. + * + * @return attributes + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ATTRIBUTES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Map getAttributes() { + return attributes; + } + /** * Display name of the metric. * @@ -307,6 +323,7 @@ public boolean equals(Object o) { } MetricsQueryMetadata metricsQueryMetadata = (MetricsQueryMetadata) o; return Objects.equals(this.aggr, metricsQueryMetadata.aggr) + && Objects.equals(this.attributes, metricsQueryMetadata.attributes) && Objects.equals(this.displayName, metricsQueryMetadata.displayName) && Objects.equals(this.end, metricsQueryMetadata.end) && Objects.equals(this.expression, metricsQueryMetadata.expression) @@ -326,6 +343,7 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash( aggr, + attributes, displayName, end, expression, @@ -346,6 +364,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MetricsQueryMetadata {\n"); sb.append(" aggr: ").append(toIndentedString(aggr)).append("\n"); + sb.append(" attributes: ").append(toIndentedString(attributes)).append("\n"); sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); sb.append(" end: ").append(toIndentedString(end)).append("\n"); sb.append(" expression: ").append(toIndentedString(expression)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v1/model/MetricsQueryResponse.java b/src/main/java/com/datadog/api/client/v1/model/MetricsQueryResponse.java index ff0b74a0634..e2ce0756ce6 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MetricsQueryResponse.java +++ b/src/main/java/com/datadog/api/client/v1/model/MetricsQueryResponse.java @@ -25,9 +25,12 @@ MetricsQueryResponse.JSON_PROPERTY_MESSAGE, MetricsQueryResponse.JSON_PROPERTY_QUERY, MetricsQueryResponse.JSON_PROPERTY_RES_TYPE, + MetricsQueryResponse.JSON_PROPERTY_RESP_VERSION, MetricsQueryResponse.JSON_PROPERTY_SERIES, MetricsQueryResponse.JSON_PROPERTY_STATUS, - MetricsQueryResponse.JSON_PROPERTY_TO_DATE + MetricsQueryResponse.JSON_PROPERTY_TIMES, + MetricsQueryResponse.JSON_PROPERTY_TO_DATE, + MetricsQueryResponse.JSON_PROPERTY_VALUES }) @jakarta.annotation.Generated( value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") @@ -51,15 +54,24 @@ public class MetricsQueryResponse { public static final String JSON_PROPERTY_RES_TYPE = "res_type"; private String resType; + public static final String JSON_PROPERTY_RESP_VERSION = "resp_version"; + private Long respVersion; + public static final String JSON_PROPERTY_SERIES = "series"; private List series = null; public static final String JSON_PROPERTY_STATUS = "status"; private String status; + public static final String JSON_PROPERTY_TIMES = "times"; + private List times = null; + public static final String JSON_PROPERTY_TO_DATE = "to_date"; private Long toDate; + public static final String JSON_PROPERTY_VALUES = "values"; + private List values = null; + /** * Message indicating the errors if status is not ok. * @@ -132,6 +144,18 @@ public String getResType() { return resType; } + /** + * Version of the response format. + * + * @return respVersion + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_RESP_VERSION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getRespVersion() { + return respVersion; + } + /** * List of timeseries queried. * @@ -156,6 +180,19 @@ public String getStatus() { return status; } + /** + * Legacy field, always returned as an empty list. Timestamps are returned in the pointlist + * of each entry of series. + * + * @return times + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_TIMES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getTimes() { + return times; + } + /** * End of requested time window, milliseconds since Unix epoch. * @@ -168,6 +205,19 @@ public Long getToDate() { return toDate; } + /** + * Legacy field, always returned as an empty list. Timeseries values are returned in the + * pointlist of each entry of series. + * + * @return values + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_VALUES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getValues() { + return values; + } + /** * A container for additional, undeclared properties. This is a holder for any undeclared * properties as specified with the 'additionalProperties' keyword in the OAS document. @@ -230,9 +280,12 @@ public boolean equals(Object o) { && Objects.equals(this.message, metricsQueryResponse.message) && Objects.equals(this.query, metricsQueryResponse.query) && Objects.equals(this.resType, metricsQueryResponse.resType) + && Objects.equals(this.respVersion, metricsQueryResponse.respVersion) && Objects.equals(this.series, metricsQueryResponse.series) && Objects.equals(this.status, metricsQueryResponse.status) + && Objects.equals(this.times, metricsQueryResponse.times) && Objects.equals(this.toDate, metricsQueryResponse.toDate) + && Objects.equals(this.values, metricsQueryResponse.values) && Objects.equals(this.additionalProperties, metricsQueryResponse.additionalProperties); } @@ -245,9 +298,12 @@ public int hashCode() { message, query, resType, + respVersion, series, status, + times, toDate, + values, additionalProperties); } @@ -261,9 +317,12 @@ public String toString() { sb.append(" message: ").append(toIndentedString(message)).append("\n"); sb.append(" query: ").append(toIndentedString(query)).append("\n"); sb.append(" resType: ").append(toIndentedString(resType)).append("\n"); + sb.append(" respVersion: ").append(toIndentedString(respVersion)).append("\n"); sb.append(" series: ").append(toIndentedString(series)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" times: ").append(toIndentedString(times)).append("\n"); sb.append(" toDate: ").append(toIndentedString(toDate)).append("\n"); + sb.append(" values: ").append(toIndentedString(values)).append("\n"); sb.append(" additionalProperties: ") .append(toIndentedString(additionalProperties)) .append("\n"); diff --git a/src/main/java/com/datadog/api/client/v1/model/MetricsQueryUnit.java b/src/main/java/com/datadog/api/client/v1/model/MetricsQueryUnit.java index 501cd8a4384..f790fec49a0 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MetricsQueryUnit.java +++ b/src/main/java/com/datadog/api/client/v1/model/MetricsQueryUnit.java @@ -19,6 +19,7 @@ /** Object containing the metric unit family, scale factor, name, and short name. */ @JsonPropertyOrder({ MetricsQueryUnit.JSON_PROPERTY_FAMILY, + MetricsQueryUnit.JSON_PROPERTY_ID, MetricsQueryUnit.JSON_PROPERTY_NAME, MetricsQueryUnit.JSON_PROPERTY_PLURAL, MetricsQueryUnit.JSON_PROPERTY_SCALE_FACTOR, @@ -31,6 +32,9 @@ public class MetricsQueryUnit { public static final String JSON_PROPERTY_FAMILY = "family"; private String family; + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -55,6 +59,18 @@ public String getFamily() { return family; } + /** + * Unit identifier. + * + * @return id + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getId() { + return id; + } + /** * Unit name * @@ -160,6 +176,7 @@ public boolean equals(Object o) { } MetricsQueryUnit metricsQueryUnit = (MetricsQueryUnit) o; return Objects.equals(this.family, metricsQueryUnit.family) + && Objects.equals(this.id, metricsQueryUnit.id) && Objects.equals(this.name, metricsQueryUnit.name) && Objects.equals(this.plural, metricsQueryUnit.plural) && Objects.equals(this.scaleFactor, metricsQueryUnit.scaleFactor) @@ -169,7 +186,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(family, name, plural, scaleFactor, shortName, additionalProperties); + return Objects.hash(family, id, name, plural, scaleFactor, shortName, additionalProperties); } @Override @@ -177,6 +194,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MetricsQueryUnit {\n"); sb.append(" family: ").append(toIndentedString(family)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" plural: ").append(toIndentedString(plural)).append("\n"); sb.append(" scaleFactor: ").append(toIndentedString(scaleFactor)).append("\n");