diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index ea9665ada3..715f38f30c 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/docs/datadog_api_client.v1.model.rst b/docs/datadog_api_client.v1.model.rst index 302fcc242a..088bf7a278 100644 --- a/docs/datadog_api_client.v1.model.rst +++ b/docs/datadog_api_client.v1.model.rst @@ -2440,13 +2440,6 @@ datadog\_api\_client.v1.model.monitor\_formula\_and\_function\_cost\_aggregator :members: :show-inheritance: -datadog\_api\_client.v1.model.monitor\_formula\_and\_function\_cost\_data\_source module ----------------------------------------------------------------------------------------- - -.. automodule:: datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source - :members: - :show-inheritance: - datadog\_api\_client.v1.model.monitor\_formula\_and\_function\_cost\_query\_definition module --------------------------------------------------------------------------------------------- diff --git a/examples/v1/monitors/CreateMonitor_1303514967.py b/examples/v1/monitors/CreateMonitor_1303514967.py index 13e7094317..2f1941ffe6 100644 --- a/examples/v1/monitors/CreateMonitor_1303514967.py +++ b/examples/v1/monitors/CreateMonitor_1303514967.py @@ -8,12 +8,12 @@ from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import ( MonitorFormulaAndFunctionCostAggregator, ) -from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import ( - MonitorFormulaAndFunctionCostDataSource, -) from datadog_api_client.v1.model.monitor_formula_and_function_cost_query_definition import ( MonitorFormulaAndFunctionCostQueryDefinition, ) +from datadog_api_client.v1.model.monitor_formula_and_function_metrics_data_source import ( + MonitorFormulaAndFunctionMetricsDataSource, +) from datadog_api_client.v1.model.monitor_options import MonitorOptions from datadog_api_client.v1.model.monitor_thresholds import MonitorThresholds from datadog_api_client.v1.model.monitor_type import MonitorType @@ -35,7 +35,7 @@ ), variables=[ MonitorFormulaAndFunctionCostQueryDefinition( - data_source=MonitorFormulaAndFunctionCostDataSource.CLOUD_COST, + data_source=MonitorFormulaAndFunctionMetricsDataSource.CLOUD_COST, query="sum:aws.cost.net.amortized.shared.resources.allocated{aws_product IN (amplify ,athena, backup, bedrock ) } by {aws_product}.rollup(sum, 86400)", name="query1", aggregator=MonitorFormulaAndFunctionCostAggregator.SUM, diff --git a/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_data_source.py b/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_data_source.py deleted file mode 100644 index e3d1cd0d6e..0000000000 --- a/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_data_source.py +++ /dev/null @@ -1,41 +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. -from __future__ import annotations - - -from datadog_api_client.model_utils import ( - ModelSimple, - cached_property, -) - -from typing import ClassVar - - -class MonitorFormulaAndFunctionCostDataSource(ModelSimple): - """ - Data source for cost queries. - - :param value: Must be one of ["metrics", "cloud_cost", "datadog_usage"]. - :type value: str - """ - - allowed_values = { - "metrics", - "cloud_cost", - "datadog_usage", - } - METRICS: ClassVar["MonitorFormulaAndFunctionCostDataSource"] - CLOUD_COST: ClassVar["MonitorFormulaAndFunctionCostDataSource"] - DATADOG_USAGE: ClassVar["MonitorFormulaAndFunctionCostDataSource"] - - @cached_property - def openapi_types(_): - return { - "value": (str,), - } - - -MonitorFormulaAndFunctionCostDataSource.METRICS = MonitorFormulaAndFunctionCostDataSource("metrics") -MonitorFormulaAndFunctionCostDataSource.CLOUD_COST = MonitorFormulaAndFunctionCostDataSource("cloud_cost") -MonitorFormulaAndFunctionCostDataSource.DATADOG_USAGE = MonitorFormulaAndFunctionCostDataSource("datadog_usage") diff --git a/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_query_definition.py b/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_query_definition.py index ddb719c20f..02e57225b8 100644 --- a/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_query_definition.py +++ b/src/datadog_api_client/v1/model/monitor_formula_and_function_cost_query_definition.py @@ -17,8 +17,8 @@ from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import ( MonitorFormulaAndFunctionCostAggregator, ) - from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import ( - MonitorFormulaAndFunctionCostDataSource, + from datadog_api_client.v1.model.monitor_formula_and_function_metrics_data_source import ( + MonitorFormulaAndFunctionMetricsDataSource, ) @@ -28,13 +28,13 @@ def openapi_types(_): from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import ( MonitorFormulaAndFunctionCostAggregator, ) - from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import ( - MonitorFormulaAndFunctionCostDataSource, + from datadog_api_client.v1.model.monitor_formula_and_function_metrics_data_source import ( + MonitorFormulaAndFunctionMetricsDataSource, ) return { "aggregator": (MonitorFormulaAndFunctionCostAggregator,), - "data_source": (MonitorFormulaAndFunctionCostDataSource,), + "data_source": (MonitorFormulaAndFunctionMetricsDataSource,), "name": (str,), "query": (str,), } @@ -48,7 +48,7 @@ def openapi_types(_): def __init__( self_, - data_source: MonitorFormulaAndFunctionCostDataSource, + data_source: MonitorFormulaAndFunctionMetricsDataSource, name: str, query: str, aggregator: Union[MonitorFormulaAndFunctionCostAggregator, UnsetType] = unset, @@ -60,8 +60,8 @@ def __init__( :param aggregator: Aggregation methods for metric queries. :type aggregator: MonitorFormulaAndFunctionCostAggregator, optional - :param data_source: Data source for cost queries. - :type data_source: MonitorFormulaAndFunctionCostDataSource + :param data_source: Data source for metrics queries. + :type data_source: MonitorFormulaAndFunctionMetricsDataSource :param name: Name of the query for use in formulas. :type name: str diff --git a/src/datadog_api_client/v1/models/__init__.py b/src/datadog_api_client/v1/models/__init__.py index f0e1e5da75..a2efff278b 100644 --- a/src/datadog_api_client/v1/models/__init__.py +++ b/src/datadog_api_client/v1/models/__init__.py @@ -408,9 +408,6 @@ from datadog_api_client.v1.model.monitor_formula_and_function_cost_aggregator import ( MonitorFormulaAndFunctionCostAggregator, ) -from datadog_api_client.v1.model.monitor_formula_and_function_cost_data_source import ( - MonitorFormulaAndFunctionCostDataSource, -) from datadog_api_client.v1.model.monitor_formula_and_function_cost_query_definition import ( MonitorFormulaAndFunctionCostQueryDefinition, ) @@ -1560,7 +1557,6 @@ "MonitorFormulaAndFunctionAggregateQueryJoinCondition", "MonitorFormulaAndFunctionAggregateQueryJoinType", "MonitorFormulaAndFunctionCostAggregator", - "MonitorFormulaAndFunctionCostDataSource", "MonitorFormulaAndFunctionCostQueryDefinition", "MonitorFormulaAndFunctionDataQualityDataSource", "MonitorFormulaAndFunctionDataQualityModelTypeOverride",