Skip to content

Commit f1d180f

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

File tree

6 files changed

+77
-13
lines changed

6 files changed

+77
-13
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"

docs/datadog_api_client.v1.model.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,6 +2447,13 @@ datadog\_api\_client.v1.model.monitor\_formula\_and\_function\_cost\_aggregator
24472447
:members:
24482448
:show-inheritance:
24492449

2450+
datadog\_api\_client.v1.model.monitor\_formula\_and\_function\_cost\_data\_source module
2451+
----------------------------------------------------------------------------------------
2452+
2453+
.. automodule:: datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source
2454+
:members:
2455+
:show-inheritance:
2456+
24502457
datadog\_api\_client.v1.model.monitor\_formula\_and\_function\_cost\_query\_definition module
24512458
---------------------------------------------------------------------------------------------
24522459

examples/v1/monitors/CreateMonitor_1303514967.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import (
99
MonitorFormulaAndFunctionCostAggregator,
1010
)
11+
from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import (
12+
MonitorFormulaAndFunctionCostDataSource,
13+
)
1114
from datadog_api_client.v1.model.monitor_formula_and_function_cost_query_definition import (
1215
MonitorFormulaAndFunctionCostQueryDefinition,
1316
)
14-
from datadog_api_client.v1.model.monitor_formula_and_function_metrics_data_source import (
15-
MonitorFormulaAndFunctionMetricsDataSource,
16-
)
1717
from datadog_api_client.v1.model.monitor_options import MonitorOptions
1818
from datadog_api_client.v1.model.monitor_thresholds import MonitorThresholds
1919
from datadog_api_client.v1.model.monitor_type import MonitorType
@@ -35,7 +35,7 @@
3535
),
3636
variables=[
3737
MonitorFormulaAndFunctionCostQueryDefinition(
38-
data_source=MonitorFormulaAndFunctionMetricsDataSource.CLOUD_COST,
38+
data_source=MonitorFormulaAndFunctionCostDataSource.CLOUD_COST,
3939
query="sum:aws.cost.net.amortized.shared.resources.allocated{aws_product IN (amplify ,athena, backup, bedrock ) } by {aws_product}.rollup(sum, 86400)",
4040
name="query1",
4141
aggregator=MonitorFormulaAndFunctionCostAggregator.SUM,
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
2+
# This product includes software developed at Datadog (https://www.datadoghq.com/).
3+
# Copyright 2019-Present Datadog, Inc.
4+
from __future__ import annotations
5+
6+
7+
from datadog_api_client.model_utils import (
8+
ModelSimple,
9+
cached_property,
10+
)
11+
12+
from typing import ClassVar
13+
14+
15+
class MonitorFormulaAndFunctionCostDataSource(ModelSimple):
16+
"""
17+
Data source for cost queries.
18+
19+
:param value: Must be one of ["metrics", "cloud_cost", "datadog_usage"].
20+
:type value: str
21+
"""
22+
23+
allowed_values = {
24+
"metrics",
25+
"cloud_cost",
26+
"datadog_usage",
27+
}
28+
METRICS: ClassVar["MonitorFormulaAndFunctionCostDataSource"]
29+
CLOUD_COST: ClassVar["MonitorFormulaAndFunctionCostDataSource"]
30+
DATADOG_USAGE: ClassVar["MonitorFormulaAndFunctionCostDataSource"]
31+
32+
@cached_property
33+
def openapi_types(_):
34+
return {
35+
"value": (str,),
36+
}
37+
38+
39+
MonitorFormulaAndFunctionCostDataSource.METRICS = MonitorFormulaAndFunctionCostDataSource("metrics")
40+
MonitorFormulaAndFunctionCostDataSource.CLOUD_COST = MonitorFormulaAndFunctionCostDataSource("cloud_cost")
41+
MonitorFormulaAndFunctionCostDataSource.DATADOG_USAGE = MonitorFormulaAndFunctionCostDataSource("datadog_usage")

src/datadog_api_client/v1/model/monitor_formula_and_function_cost_query_definition.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import (
1818
MonitorFormulaAndFunctionCostAggregator,
1919
)
20-
from datadog_api_client.v1.model.monitor_formula_and_function_metrics_data_source import (
21-
MonitorFormulaAndFunctionMetricsDataSource,
20+
from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import (
21+
MonitorFormulaAndFunctionCostDataSource,
2222
)
2323

2424

@@ -28,13 +28,13 @@ def openapi_types(_):
2828
from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import (
2929
MonitorFormulaAndFunctionCostAggregator,
3030
)
31-
from datadog_api_client.v1.model.monitor_formula_and_function_metrics_data_source import (
32-
MonitorFormulaAndFunctionMetricsDataSource,
31+
from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import (
32+
MonitorFormulaAndFunctionCostDataSource,
3333
)
3434

3535
return {
3636
"aggregator": (MonitorFormulaAndFunctionCostAggregator,),
37-
"data_source": (MonitorFormulaAndFunctionMetricsDataSource,),
37+
"data_source": (MonitorFormulaAndFunctionCostDataSource,),
3838
"name": (str,),
3939
"query": (str,),
4040
}
@@ -48,7 +48,7 @@ def openapi_types(_):
4848

4949
def __init__(
5050
self_,
51-
data_source: MonitorFormulaAndFunctionMetricsDataSource,
51+
data_source: MonitorFormulaAndFunctionCostDataSource,
5252
name: str,
5353
query: str,
5454
aggregator: Union[MonitorFormulaAndFunctionCostAggregator, UnsetType] = unset,
@@ -60,8 +60,8 @@ def __init__(
6060
:param aggregator: Aggregation methods for metric queries.
6161
:type aggregator: MonitorFormulaAndFunctionCostAggregator, optional
6262
63-
:param data_source: Data source for metrics queries.
64-
:type data_source: MonitorFormulaAndFunctionMetricsDataSource
63+
:param data_source: Data source for cost queries.
64+
:type data_source: MonitorFormulaAndFunctionCostDataSource
6565
6666
:param name: Name of the query for use in formulas.
6767
:type name: str

src/datadog_api_client/v1/models/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,9 @@
409409
from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import (
410410
MonitorFormulaAndFunctionCostAggregator,
411411
)
412+
from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import (
413+
MonitorFormulaAndFunctionCostDataSource,
414+
)
412415
from datadog_api_client.v1.model.monitor_formula_and_function_cost_query_definition import (
413416
MonitorFormulaAndFunctionCostQueryDefinition,
414417
)
@@ -1559,6 +1562,7 @@
15591562
"MonitorFormulaAndFunctionAggregateQueryJoinCondition",
15601563
"MonitorFormulaAndFunctionAggregateQueryJoinType",
15611564
"MonitorFormulaAndFunctionCostAggregator",
1565+
"MonitorFormulaAndFunctionCostDataSource",
15621566
"MonitorFormulaAndFunctionCostQueryDefinition",
15631567
"MonitorFormulaAndFunctionDataQualityDataSource",
15641568
"MonitorFormulaAndFunctionDataQualityModelTypeOverride",

0 commit comments

Comments
 (0)