Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
99d1f82
Fixing tests
adussarps Jul 28, 2020
0e40286
Adding rule create response
adussarps Jul 28, 2020
aff60b6
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 28, 2020
009ff4b
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 28, 2020
7aabbcc
Updating test and casette
adussarps Jul 28, 2020
f632991
Merge branch 'datadog-api-spec/test/antoine.dussarps/query_is_req' of…
adussarps Jul 28, 2020
7291cec
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 28, 2020
3f58bfc
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 28, 2020
9346c80
Merge remote-tracking branch 'origin/master' into datadog-api-spec/te…
adussarps Jul 29, 2020
62ead53
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 29, 2020
9a13e7f
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 29, 2020
c922f67
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 29, 2020
717d03d
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 29, 2020
236e936
Merge remote-tracking branch 'origin/master' into datadog-api-spec/te…
adussarps Jul 29, 2020
3126fb0
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 29, 2020
9e3412a
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 29, 2020
6374619
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 30, 2020
94d4e5f
Using rule response
adussarps Jul 30, 2020
4431dc7
Merge branch 'datadog-api-spec/test/antoine.dussarps/query_is_req' of…
adussarps Jul 30, 2020
d0f6a8c
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 30, 2020
f341619
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 31, 2020
083b163
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 31, 2020
a7c4070
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 31, 2020
94df95f
Merge remote-tracking branch 'origin/master' into datadog-api-spec/te…
adussarps Jul 31, 2020
32ba940
Merge branch 'datadog-api-spec/test/antoine.dussarps/query_is_req' of…
adussarps Jul 31, 2020
180c652
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
api-clients-generation-pipeline[bot] Jul 31, 2020
0252e7c
Merge branch 'master' into datadog-api-spec/test/antoine.dussarps/que…
Jul 31, 2020
7c3efbe
Regenerate client from commit 8f4a24d of spec repo
Jul 31, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.2.0",
"regenerated": "2020-07-31 08:09:38.931974",
"spec_repo_commit": "049bffd"
"regenerated": "2020-07-31 09:08:38.165187",
"spec_repo_commit": "8f4a24d"
},
"v2": {
"apigentools_version": "1.2.0",
"regenerated": "2020-07-31 08:09:45.354418",
"spec_repo_commit": "049bffd"
"regenerated": "2020-07-31 09:08:44.350930",
"spec_repo_commit": "8f4a24d"
}
}
}
6 changes: 6 additions & 0 deletions .openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,14 @@ docs/RolesType.md
docs/SecurityMonitoringApi.md
docs/SecurityMonitoringListRulesResponse.md
docs/SecurityMonitoringRuleCase.md
docs/SecurityMonitoringRuleCaseCreate.md
docs/SecurityMonitoringRuleCreatePayload.md
docs/SecurityMonitoringRuleEvaluationWindow.md
docs/SecurityMonitoringRuleKeepAlive.md
docs/SecurityMonitoringRuleMaxSignalDuration.md
docs/SecurityMonitoringRuleOptions.md
docs/SecurityMonitoringRuleQuery.md
docs/SecurityMonitoringRuleQueryCreate.md
docs/SecurityMonitoringRuleResponse.md
docs/SecurityMonitoringRuleSeverity.md
docs/SecurityMonitoringRuleUpdatePayload.md
Expand Down Expand Up @@ -280,12 +282,14 @@ 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/SecurityMonitoringListRulesResponse.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCase.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCaseCreate.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCreatePayload.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleEvaluationWindow.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleKeepAlive.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleMaxSignalDuration.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleOptions.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleQuery.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleQueryCreate.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleResponse.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleSeverity.java
src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleUpdatePayload.java
Expand Down Expand Up @@ -416,12 +420,14 @@ 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/SecurityMonitoringListRulesResponseTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCaseCreateTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCaseTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleCreatePayloadTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleEvaluationWindowTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleKeepAliveTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleMaxSignalDurationTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleOptionsTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleQueryCreateTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleQueryTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleResponseTest.java
src/test/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleSeverityTest.java
Expand Down
79 changes: 62 additions & 17 deletions api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ tags:
read access on a specific log index to a role can be done in Datadog from the
[Pipelines page](https://app.datadoghq.com/logs/pipelines).
name: Roles
- description: Detection Rules for generating signals
- description: Detection Rules for generating signals.
name: Security Monitoring
- description: Create, edit, and disable users.
externalDocs:
Expand Down Expand Up @@ -3811,7 +3811,7 @@ components:
x-enum-varnames:
- ROLES
SecurityMonitoringListRulesResponse:
description: List of rules
description: List of rules.
example:
data:
- cases:
Expand Down Expand Up @@ -3920,21 +3920,43 @@ components:
properties:
condition:
description: |-
A rule case contains logical operations (>, >=, &&, ||) to determine if a signal should be generated
A rule case contains logical operations (`>`,`>=`, `&&`, `||`) to determine if a signal should be generated
based on the event counts in the previously defined queries.
type: string
name:
description: Name of the case.
type: string
notifications:
description: Notification targets for each rule case
description: Notification targets for each rule case.
items:
description: Notification
description: Notification.
type: string
type: array
status:
$ref: '#/components/schemas/SecurityMonitoringRuleSeverity'
type: object
SecurityMonitoringRuleCaseCreate:
description: Case when signal is generated.
properties:
condition:
description: |-
A rule case contains logical operations (`>`,`>=`, `&&`, `||`) to determine if a signal should be generated
based on the event counts in the previously defined queries.
type: string
name:
description: Name of the case.
type: string
notifications:
description: Notification targets for each rule case.
items:
description: Notification.
type: string
type: array
status:
$ref: '#/components/schemas/SecurityMonitoringRuleSeverity'
required:
- status
type: object
SecurityMonitoringRuleCreatePayload:
description: Create a new rule.
example:
Expand All @@ -3952,7 +3974,7 @@ components:
description: Cases for generating signals.
example: []
items:
$ref: '#/components/schemas/SecurityMonitoringRuleCase'
$ref: '#/components/schemas/SecurityMonitoringRuleCaseCreate'
type: array
isEnabled:
description: Whether the rule is enabled.
Expand All @@ -3962,23 +3984,23 @@ components:
description: Message for generated signals.
type: string
name:
description: The name of the rule
description: The name of the rule.
type: string
options:
$ref: '#/components/schemas/SecurityMonitoringRuleOptions'
queries:
description: Queries for selecting logs which are part of the rule.
example: []
items:
$ref: '#/components/schemas/SecurityMonitoringRuleQuery'
$ref: '#/components/schemas/SecurityMonitoringRuleQueryCreate'
type: array
tags:
description: Tags for generated signals.
example:
- env:prod
- team:security
items:
description: Tag
description: Tag.
type: string
type: array
required:
Expand All @@ -3988,7 +4010,6 @@ components:
- name
- options
- queries
- tags
type: object
SecurityMonitoringRuleEvaluationWindow:
description: |-
Expand Down Expand Up @@ -4096,24 +4117,48 @@ components:
distinctFields:
description: Field for which the cardinality is measured. Sent as an array.
items:
description: Field
description: Field.
type: string
type: array
groupByFields:
description: Fields to group by.
items:
description: Field
description: Field.
type: string
type: array
name:
description: Name of the query
description: Name of the query.
type: string
query:
description: Query to run on logs
description: Query to run on logs.
type: string
type: object
SecurityMonitoringRuleQueryCreate:
description: Query for matching rule.
properties:
distinctFields:
description: Field for which the cardinality is measured. Sent as an array.
items:
description: Field.
type: string
type: array
groupByFields:
description: Fields to group by.
items:
description: Field.
type: string
type: array
name:
description: Name of the query.
type: string
query:
description: Query to run on logs.
type: string
required:
- query
type: object
SecurityMonitoringRuleResponse:
description: Detection rule
description: Detection rule.
example:
cases:
- condition: condition
Expand Down Expand Up @@ -4198,7 +4243,7 @@ components:
tags:
description: Tags for generated signals.
items:
description: Tag
description: Tag.
type: string
type: array
version:
Expand Down Expand Up @@ -4283,7 +4328,7 @@ components:
tags:
description: Tags for generated signals.
items:
description: Tag
description: Tag.
type: string
type: array
type: object
Expand Down
2 changes: 1 addition & 1 deletion api_docs/v2/SecurityMonitoringListRulesResponse.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# SecurityMonitoringListRulesResponse

List of rules
List of rules.
## Properties

Name | Type | Description | Notes
Expand Down
4 changes: 2 additions & 2 deletions api_docs/v2/SecurityMonitoringRuleCase.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Case when signal is generated.

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**condition** | **String** | A rule case contains logical operations (>, >=, &&, ||) to determine if a signal should be generated based on the event counts in the previously defined queries. | [optional]
**condition** | **String** | A rule case contains logical operations (`>`,`>=`, `&&`, `||`) to determine if a signal should be generated based on the event counts in the previously defined queries. | [optional]
**name** | **String** | Name of the case. | [optional]
**notifications** | **List<String>** | Notification targets for each rule case | [optional]
**notifications** | **List<String>** | Notification targets for each rule case. | [optional]
**status** | [**SecurityMonitoringRuleSeverity**](SecurityMonitoringRuleSeverity.md) | | [optional]


Expand Down
16 changes: 16 additions & 0 deletions api_docs/v2/SecurityMonitoringRuleCaseCreate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@


# SecurityMonitoringRuleCaseCreate

Case when signal is generated.
## Properties

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**condition** | **String** | A rule case contains logical operations (`>`,`>=`, `&&`, `||`) to determine if a signal should be generated based on the event counts in the previously defined queries. | [optional]
**name** | **String** | Name of the case. | [optional]
**notifications** | **List<String>** | Notification targets for each rule case. | [optional]
**status** | [**SecurityMonitoringRuleSeverity**](SecurityMonitoringRuleSeverity.md) | |



8 changes: 4 additions & 4 deletions api_docs/v2/SecurityMonitoringRuleCreatePayload.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Create a new rule.

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**cases** | [**List<SecurityMonitoringRuleCase>**](SecurityMonitoringRuleCase.md) | Cases for generating signals. |
**cases** | [**List<SecurityMonitoringRuleCaseCreate>**](SecurityMonitoringRuleCaseCreate.md) | Cases for generating signals. |
**isEnabled** | **Boolean** | Whether the rule is enabled. |
**message** | **String** | Message for generated signals. |
**name** | **String** | The name of the rule |
**name** | **String** | The name of the rule. |
**options** | [**SecurityMonitoringRuleOptions**](SecurityMonitoringRuleOptions.md) | |
**queries** | [**List<SecurityMonitoringRuleQuery>**](SecurityMonitoringRuleQuery.md) | Queries for selecting logs which are part of the rule. |
**tags** | **List<String>** | Tags for generated signals. |
**queries** | [**List<SecurityMonitoringRuleQueryCreate>**](SecurityMonitoringRuleQueryCreate.md) | Queries for selecting logs which are part of the rule. |
**tags** | **List<String>** | Tags for generated signals. | [optional]



4 changes: 2 additions & 2 deletions api_docs/v2/SecurityMonitoringRuleQuery.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**distinctFields** | **List<String>** | Field for which the cardinality is measured. Sent as an array. | [optional]
**groupByFields** | **List<String>** | Fields to group by. | [optional]
**name** | **String** | Name of the query | [optional]
**query** | **String** | Query to run on logs | [optional]
**name** | **String** | Name of the query. | [optional]
**query** | **String** | Query to run on logs. | [optional]



16 changes: 16 additions & 0 deletions api_docs/v2/SecurityMonitoringRuleQueryCreate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@


# SecurityMonitoringRuleQueryCreate

Query for matching rule.
## Properties

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**distinctFields** | **List<String>** | Field for which the cardinality is measured. Sent as an array. | [optional]
**groupByFields** | **List<String>** | Fields to group by. | [optional]
**name** | **String** | Name of the query. | [optional]
**query** | **String** | Query to run on logs. |



2 changes: 1 addition & 1 deletion api_docs/v2/SecurityMonitoringRuleResponse.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# SecurityMonitoringRuleResponse

Detection rule
Detection rule.
## Properties

Name | Type | Description | Notes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@


/**
* List of rules
* List of rules.
*/
@ApiModel(description = "List of rules")
@ApiModel(description = "List of rules.")
@JsonPropertyOrder({
SecurityMonitoringListRulesResponse.JSON_PROPERTY_DATA,
SecurityMonitoringListRulesResponse.JSON_PROPERTY_META
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public SecurityMonitoringRuleCase condition(String condition) {
}

/**
* A rule case contains logical operations (>, >=, &&, ||) to determine if a signal should be generated based on the event counts in the previously defined queries.
* A rule case contains logical operations (`>`,`>=`, `&&`, `||`) to determine if a signal should be generated based on the event counts in the previously defined queries.
* @return condition
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "A rule case contains logical operations (>, >=, &&, ||) to determine if a signal should be generated based on the event counts in the previously defined queries.")
@ApiModelProperty(value = "A rule case contains logical operations (`>`,`>=`, `&&`, `||`) to determine if a signal should be generated based on the event counts in the previously defined queries.")
@JsonProperty(JSON_PROPERTY_CONDITION)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

Expand Down Expand Up @@ -116,11 +116,11 @@ public SecurityMonitoringRuleCase addNotificationsItem(String notificationsItem)
}

/**
* Notification targets for each rule case
* Notification targets for each rule case.
* @return notifications
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "Notification targets for each rule case")
@ApiModelProperty(value = "Notification targets for each rule case.")
@JsonProperty(JSON_PROPERTY_NOTIFICATIONS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

Expand Down
Loading