Added filters to rule endpoints in security monitoring API

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2020-12-29 08:50:49.572551",
-            "spec_repo_commit": "2554c85"
+            "regenerated": "2020-12-29 12:59:26.229075",
+            "spec_repo_commit": "ca13c42"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2020-12-29 08:51:00.069703",
-            "spec_repo_commit": "2554c85"
+            "regenerated": "2020-12-29 12:59:36.308963",
+            "spec_repo_commit": "ca13c42"
         }
     }
 }

.openapi-generator/FILES

@@ -220,6 +220,8 @@ docs/RolesResponse.md
 docs/RolesSort.md
 docs/RolesType.md
 docs/SecurityMonitoringApi.md
+docs/SecurityMonitoringFilter.md
+docs/SecurityMonitoringFilterAction.md
 docs/SecurityMonitoringListRulesResponse.md
 docs/SecurityMonitoringRuleCase.md
 docs/SecurityMonitoringRuleCaseCreate.md
@@ -510,6 +512,8 @@ src/main/java/com/datadog/api/v2/client/model/RoleUpdateResponseData.java
 src/main/java/com/datadog/api/v2/client/model/RolesResponse.java
 src/main/java/com/datadog/api/v2/client/model/RolesSort.java
 src/main/java/com/datadog/api/v2/client/model/RolesType.java
+src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringFilter.java
+src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringFilterAction.java
 src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringListRulesResponse.java
 src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCase.java
 src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCaseCreate.java
@@ -763,6 +767,8 @@ src/test/java/com/datadog/api/v2/client/model/RoleUpdateResponseTest.java
 src/test/java/com/datadog/api/v2/client/model/RolesResponseTest.java
 src/test/java/com/datadog/api/v2/client/model/RolesSortTest.java
 src/test/java/com/datadog/api/v2/client/model/RolesTypeTest.java
+src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringFilterActionTest.java
+src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringFilterTest.java
 src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringListRulesResponseTest.java
 src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCaseCreateTest.java
 src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCaseTest.java

api/openapi.yaml

@@ -8667,6 +8667,26 @@ components:
       type: string
       x-enum-varnames:
       - ROLES
+    SecurityMonitoringFilter:
+      description: The rule's suppression filter.
+      example:
+        query: query
+      properties:
+        action:
+          $ref: '#/components/schemas/SecurityMonitoringFilterAction'
+        query:
+          description: Query for selecting logs to apply the filtering action.
+          type: string
+      type: object
+    SecurityMonitoringFilterAction:
+      description: The type of filtering action.
+      enum:
+      - require
+      - suppress
+      type: string
+      x-enum-varnames:
+      - REQUIRE
+      - SUPPRESS
     SecurityMonitoringListRulesResponse:
       description: List of rules.
       example:
@@ -8682,6 +8702,9 @@ components:
             notifications:
             - notifications
             - notifications
+          filters:
+          - query: query
+          - query: query
           message: message
           queries:
           - distinctFields:
@@ -8725,6 +8748,9 @@ components:
             notifications:
             - notifications
             - notifications
+          filters:
+          - query: query
+          - query: query
           message: message
           queries:
           - distinctFields:
@@ -8825,6 +8851,9 @@ components:
         isEnabled: true
         name: ""
         options: {}
+        filters:
+        - query: query
+        - query: query
         message: ""
         queries: []
         tags:
@@ -8837,6 +8866,12 @@ components:
           items:
             $ref: '#/components/schemas/SecurityMonitoringRuleCaseCreate'
           type: array
+        filters:
+          description: Additional queries to filter matched events before they are
+            processed.
+          items:
+            $ref: '#/components/schemas/SecurityMonitoringFilter'
+          type: array
         isEnabled:
           description: Whether the rule is enabled.
           example: true
@@ -9067,6 +9102,9 @@ components:
           notifications:
           - notifications
           - notifications
+        filters:
+        - query: query
+        - query: query
         message: message
         queries:
         - distinctFields:
@@ -9113,6 +9151,12 @@ components:
           description: User ID of the user who created the rule.
           format: int64
           type: integer
+        filters:
+          description: Additional queries to filter matched events before they are
+            processed.
+          items:
+            $ref: '#/components/schemas/SecurityMonitoringFilter'
+          type: array
         id:
           description: The ID of the rule.
           type: string
@@ -9180,6 +9224,9 @@ components:
         isEnabled: true
         name: name
         options: {}
+        filters:
+        - query: query
+        - query: query
         message: message
         queries:
         - distinctFields:
@@ -9209,6 +9256,12 @@ components:
           items:
             $ref: '#/components/schemas/SecurityMonitoringRuleCase'
           type: array
+        filters:
+          description: Additional queries to filter matched events before they are
+            processed.
+          items:
+            $ref: '#/components/schemas/SecurityMonitoringFilter'
+          type: array
         isEnabled:
           description: Whether the rule is enabled.
           type: boolean

api_docs/v2/README.md

@@ -285,6 +285,8 @@ Class | Method | HTTP request | Description
  - [RolesResponse](RolesResponse.md)
  - [RolesSort](RolesSort.md)
  - [RolesType](RolesType.md)
+ - [SecurityMonitoringFilter](SecurityMonitoringFilter.md)
+ - [SecurityMonitoringFilterAction](SecurityMonitoringFilterAction.md)
  - [SecurityMonitoringListRulesResponse](SecurityMonitoringListRulesResponse.md)
  - [SecurityMonitoringRuleCase](SecurityMonitoringRuleCase.md)
  - [SecurityMonitoringRuleCaseCreate](SecurityMonitoringRuleCaseCreate.md)

api_docs/v2/SecurityMonitoringFilter.md

@@ -0,0 +1,14 @@
+
+
+# SecurityMonitoringFilter
+
+The rule's suppression filter.
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**action** | **SecurityMonitoringFilterAction** |  |  [optional]
+**query** | **String** | Query for selecting logs to apply the filtering action. |  [optional]
+
+
+

api_docs/v2/SecurityMonitoringFilterAction.md

@@ -0,0 +1,13 @@
+
+
+# SecurityMonitoringFilterAction
+
+## Enum
+
+
+* `REQUIRE` (value: `"require"`)
+
+* `SUPPRESS` (value: `"suppress"`)
+
+
+

api_docs/v2/SecurityMonitoringRuleCreatePayload.md

@@ -8,6 +8,7 @@ Create a new rule.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cases** | [**List<SecurityMonitoringRuleCaseCreate>**](SecurityMonitoringRuleCaseCreate.md) | Cases for generating signals. | 
+**filters** | [**List<SecurityMonitoringFilter>**](SecurityMonitoringFilter.md) | Additional queries to filter matched events before they are processed. |  [optional]
 **isEnabled** | **Boolean** | Whether the rule is enabled. | 
 **message** | **String** | Message for generated signals. | 
 **name** | **String** | The name of the rule. | 

api_docs/v2/SecurityMonitoringRuleResponse.md

@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **cases** | [**List<SecurityMonitoringRuleCase>**](SecurityMonitoringRuleCase.md) | Cases for generating signals. |  [optional]
 **createdAt** | **Long** | When the rule was created, timestamp in milliseconds. |  [optional]
 **creationAuthorId** | **Long** | User ID of the user who created the rule. |  [optional]
+**filters** | [**List<SecurityMonitoringFilter>**](SecurityMonitoringFilter.md) | Additional queries to filter matched events before they are processed. |  [optional]
 **id** | **String** | The ID of the rule. |  [optional]
 **isDefault** | **Boolean** | Whether the rule is included by default. |  [optional]
 **isDeleted** | **Boolean** | Whether the rule has been deleted. |  [optional]

api_docs/v2/SecurityMonitoringRuleUpdatePayload.md

@@ -8,6 +8,7 @@ Update an existing rule.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cases** | [**List<SecurityMonitoringRuleCase>**](SecurityMonitoringRuleCase.md) | Cases for generating signals. |  [optional]
+**filters** | [**List<SecurityMonitoringFilter>**](SecurityMonitoringFilter.md) | Additional queries to filter matched events before they are processed. |  [optional]
 **isEnabled** | **Boolean** | Whether the rule is enabled. |  [optional]
 **message** | **String** | Message for generated signals. |  [optional]
 **name** | **String** | Name of the rule. |  [optional]

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

@@ -0,0 +1,139 @@
+/*
+ * 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.
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package com.datadog.api.v2.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
+import com.datadog.api.v2.client.model.SecurityMonitoringFilterAction;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.datadog.api.v2.client.JSON;
+
+
+/**
+ * The rule's suppression filter.
+ */
+@ApiModel(description = "The rule's suppression filter.")
+@JsonPropertyOrder({
+  SecurityMonitoringFilter.JSON_PROPERTY_ACTION,
+  SecurityMonitoringFilter.JSON_PROPERTY_QUERY
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class SecurityMonitoringFilter {
+  public static final String JSON_PROPERTY_ACTION = "action";
+  private SecurityMonitoringFilterAction action;
+
+  public static final String JSON_PROPERTY_QUERY = "query";
+  private String query;
+
+
+  public SecurityMonitoringFilter action(SecurityMonitoringFilterAction action) {
+    this.action = action;
+    return this;
+  }
+
+   /**
+   * Get action
+   * @return action
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ACTION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public SecurityMonitoringFilterAction getAction() {
+    return action;
+  }
+
+
+  public void setAction(SecurityMonitoringFilterAction action) {
+    this.action = action;
+  }
+
+
+  public SecurityMonitoringFilter query(String query) {
+    this.query = query;
+    return this;
+  }
+
+   /**
+   * Query for selecting logs to apply the filtering action.
+   * @return query
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Query for selecting logs to apply the filtering action.")
+  @JsonProperty(JSON_PROPERTY_QUERY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getQuery() {
+    return query;
+  }
+
+
+  public void setQuery(String query) {
+    this.query = query;
+  }
+
+
+  /**
+   * Return true if this SecurityMonitoringFilter object is equal to o.
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SecurityMonitoringFilter securityMonitoringFilter = (SecurityMonitoringFilter) o;
+    return Objects.equals(this.action, securityMonitoringFilter.action) &&
+        Objects.equals(this.query, securityMonitoringFilter.query);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(action, query);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SecurityMonitoringFilter {\n");
+    sb.append("    action: ").append(toIndentedString(action)).append("\n");
+    sb.append("    query: ").append(toIndentedString(query)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+