Skip to content

Remove duplicate MonitorFormulaAndFunctionCostDataSource schema #3620

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

Merged
api-clients-generation-pipeline merged 1 commit into from
Mar 18, 2026
Merged

Remove duplicate MonitorFormulaAndFunctionCostDataSource schema #3620

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
14 changes: 1 addition & 13 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/v1/monitors/CreateMonitor_1303514967.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"
Expand Down
67 changes: 0 additions & 67 deletions src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostDataSource.java
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions ...in/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionCostQueryDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Loading