Monitor priority can have custom ranges and be null (#2017)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 0713425be652 · 2024-06-28T14:58:47.000Z
Co-authored-by: ci.datadog-api-spec &lt;packages@datadoghq.com&gt;
Co-authored-by: api-clients-generation-pipeline[bot] &lt;54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com&gt;
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-06-27 17:06:08.975577",
-            "spec_repo_commit": "5ebef994"
+            "regenerated": "2024-06-27 21:40:27.727114",
+            "spec_repo_commit": "4ed44e4c"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-06-27 17:06:08.992296",
-            "spec_repo_commit": "5ebef994"
+            "regenerated": "2024-06-27 21:40:27.743937",
+            "spec_repo_commit": "4ed44e4c"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
@@ -6615,8 +6615,6 @@ components:
         priority:
           description: Integer from 1 (high) to 5 (low) indicating alert severity.
           format: int64
-          maximum: 5
-          minimum: 1
           nullable: true
           type: integer
         query:
@@ -7705,8 +7703,7 @@ components:
         priority:
           description: Integer from 1 (high) to 5 (low) indicating alert severity.
           format: int64
-          maximum: 5
-          minimum: 1
+          nullable: true
           type: integer
         query:
           description: The monitor query.
diff --git a/examples/v1/monitors/UpdateMonitor.py b/examples/v1/monitors/UpdateMonitor.py
@@ -15,6 +15,7 @@
 
 body = MonitorUpdateRequest(
     name="My monitor-updated",
+    priority=None,
     options=MonitorOptions(
         evaluation_delay=None,
         new_group_delay=600,
diff --git a/src/datadog_api_client/v1/model/monitor.py b/src/datadog_api_client/v1/model/monitor.py
@@ -25,13 +25,6 @@
 
 
 class Monitor(ModelNormal):
-    validations = {
-        "priority": {
-            "inclusive_maximum": 5,
-            "inclusive_minimum": 1,
-        },
-    }
-
     @cached_property
     def openapi_types(_):
         from datadog_api_client.v1.model.creator import Creator
diff --git a/src/datadog_api_client/v1/model/monitor_update_request.py b/src/datadog_api_client/v1/model/monitor_update_request.py
@@ -24,13 +24,6 @@
 
 
 class MonitorUpdateRequest(ModelNormal):
-    validations = {
-        "priority": {
-            "inclusive_maximum": 5,
-            "inclusive_minimum": 1,
-        },
-    }
-
     @cached_property
     def openapi_types(_):
         from datadog_api_client.v1.model.creator import Creator
@@ -50,7 +43,7 @@ def openapi_types(_):
             "name": (str,),
             "options": (MonitorOptions,),
             "overall_state": (MonitorOverallStates,),
-            "priority": (int,),
+            "priority": (int, none_type),
             "query": (str,),
             "restricted_roles": ([str], none_type),
             "state": (MonitorState,),
@@ -99,7 +92,7 @@ def __init__(
         name: Union[str, UnsetType] = unset,
         options: Union[MonitorOptions, UnsetType] = unset,
         overall_state: Union[MonitorOverallStates, UnsetType] = unset,
-        priority: Union[int, UnsetType] = unset,
+        priority: Union[int, none_type, UnsetType] = unset,
         query: Union[str, UnsetType] = unset,
         restricted_roles: Union[List[str], none_type, UnsetType] = unset,
         state: Union[MonitorState, UnsetType] = unset,
@@ -141,7 +134,7 @@ def __init__(
         :type overall_state: MonitorOverallStates, optional
 
         :param priority: Integer from 1 (high) to 5 (low) indicating alert severity.
-        :type priority: int, optional
+        :type priority: int, none_type, optional
 
         :param query: The monitor query.
         :type query: str, optional
diff --git a/tests/v1/cassettes/test_scenarios/test_edit_a_monitor_returns_ok_response.frozen b/tests/v1/cassettes/test_scenarios/test_edit_a_monitor_returns_ok_response.frozen
@@ -1 +1 @@
-2023-01-18T18:37:19.255Z
+2024-06-20T19:37:04.361Z
diff --git a/tests/v1/cassettes/test_scenarios/test_edit_a_monitor_returns_ok_response.yaml b/tests/v1/cassettes/test_scenarios/test_edit_a_monitor_returns_ok_response.yaml
@@ -1,9 +1,9 @@
 interactions:
 - request:
-    body: '{"message":"some message Notify: @hipchat-channel","name":"Test-Edit_a_monitor_returns_OK_response-1674067039","options":{"enable_logs_sample":true,"escalation_message":"the
+    body: '{"message":"some message Notify: @hipchat-channel","name":"Test-Edit_a_monitor_returns_OK_response-1718912224","options":{"enable_logs_sample":true,"escalation_message":"the
       situation has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo
       AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\")
-      > 2","tags":["test:testeditamonitorreturnsokresponse1674067039","env:ci"],"type":"log
+      > 2","tags":["test:testeditamonitorreturnsokresponse1718912224","env:ci"],"type":"log
       alert"}'
     headers:
       accept:
@@ -14,12 +14,12 @@ interactions:
     uri: https://api.datadoghq.com/api/v1/monitor
   response:
     body:
-      string: '{"id":108260304,"org_id":321813,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1674067039","message":"some
-        message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1674067039","env:ci"],"query":"logs(\"service:foo
+      string: '{"id":147580793,"org_id":237503,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1718912224","message":"some
+        message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1718912224","env:ci"],"query":"logs(\"service:foo
         AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\")
         > 2","options":{"enable_logs_sample":true,"escalation_message":"the situation
-        has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2.0,"warning":1.0},"timeout_h":24,"silenced":{}},"multi":true,"created_at":1674067039000,"created":"2023-01-18T18:37:19.356677+00:00","modified":"2023-01-18T18:37:19.356677+00:00","deleted":null,"restricted_roles":null,"priority":3,"overall_state_modified":null,"overall_state":"No
-        Data","creator":{"name":null,"handle":"frog@datadoghq.com","email":"frog@datadoghq.com","id":1445416}}
+        has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2.0,"warning":1.0},"timeout_h":24,"silenced":{}},"multi":true,"created_at":1718912224000,"created":"2024-06-20T19:37:04.686145+00:00","modified":"2024-06-20T19:37:04.686145+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No
+        Data","creator":{"name":"Carl Martensen","handle":"carl.martensen@datadoghq.com","email":"carl.martensen@datadoghq.com","id":1078685}}
 
         '
     headers:
@@ -29,20 +29,20 @@ interactions:
       code: 200
       message: OK
 - request:
-    body: '{"name":"Test-Edit_a_monitor_returns_OK_response-1674067039-updated","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2,"warning":null},"timeout_h":null}}'
+    body: '{"name":"Test-Edit_a_monitor_returns_OK_response-1718912224-updated","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2,"warning":null},"timeout_h":null},"priority":null}'
     headers:
       accept:
       - application/json
       content-type:
       - application/json
     method: PUT
-    uri: https://api.datadoghq.com/api/v1/monitor/108260304
+    uri: https://api.datadoghq.com/api/v1/monitor/147580793
   response:
     body:
-      string: '{"id":108260304,"org_id":321813,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1674067039-updated","message":"some
-        message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1674067039","env:ci"],"query":"logs(\"service:foo
+      string: '{"id":147580793,"org_id":237503,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1718912224-updated","message":"some
+        message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1718912224","env:ci"],"query":"logs(\"service:foo
         AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\")
-        > 2","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2.0},"timeout_h":null,"notify_no_data":false,"notify_audit":false,"include_tags":true,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1674067039000,"created":"2023-01-18T18:37:19.356677+00:00","modified":"2023-01-18T18:37:19.511143+00:00","deleted":null,"restricted_roles":null,"priority":3,"overall_state_modified":null,"overall_state":"No
+        > 2","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2.0},"timeout_h":null,"notify_no_data":false,"notify_audit":false,"include_tags":true,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1718912224000,"created":"2024-06-20T19:37:04.686145+00:00","modified":"2024-06-20T19:37:05.129654+00:00","deleted":null,"restricted_roles":null,"priority":null,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No
         Data"}
 
         '
@@ -58,10 +58,10 @@ interactions:
       accept:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/monitor/108260304
+    uri: https://api.datadoghq.com/api/v1/monitor/147580793
   response:
     body:
-      string: '{"deleted_monitor_id":108260304}
+      string: '{"deleted_monitor_id":147580793}
 
         '
     headers:
diff --git a/tests/v1/features/monitors.feature b/tests/v1/features/monitors.feature
@@ -157,7 +157,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 {"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}}, "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"}, "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"}}]}, "restricted_roles": [], "tags": [], "type": "query alert"}
+    And body with value {"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}}, "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"}, "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"}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -174,10 +174,11 @@ Feature: Monitors
     Given there is a valid "monitor" in the system
     And new "UpdateMonitor" request
     And request contains "monitor_id" parameter from "monitor.id"
-    And body with value {"name": "{{ monitor.name }}-updated", "options": {"evaluation_delay": null, "new_group_delay": 600, "new_host_delay":null, "renotify_interval":null, "thresholds": {"critical":2, "warning": null}, "timeout_h": null}}
+    And body with value {"name": "{{ monitor.name }}-updated", "priority": null, "options": {"evaluation_delay": null, "new_group_delay": 600, "new_host_delay":null, "renotify_interval":null, "thresholds": {"critical":2, "warning": null}, "timeout_h": null}}
     When the request is sent
     Then the response status is 200 OK
     And the response "name" is equal to "{{ monitor.name }}-updated"
+    And the response "priority" is equal to null
 
   @generated @skip @team:DataDog/monitor-app
   Scenario: Get a monitor's details returns "Bad Request" response

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`"spec_versions": {`
`5`	`5`	`"v1": {`
`6`	`6`	`"apigentools_version": "1.6.6",`
`7`		`- "regenerated": "2024-06-27 17:06:08.975577",`
`8`		`- "spec_repo_commit": "5ebef994"`
	`7`	`+ "regenerated": "2024-06-27 21:40:27.727114",`
	`8`	`+ "spec_repo_commit": "4ed44e4c"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2024-06-27 17:06:08.992296",`
`13`		`- "spec_repo_commit": "5ebef994"`
	`12`	`+ "regenerated": "2024-06-27 21:40:27.743937",`
	`13`	`+ "spec_repo_commit": "4ed44e4c"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2023-01-18T18:37:19.255Z`
	`1`	`+2024-06-20T19:37:04.361Z`