Skip to content

Commit ce359b7

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Remove duplicate MonitorFormulaAndFunctionCostDataSource schema (#3620)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent a57af86 commit ce359b7

File tree

4 files changed

+10
-88
lines changed

4 files changed

+10
-88
lines changed

.generator/schemas/v1/openapi.yaml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8024,25 +8024,13 @@ components:
80248024
- L2NORM
80258025
- PERCENTILE
80268026
- STDDEV
8027-
MonitorFormulaAndFunctionCostDataSource:
8028-
description: Data source for cost queries.
8029-
enum:
8030-
- metrics
8031-
- cloud_cost
8032-
- datadog_usage
8033-
example: cloud_cost
8034-
type: string
8035-
x-enum-varnames:
8036-
- METRICS
8037-
- CLOUD_COST
8038-
- DATADOG_USAGE
80398027
MonitorFormulaAndFunctionCostQueryDefinition:
80408028
description: A formula and functions cost query.
80418029
properties:
80428030
aggregator:
80438031
$ref: '#/components/schemas/MonitorFormulaAndFunctionCostAggregator'
80448032
data_source:
8045-
$ref: '#/components/schemas/MonitorFormulaAndFunctionCostDataSource'
8033+
$ref: '#/components/schemas/MonitorFormulaAndFunctionMetricsDataSource'
80468034
name:
80478035
description: Name of the query for use in formulas.
80488036
example: query1

examples/v1/monitors/CreateMonitor_1303514967.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.datadog.api.client.v1.api.MonitorsApi;
66
import com.datadog.api.client.v1.model.Monitor;
77
import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionCostAggregator;
8-
import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionCostDataSource;
98
import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionCostQueryDefinition;
9+
import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionMetricsDataSource;
1010
import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionQueryDefinition;
1111
import com.datadog.api.client.v1.model.MonitorOptions;
1212
import com.datadog.api.client.v1.model.MonitorThresholds;
@@ -37,7 +37,8 @@ public static void main(String[] args) {
3737
Collections.singletonList(
3838
new MonitorFormulaAndFunctionQueryDefinition(
3939
new MonitorFormulaAndFunctionCostQueryDefinition()
40-
.dataSource(MonitorFormulaAndFunctionCostDataSource.CLOUD_COST)
40+
.dataSource(
41+
MonitorFormulaAndFunctionMetricsDataSource.CLOUD_COST)
4142
.query(
4243
"sum:aws.cost.net.amortized.shared.resources.allocated{aws_product"
4344
+ " IN (amplify ,athena, backup, bedrock ) } by"

src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostDataSource.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostQueryDefinition.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class MonitorFormulaAndFunctionCostQueryDefinition {
3232
private MonitorFormulaAndFunctionCostAggregator aggregator;
3333

3434
public static final String JSON_PROPERTY_DATA_SOURCE = "data_source";
35-
private MonitorFormulaAndFunctionCostDataSource dataSource;
35+
private MonitorFormulaAndFunctionMetricsDataSource dataSource;
3636

3737
public static final String JSON_PROPERTY_NAME = "name";
3838
private String name;
@@ -45,7 +45,7 @@ public MonitorFormulaAndFunctionCostQueryDefinition() {}
4545
@JsonCreator
4646
public MonitorFormulaAndFunctionCostQueryDefinition(
4747
@JsonProperty(required = true, value = JSON_PROPERTY_DATA_SOURCE)
48-
MonitorFormulaAndFunctionCostDataSource dataSource,
48+
MonitorFormulaAndFunctionMetricsDataSource dataSource,
4949
@JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
5050
@JsonProperty(required = true, value = JSON_PROPERTY_QUERY) String query) {
5151
this.dataSource = dataSource;
@@ -81,24 +81,24 @@ public void setAggregator(MonitorFormulaAndFunctionCostAggregator aggregator) {
8181
}
8282

8383
public MonitorFormulaAndFunctionCostQueryDefinition dataSource(
84-
MonitorFormulaAndFunctionCostDataSource dataSource) {
84+
MonitorFormulaAndFunctionMetricsDataSource dataSource) {
8585
this.dataSource = dataSource;
8686
this.unparsed |= !dataSource.isValid();
8787
return this;
8888
}
8989

9090
/**
91-
* Data source for cost queries.
91+
* Data source for metrics queries.
9292
*
9393
* @return dataSource
9494
*/
9595
@JsonProperty(JSON_PROPERTY_DATA_SOURCE)
9696
@JsonInclude(value = JsonInclude.Include.ALWAYS)
97-
public MonitorFormulaAndFunctionCostDataSource getDataSource() {
97+
public MonitorFormulaAndFunctionMetricsDataSource getDataSource() {
9898
return dataSource;
9999
}
100100

101-
public void setDataSource(MonitorFormulaAndFunctionCostDataSource dataSource) {
101+
public void setDataSource(MonitorFormulaAndFunctionMetricsDataSource dataSource) {
102102
if (!dataSource.isValid()) {
103103
this.unparsed = true;
104104
}

0 commit comments

Comments
 (0)