Skip to content

Commit 16f582e

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Revert "Remove duplicate MonitorFormulaAndFunctionCostDataSource schema" (#3757)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 94c3975 commit 16f582e

File tree

5 files changed

+36
-5
lines changed

5 files changed

+36
-5
lines changed

.generator/schemas/v1/openapi.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7524,13 +7524,25 @@ components:
75247524
- L2NORM
75257525
- PERCENTILE
75267526
- STDDEV
7527+
MonitorFormulaAndFunctionCostDataSource:
7528+
description: Data source for cost queries.
7529+
enum:
7530+
- metrics
7531+
- cloud_cost
7532+
- datadog_usage
7533+
example: "cloud_cost"
7534+
type: string
7535+
x-enum-varnames:
7536+
- METRICS
7537+
- CLOUD_COST
7538+
- DATADOG_USAGE
75277539
MonitorFormulaAndFunctionCostQueryDefinition:
75287540
description: A formula and functions cost query.
75297541
properties:
75307542
aggregator:
75317543
$ref: "#/components/schemas/MonitorFormulaAndFunctionCostAggregator"
75327544
data_source:
7533-
$ref: "#/components/schemas/MonitorFormulaAndFunctionMetricsDataSource"
7545+
$ref: "#/components/schemas/MonitorFormulaAndFunctionCostDataSource"
75347546
name:
75357547
description: Name of the query for use in formulas.
75367548
example: "query1"

services/monitors/src/v1/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export { MonitorFormulaAndFunctionAggregateQueryFilter } from "./models/MonitorF
3535
export { MonitorFormulaAndFunctionAggregateQueryJoinCondition } from "./models/MonitorFormulaAndFunctionAggregateQueryJoinCondition";
3636
export { MonitorFormulaAndFunctionAggregateQueryJoinType } from "./models/MonitorFormulaAndFunctionAggregateQueryJoinType";
3737
export { MonitorFormulaAndFunctionCostAggregator } from "./models/MonitorFormulaAndFunctionCostAggregator";
38+
export { MonitorFormulaAndFunctionCostDataSource } from "./models/MonitorFormulaAndFunctionCostDataSource";
3839
export { MonitorFormulaAndFunctionCostQueryDefinition } from "./models/MonitorFormulaAndFunctionCostQueryDefinition";
3940
export { MonitorFormulaAndFunctionDataQualityDataSource } from "./models/MonitorFormulaAndFunctionDataQualityDataSource";
4041
export { MonitorFormulaAndFunctionDataQualityModelTypeOverride } from "./models/MonitorFormulaAndFunctionDataQualityModelTypeOverride";
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { UnparsedObject } from "@datadog/datadog-api-client";
2+
3+
/**
4+
* Data source for cost queries.
5+
*/
6+
export type MonitorFormulaAndFunctionCostDataSource =
7+
| typeof METRICS
8+
| typeof CLOUD_COST
9+
| typeof DATADOG_USAGE
10+
| UnparsedObject;
11+
export const METRICS = "metrics";
12+
export const CLOUD_COST = "cloud_cost";
13+
export const DATADOG_USAGE = "datadog_usage";

services/monitors/src/v1/models/MonitorFormulaAndFunctionCostQueryDefinition.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AttributeTypeMap } from "@datadog/datadog-api-client";
22

33
import { MonitorFormulaAndFunctionCostAggregator } from "./MonitorFormulaAndFunctionCostAggregator";
4-
import { MonitorFormulaAndFunctionMetricsDataSource } from "./MonitorFormulaAndFunctionMetricsDataSource";
4+
import { MonitorFormulaAndFunctionCostDataSource } from "./MonitorFormulaAndFunctionCostDataSource";
55

66
/**
77
* A formula and functions cost query.
@@ -12,9 +12,9 @@ export class MonitorFormulaAndFunctionCostQueryDefinition {
1212
*/
1313
"aggregator"?: MonitorFormulaAndFunctionCostAggregator;
1414
/**
15-
* Data source for metrics queries.
15+
* Data source for cost queries.
1616
*/
17-
"dataSource": MonitorFormulaAndFunctionMetricsDataSource;
17+
"dataSource": MonitorFormulaAndFunctionCostDataSource;
1818
/**
1919
* Name of the query for use in formulas.
2020
*/
@@ -44,7 +44,7 @@ export class MonitorFormulaAndFunctionCostQueryDefinition {
4444
},
4545
dataSource: {
4646
baseName: "data_source",
47-
type: "MonitorFormulaAndFunctionMetricsDataSource",
47+
type: "MonitorFormulaAndFunctionCostDataSource",
4848
required: true,
4949
},
5050
name: {

services/monitors/src/v1/models/TypingInfo.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ export const TypingInfo: ModelTypingInfo = {
7878
"percentile",
7979
"stddev",
8080
],
81+
MonitorFormulaAndFunctionCostDataSource: [
82+
"metrics",
83+
"cloud_cost",
84+
"datadog_usage",
85+
],
8186
MonitorFormulaAndFunctionDataQualityDataSource: ["data_quality_metrics"],
8287
MonitorFormulaAndFunctionDataQualityModelTypeOverride: [
8388
"freshness",

0 commit comments

Comments
 (0)