Add conditional recipients to notification rule

.generator/schemas/v2/openapi.yaml

@@ -29565,6 +29565,8 @@ components:
       additionalProperties: false
       description: Attributes of the monitor notification rule.
       properties:
+        conditional_recipients:
+          $ref: '#/components/schemas/MonitorNotificationRuleConditionalRecipients'
         filter:
           $ref: '#/components/schemas/MonitorNotificationRuleFilter'
         name:
@@ -29573,8 +29575,36 @@ components:
           $ref: '#/components/schemas/MonitorNotificationRuleRecipients'
       required:
       - name
+      type: object
+    MonitorNotificationRuleCondition:
+      description: Conditions for `conditional_recipients`.
+      properties:
+        recipients:
+          $ref: '#/components/schemas/MonitorNotificationRuleRecipients'
+        scope:
+          $ref: '#/components/schemas/MonitorNotificationRuleScope'
+      required:
+      - scope
       - recipients
       type: object
+    MonitorNotificationRuleConditionalRecipients:
+      description: Use conditional recipients to define different recipients for different
+        situations.
+      properties:
+        conditions:
+          description: Conditions of the notification rule.
+          items:
+            $ref: '#/components/schemas/MonitorNotificationRuleCondition'
+          maxItems: 10
+          minItems: 1
+          type: array
+        fallback_recipients:
+          $ref: '#/components/schemas/MonitorNotificationRuleRecipients'
+          description: If none of the `conditions` applied, `fallback_recipients`
+            will get notified.
+      required:
+      - conditions
+      type: object
     MonitorNotificationRuleCreateRequest:
       description: Request for creating a monitor notification rule.
       properties:
@@ -29714,6 +29744,8 @@ components:
       additionalProperties: {}
       description: Attributes of the monitor notification rule.
       properties:
+        conditional_recipients:
+          $ref: '#/components/schemas/MonitorNotificationRuleConditionalRecipients'
         created:
           description: Creation time of the monitor notification rule.
           example: 2020-01-02 03:04:00+00:00
@@ -29735,6 +29767,12 @@ components:
       description: An object related to a monitor notification rule.
       oneOf:
       - $ref: '#/components/schemas/User'
+    MonitorNotificationRuleScope:
+      description: The scope to which the monitor applied.
+      example: transition_type:alert
+      maxLength: 3000
+      minLength: 1
+      type: string
     MonitorNotificationRuleUpdateRequest:
       description: Request for updating a monitor notification rule.
       properties:

examples/v2/monitors/CreateMonitorNotificationRule_1181818787.java

@@ -0,0 +1,56 @@
+// Create a monitor notification rule with conditional recipients returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.MonitorsApi;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleAttributes;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleCondition;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleConditionalRecipients;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleCreateRequest;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleCreateRequestData;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleFilter;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleFilterTags;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleResourceType;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleResponse;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    MonitorsApi apiInstance = new MonitorsApi(defaultClient);
+
+    MonitorNotificationRuleCreateRequest body =
+        new MonitorNotificationRuleCreateRequest()
+            .data(
+                new MonitorNotificationRuleCreateRequestData()
+                    .attributes(
+                        new MonitorNotificationRuleAttributes()
+                            .filter(
+                                new MonitorNotificationRuleFilter(
+                                    new MonitorNotificationRuleFilterTags()
+                                        .tags(Collections.singletonList("test:example-monitor"))))
+                            .name("test rule")
+                            .conditionalRecipients(
+                                new MonitorNotificationRuleConditionalRecipients()
+                                    .conditions(
+                                        Collections.singletonList(
+                                            new MonitorNotificationRuleCondition()
+                                                .scope("transition_type:is_alert")
+                                                .recipients(
+                                                    Arrays.asList(
+                                                        "slack-test-channel", "jira-test"))))))
+                    .type(MonitorNotificationRuleResourceType.MONITOR_NOTIFICATION_RULE));
+
+    try {
+      MonitorNotificationRuleResponse result = apiInstance.createMonitorNotificationRule(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling MonitorsApi#createMonitorNotificationRule");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}

examples/v2/monitors/UpdateMonitorNotificationRule_1400905713.java

@@ -0,0 +1,61 @@
+// Update a monitor notification rule with conditional_recipients returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.MonitorsApi;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleAttributes;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleCondition;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleConditionalRecipients;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleFilter;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleFilterTags;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleResourceType;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleResponse;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleUpdateRequest;
+import com.datadog.api.client.v2.model.MonitorNotificationRuleUpdateRequestData;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    MonitorsApi apiInstance = new MonitorsApi(defaultClient);
+
+    // there is a valid "monitor_notification_rule" in the system
+    String MONITOR_NOTIFICATION_RULE_DATA_ID = System.getenv("MONITOR_NOTIFICATION_RULE_DATA_ID");
+
+    MonitorNotificationRuleUpdateRequest body =
+        new MonitorNotificationRuleUpdateRequest()
+            .data(
+                new MonitorNotificationRuleUpdateRequestData()
+                    .attributes(
+                        new MonitorNotificationRuleAttributes()
+                            .filter(
+                                new MonitorNotificationRuleFilter(
+                                    new MonitorNotificationRuleFilterTags()
+                                        .tags(Arrays.asList("test:example-monitor", "host:abc"))))
+                            .name("updated rule")
+                            .conditionalRecipients(
+                                new MonitorNotificationRuleConditionalRecipients()
+                                    .conditions(
+                                        Collections.singletonList(
+                                            new MonitorNotificationRuleCondition()
+                                                .scope("transition_type:is_alert")
+                                                .recipients(
+                                                    Arrays.asList(
+                                                        "slack-test-channel", "jira-test"))))))
+                    .id(MONITOR_NOTIFICATION_RULE_DATA_ID)
+                    .type(MonitorNotificationRuleResourceType.MONITOR_NOTIFICATION_RULE));
+
+    try {
+      MonitorNotificationRuleResponse result =
+          apiInstance.updateMonitorNotificationRule(MONITOR_NOTIFICATION_RULE_DATA_ID, body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling MonitorsApi#updateMonitorNotificationRule");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}

src/main/java/com/datadog/api/client/v2/model/MonitorNotificationRuleAttributes.java

@@ -17,6 +17,7 @@
 
 /** Attributes of the monitor notification rule. */
 @JsonPropertyOrder({
+  MonitorNotificationRuleAttributes.JSON_PROPERTY_CONDITIONAL_RECIPIENTS,
   MonitorNotificationRuleAttributes.JSON_PROPERTY_FILTER,
   MonitorNotificationRuleAttributes.JSON_PROPERTY_NAME,
   MonitorNotificationRuleAttributes.JSON_PROPERTY_RECIPIENTS
@@ -25,23 +26,48 @@
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class MonitorNotificationRuleAttributes {
   @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_CONDITIONAL_RECIPIENTS = "conditional_recipients";
+  private MonitorNotificationRuleConditionalRecipients conditionalRecipients;
+
   public static final String JSON_PROPERTY_FILTER = "filter";
   private MonitorNotificationRuleFilter filter;
 
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
   public static final String JSON_PROPERTY_RECIPIENTS = "recipients";
-  private List<String> recipients = new ArrayList<>();
+  private List<String> recipients = null;
 
   public MonitorNotificationRuleAttributes() {}
 
   @JsonCreator
   public MonitorNotificationRuleAttributes(
-      @JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
-      @JsonProperty(required = true, value = JSON_PROPERTY_RECIPIENTS) List<String> recipients) {
+      @JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name) {
     this.name = name;
-    this.recipients = recipients;
+  }
+
+  public MonitorNotificationRuleAttributes conditionalRecipients(
+      MonitorNotificationRuleConditionalRecipients conditionalRecipients) {
+    this.conditionalRecipients = conditionalRecipients;
+    this.unparsed |= conditionalRecipients.unparsed;
+    return this;
+  }
+
+  /**
+   * Use conditional recipients to define different recipients for different situations.
+   *
+   * @return conditionalRecipients
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CONDITIONAL_RECIPIENTS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public MonitorNotificationRuleConditionalRecipients getConditionalRecipients() {
+    return conditionalRecipients;
+  }
+
+  public void setConditionalRecipients(
+      MonitorNotificationRuleConditionalRecipients conditionalRecipients) {
+    this.conditionalRecipients = conditionalRecipients;
   }
 
   public MonitorNotificationRuleAttributes filter(MonitorNotificationRuleFilter filter) {
@@ -92,6 +118,9 @@ public MonitorNotificationRuleAttributes recipients(List<String> recipients) {
   }
 
   public MonitorNotificationRuleAttributes addRecipientsItem(String recipientsItem) {
+    if (this.recipients == null) {
+      this.recipients = new ArrayList<>();
+    }
     this.recipients.add(recipientsItem);
     return this;
   }
@@ -102,8 +131,9 @@ public MonitorNotificationRuleAttributes addRecipientsItem(String recipientsItem
    *
    * @return recipients
    */
+  @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RECIPIENTS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public List<String> getRecipients() {
     return recipients;
   }
@@ -123,20 +153,25 @@ public boolean equals(Object o) {
     }
     MonitorNotificationRuleAttributes monitorNotificationRuleAttributes =
         (MonitorNotificationRuleAttributes) o;
-    return Objects.equals(this.filter, monitorNotificationRuleAttributes.filter)
+    return Objects.equals(
+            this.conditionalRecipients, monitorNotificationRuleAttributes.conditionalRecipients)
+        && Objects.equals(this.filter, monitorNotificationRuleAttributes.filter)
         && Objects.equals(this.name, monitorNotificationRuleAttributes.name)
         && Objects.equals(this.recipients, monitorNotificationRuleAttributes.recipients);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(filter, name, recipients);
+    return Objects.hash(conditionalRecipients, filter, name, recipients);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MonitorNotificationRuleAttributes {\n");
+    sb.append("    conditionalRecipients: ")
+        .append(toIndentedString(conditionalRecipients))
+        .append("\n");
     sb.append("    filter: ").append(toIndentedString(filter)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    recipients: ").append(toIndentedString(recipients)).append("\n");