diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index ea9665ada3d..715f38f30c7 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -8024,25 +8024,13 @@ components: - L2NORM - PERCENTILE - STDDEV - MonitorFormulaAndFunctionCostDataSource: - description: Data source for cost queries. - enum: - - metrics - - cloud_cost - - datadog_usage - example: cloud_cost - type: string - x-enum-varnames: - - METRICS - - CLOUD_COST - - DATADOG_USAGE MonitorFormulaAndFunctionCostQueryDefinition: description: A formula and functions cost query. properties: aggregator: $ref: '#/components/schemas/MonitorFormulaAndFunctionCostAggregator' data_source: - $ref: '#/components/schemas/MonitorFormulaAndFunctionCostDataSource' + $ref: '#/components/schemas/MonitorFormulaAndFunctionMetricsDataSource' name: description: Name of the query for use in formulas. example: query1 diff --git a/examples/v1/monitors/CreateMonitor_1303514967.java b/examples/v1/monitors/CreateMonitor_1303514967.java index 4f44920e674..af6a39f4dc0 100644 --- a/examples/v1/monitors/CreateMonitor_1303514967.java +++ b/examples/v1/monitors/CreateMonitor_1303514967.java @@ -5,8 +5,8 @@ import com.datadog.api.client.v1.api.MonitorsApi; import com.datadog.api.client.v1.model.Monitor; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionCostAggregator; -import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionCostDataSource; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionCostQueryDefinition; +import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionMetricsDataSource; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionQueryDefinition; import com.datadog.api.client.v1.model.MonitorOptions; import com.datadog.api.client.v1.model.MonitorThresholds; @@ -37,7 +37,8 @@ public static void main(String[] args) { Collections.singletonList( new MonitorFormulaAndFunctionQueryDefinition( new MonitorFormulaAndFunctionCostQueryDefinition() - .dataSource(MonitorFormulaAndFunctionCostDataSource.CLOUD_COST) + .dataSource( + MonitorFormulaAndFunctionMetricsDataSource.CLOUD_COST) .query( "sum:aws.cost.net.amortized.shared.resources.allocated{aws_product" + " IN (amplify ,athena, backup, bedrock ) } by" diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostDataSource.java b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostDataSource.java deleted file mode 100644 index 8831a794964..00000000000 --- a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostDataSource.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2019-Present Datadog, Inc. - */ - -package com.datadog.api.client.v1.model; - -import com.datadog.api.client.ModelEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** Data source for cost queries. */ -@JsonSerialize( - using = - MonitorFormulaAndFunctionCostDataSource.MonitorFormulaAndFunctionCostDataSourceSerializer - .class) -public class MonitorFormulaAndFunctionCostDataSource extends ModelEnum { - - private static final Set allowedValues = - new HashSet(Arrays.asList("metrics", "cloud_cost", "datadog_usage")); - - public static final MonitorFormulaAndFunctionCostDataSource METRICS = - new MonitorFormulaAndFunctionCostDataSource("metrics"); - public static final MonitorFormulaAndFunctionCostDataSource CLOUD_COST = - new MonitorFormulaAndFunctionCostDataSource("cloud_cost"); - public static final MonitorFormulaAndFunctionCostDataSource DATADOG_USAGE = - new MonitorFormulaAndFunctionCostDataSource("datadog_usage"); - - MonitorFormulaAndFunctionCostDataSource(String value) { - super(value, allowedValues); - } - - public static class MonitorFormulaAndFunctionCostDataSourceSerializer - extends StdSerializer { - public MonitorFormulaAndFunctionCostDataSourceSerializer( - Class t) { - super(t); - } - - public MonitorFormulaAndFunctionCostDataSourceSerializer() { - this(null); - } - - @Override - public void serialize( - MonitorFormulaAndFunctionCostDataSource value, - JsonGenerator jgen, - SerializerProvider provider) - throws IOException, JsonProcessingException { - jgen.writeObject(value.value); - } - } - - @JsonCreator - public static MonitorFormulaAndFunctionCostDataSource fromValue(String value) { - return new MonitorFormulaAndFunctionCostDataSource(value); - } -} diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostQueryDefinition.java b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostQueryDefinition.java index 395d4ac391b..b117350bd0f 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostQueryDefinition.java +++ b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostQueryDefinition.java @@ -32,7 +32,7 @@ public class MonitorFormulaAndFunctionCostQueryDefinition { private MonitorFormulaAndFunctionCostAggregator aggregator; public static final String JSON_PROPERTY_DATA_SOURCE = "data_source"; - private MonitorFormulaAndFunctionCostDataSource dataSource; + private MonitorFormulaAndFunctionMetricsDataSource dataSource; public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -45,7 +45,7 @@ public MonitorFormulaAndFunctionCostQueryDefinition() {} @JsonCreator public MonitorFormulaAndFunctionCostQueryDefinition( @JsonProperty(required = true, value = JSON_PROPERTY_DATA_SOURCE) - MonitorFormulaAndFunctionCostDataSource dataSource, + MonitorFormulaAndFunctionMetricsDataSource dataSource, @JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name, @JsonProperty(required = true, value = JSON_PROPERTY_QUERY) String query) { this.dataSource = dataSource; @@ -81,24 +81,24 @@ public void setAggregator(MonitorFormulaAndFunctionCostAggregator aggregator) { } public MonitorFormulaAndFunctionCostQueryDefinition dataSource( - MonitorFormulaAndFunctionCostDataSource dataSource) { + MonitorFormulaAndFunctionMetricsDataSource dataSource) { this.dataSource = dataSource; this.unparsed |= !dataSource.isValid(); return this; } /** - * Data source for cost queries. + * Data source for metrics queries. * * @return dataSource */ @JsonProperty(JSON_PROPERTY_DATA_SOURCE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public MonitorFormulaAndFunctionCostDataSource getDataSource() { + public MonitorFormulaAndFunctionMetricsDataSource getDataSource() { return dataSource; } - public void setDataSource(MonitorFormulaAndFunctionCostDataSource dataSource) { + public void setDataSource(MonitorFormulaAndFunctionMetricsDataSource dataSource) { if (!dataSource.isValid()) { this.unparsed = true; }