diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index d829783224a..4ccc2588f40 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -11798,7 +11798,8 @@ components:
The default option results in different behavior depending on the monitor query type.
For monitors using Count queries, an empty monitor evaluation is treated as 0 and is compared to the threshold conditions.
For monitors using any query type other than Count, for example Gauge, Measure, or Rate, the monitor shows the last known status.
- This option is only available for APM Trace Analytics, Audit Trail, CI, Error Tracking, Event, Logs, and RUM monitors.
+ This option is available for APM Trace Analytics, Audit Trail, CI, Error Tracking, Event, Logs, and RUM monitors.
+ The option is also required for metric monitors that use `scheduling_options.custom_schedule`.
enum:
- "default"
- "show_no_data"
diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorOptions.java b/src/main/java/com/datadog/api/client/v1/model/MonitorOptions.java
index 1a1811cd515..1bb8f3d6e28 100644
--- a/src/main/java/com/datadog/api/client/v1/model/MonitorOptions.java
+++ b/src/main/java/com/datadog/api/client/v1/model/MonitorOptions.java
@@ -668,8 +668,9 @@ public MonitorOptions onMissingData(OnMissingDataOption onMissingData) {
* The default option results in different behavior depending on the monitor query type. For
* monitors using Count queries, an empty monitor evaluation is treated as 0 and is compared to
* the threshold conditions. For monitors using any query type other than Count, for example
- * Gauge, Measure, or Rate, the monitor shows the last known status. This option is only available
- * for APM Trace Analytics, Audit Trail, CI, Error Tracking, Event, Logs, and RUM monitors.
+ * Gauge, Measure, or Rate, the monitor shows the last known status. This option is available for
+ * APM Trace Analytics, Audit Trail, CI, Error Tracking, Event, Logs, and RUM monitors. The option
+ * is also required for metric monitors that use scheduling_options.custom_schedule.
*
* @return onMissingData
*/
diff --git a/src/main/java/com/datadog/api/client/v1/model/OnMissingDataOption.java b/src/main/java/com/datadog/api/client/v1/model/OnMissingDataOption.java
index 6576b46cd57..0e9895f44a0 100644
--- a/src/main/java/com/datadog/api/client/v1/model/OnMissingDataOption.java
+++ b/src/main/java/com/datadog/api/client/v1/model/OnMissingDataOption.java
@@ -23,8 +23,9 @@
* default option results in different behavior depending on the monitor query type. For monitors
* using Count queries, an empty monitor evaluation is treated as 0 and is compared to the threshold
* conditions. For monitors using any query type other than Count, for example Gauge, Measure, or
- * Rate, the monitor shows the last known status. This option is only available for APM Trace
- * Analytics, Audit Trail, CI, Error Tracking, Event, Logs, and RUM monitors.
+ * Rate, the monitor shows the last known status. This option is available for APM Trace Analytics,
+ * Audit Trail, CI, Error Tracking, Event, Logs, and RUM monitors. The option is also required for
+ * metric monitors that use scheduling_options.custom_schedule.
*/
@JsonSerialize(using = OnMissingDataOption.OnMissingDataOptionSerializer.class)
public class OnMissingDataOption extends ModelEnum {
diff --git a/src/test/resources/com/datadog/api/client/v1/api/monitors.feature b/src/test/resources/com/datadog/api/client/v1/api/monitors.feature
index eabe7b2afe7..d18caffeae0 100644
--- a/src/test/resources/com/datadog/api/client/v1/api/monitors.feature
+++ b/src/test/resources/com/datadog/api/client/v1/api/monitors.feature
@@ -119,7 +119,7 @@ Feature: Monitors
And the response "name" is equal to "{{ unique }}"
And the response "query" is equal to "avg(current_1mo):avg:system.load.5{*} > 0.5"
- @team:DataDog/monitor-app
+ @oncall-page:monitor-app @team:DataDog/monitor-app
Scenario: Create a metric monitor with a custom schedule returns "OK" response
Given new "CreateMonitor" request
And body with value {"message":"some message Notify: @hipchat-channel","name":"{{ unique }}","query":"avg(current_1mo):avg:system.load.5{*} > 0.5","tags":[],"options":{"thresholds":{"critical":0.5},"notify_audit":false,"include_tags":false,"on_missing_data":"default","scheduling_options":{"evaluation_window":{"day_starts":"04:00", "month_starts":1},"custom_schedule":{"recurrences":[{"rrule":"FREQ=DAILY;INTERVAL=1","timezone":"America/Los_Angeles","start":"2024-10-26T09:13:00"}]}}},"type":"query alert", "draft_status": "published"}