Monitors Augmented Query Add Group By Source (#3551)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

Author: api-clients-generation-pipeline[bot]

.generator/schemas/v1/openapi.yaml

@@ -8303,6 +8303,10 @@ components:
           description: The name assigned to this aggregation, when multiple aggregations are defined for a query.
           example: "compute_result"
           type: string
+        source:
+          description: Source reference for composite query payloads.
+          example: "filter_query"
+          type: string
       required:
         - aggregation
       type: object
@@ -8330,6 +8334,10 @@ components:
           type: integer
         sort:
           $ref: "#/components/schemas/MonitorFormulaAndFunctionEventQueryGroupBySort"
+        source:
+          description: Source reference for composite query payloads.
+          example: "filter_query"
+          type: string
       required:
         - facet
       type: object

src/datadog_api_client/v1/model/monitor_formula_and_function_event_query_definition_compute.py

@@ -31,13 +31,15 @@ def openapi_types(_):
             "interval": (int,),
             "metric": (str,),
             "name": (str,),
+            "source": (str,),
         }
 
     attribute_map = {
         "aggregation": "aggregation",
         "interval": "interval",
         "metric": "metric",
         "name": "name",
+        "source": "source",
     }
 
     def __init__(
@@ -46,6 +48,7 @@ def __init__(
         interval: Union[int, UnsetType] = unset,
         metric: Union[str, UnsetType] = unset,
         name: Union[str, UnsetType] = unset,
+        source: Union[str, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -62,13 +65,18 @@ def __init__(
 
         :param name: The name assigned to this aggregation, when multiple aggregations are defined for a query.
         :type name: str, optional
+
+        :param source: Source reference for composite query payloads.
+        :type source: str, optional
         """
         if interval is not unset:
             kwargs["interval"] = interval
         if metric is not unset:
             kwargs["metric"] = metric
         if name is not unset:
             kwargs["name"] = name
+        if source is not unset:
+            kwargs["source"] = source
         super().__init__(kwargs)
 
         self_.aggregation = aggregation

src/datadog_api_client/v1/model/monitor_formula_and_function_event_query_group_by.py

@@ -30,19 +30,22 @@ def openapi_types(_):
             "facet": (str,),
             "limit": (int,),
             "sort": (MonitorFormulaAndFunctionEventQueryGroupBySort,),
+            "source": (str,),
         }
 
     attribute_map = {
         "facet": "facet",
         "limit": "limit",
         "sort": "sort",
+        "source": "source",
     }
 
     def __init__(
         self_,
         facet: str,
         limit: Union[int, UnsetType] = unset,
         sort: Union[MonitorFormulaAndFunctionEventQueryGroupBySort, UnsetType] = unset,
+        source: Union[str, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -56,11 +59,16 @@ def __init__(
 
         :param sort: Options for sorting group by results.
         :type sort: MonitorFormulaAndFunctionEventQueryGroupBySort, optional
+
+        :param source: Source reference for composite query payloads.
+        :type source: str, optional
         """
         if limit is not unset:
             kwargs["limit"] = limit
         if sort is not unset:
             kwargs["sort"] = sort
+        if source is not unset:
+            kwargs["source"] = source
         super().__init__(kwargs)
 
         self_.facet = facet

tests/v1/features/monitors.feature

@@ -219,7 +219,7 @@ Feature: Monitors
   Scenario: Edit a monitor returns "Bad Request" response
     Given new "UpdateMonitor" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
-    And body with value {"assets": [{"category": "runbook", "name": "Monitor Runbook", "resource_key": "12345", "resource_type": "notebook", "url": "/notebooks/12345"}], "draft_status": "published", "options": {"evaluation_delay": null, "include_tags": true, "min_failure_duration": 0, "min_location_failed": 1, "new_group_delay": null, "new_host_delay": 300, "no_data_timeframe": null, "notification_preset_name": "show_all", "notify_audit": false, "notify_by": [], "on_missing_data": "default", "renotify_interval": null, "renotify_occurrences": null, "renotify_statuses": ["alert"], "scheduling_options": {"custom_schedule": {"recurrences": [{"rrule": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR", "start": "2023-08-31T16:30:00", "timezone": "Europe/Paris"}]}, "evaluation_window": {"day_starts": "04:00", "hour_starts": 0, "month_starts": 1, "timezone": "Europe/Paris"}}, "synthetics_check_id": null, "threshold_windows": {"recovery_window": null, "trigger_window": null}, "thresholds": {"critical_recovery": null, "ok": null, "unknown": null, "warning": null, "warning_recovery": null}, "timeout_h": null, "variables": [{"compute": {"aggregation": "avg", "interval": 60000, "metric": "@duration", "name": "compute_result"}, "data_source": "rum", "group_by": [{"facet": "status", "limit": 10, "sort": {"aggregation": "avg", "order": "desc"}}], "indexes": ["days-3", "days-7"], "name": "query_errors", "search": {"query": "service:query"}}]}, "priority": null, "restricted_roles": [], "tags": [], "type": "query alert"}
+    And body with value {"assets": [{"category": "runbook", "name": "Monitor Runbook", "resource_key": "12345", "resource_type": "notebook", "url": "/notebooks/12345"}], "draft_status": "published", "options": {"evaluation_delay": null, "include_tags": true, "min_failure_duration": 0, "min_location_failed": 1, "new_group_delay": null, "new_host_delay": 300, "no_data_timeframe": null, "notification_preset_name": "show_all", "notify_audit": false, "notify_by": [], "on_missing_data": "default", "renotify_interval": null, "renotify_occurrences": null, "renotify_statuses": ["alert"], "scheduling_options": {"custom_schedule": {"recurrences": [{"rrule": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR", "start": "2023-08-31T16:30:00", "timezone": "Europe/Paris"}]}, "evaluation_window": {"day_starts": "04:00", "hour_starts": 0, "month_starts": 1, "timezone": "Europe/Paris"}}, "synthetics_check_id": null, "threshold_windows": {"recovery_window": null, "trigger_window": null}, "thresholds": {"critical_recovery": null, "ok": null, "unknown": null, "warning": null, "warning_recovery": null}, "timeout_h": null, "variables": [{"compute": {"aggregation": "avg", "interval": 60000, "metric": "@duration", "name": "compute_result", "source": "filter_query"}, "data_source": "rum", "group_by": [{"facet": "status", "limit": 10, "sort": {"aggregation": "avg", "order": "desc"}, "source": "filter_query"}], "indexes": ["days-3", "days-7"], "name": "query_errors", "search": {"query": "service:query"}}]}, "priority": null, "restricted_roles": [], "tags": [], "type": "query alert"}
     When the request is sent
     Then the response status is 400 Bad Request