From dde25e78b0d234f6ceb06882c0d6a69f9b80b6cf Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 18 Jun 2025 13:34:57 +0000 Subject: [PATCH] Regenerate client from commit 5e49afe1 of spec repo --- .apigentools-info | 8 +-- .generator/schemas/v2/openapi.yaml | 55 ++++++++++++++++++ .../model/CloudConfigurationRulePayload.java | 56 +++++++++++++++++++ .../v2/model/SecurityMonitoringRuleCase.java | 34 ++++++++++- .../SecurityMonitoringRuleUpdatePayload.java | 56 +++++++++++++++++++ .../SecurityMonitoringSignalRulePayload.java | 56 +++++++++++++++++++ .../SecurityMonitoringSignalRuleResponse.java | 56 +++++++++++++++++++ ...SecurityMonitoringStandardRulePayload.java | 56 +++++++++++++++++++ .../SecurityMonitoringStandardRuleQuery.java | 31 ++++++++++ ...ecurityMonitoringStandardRuleResponse.java | 56 +++++++++++++++++++ .../SecurityMonitoringThirdPartyRuleCase.java | 36 +++++++++++- 11 files changed, 493 insertions(+), 7 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index d0a0c79ca69..804af3c5b95 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2025-06-18 09:42:19.367411", - "spec_repo_commit": "b6151f30" + "regenerated": "2025-06-18 13:32:40.416319", + "spec_repo_commit": "5e49afe1" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2025-06-18 09:42:19.383303", - "spec_repo_commit": "b6151f30" + "regenerated": "2025-06-18 13:32:40.432526", + "spec_repo_commit": "5e49afe1" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 1d57e83d32f..c24700d9c64 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -7246,6 +7246,14 @@ components: type: array complianceSignalOptions: $ref: '#/components/schemas/CloudConfigurationRuleComplianceSignalOptions' + customMessage: + description: Custom/Overridden message for generated signals (used in case + of Default rule update). + type: string + customName: + description: Custom/Overridden name of the rule (used in case of Default + rule update). + type: string filters: description: Additional queries to filter matched events before they are processed. @@ -32768,6 +32776,8 @@ components: based on the event counts in the previously defined queries.' type: string + customStatus: + $ref: '#/components/schemas/SecurityMonitoringRuleSeverity' name: description: Name of the case. type: string @@ -33294,6 +33304,13 @@ components: type: array complianceSignalOptions: $ref: '#/components/schemas/CloudConfigurationRuleComplianceSignalOptions' + customMessage: + description: Custom/Overridden Message for generated signals (used in case + of Default rule update). + type: string + customName: + description: Custom/Overridden name (used in case of Default rule update). + type: string filters: description: Additional queries to filter matched events before they are processed. This field is deprecated for log detection, signal correlation, @@ -33625,6 +33642,14 @@ components: items: $ref: '#/components/schemas/SecurityMonitoringRuleCaseCreate' type: array + customMessage: + description: Custom/Overridden message for generated signals (used in case + of Default rule update). + type: string + customName: + description: Custom/Overridden name of the rule (used in case of Default + rule update). + type: string filters: description: Additional queries to filter matched events before they are processed. This field is deprecated for log detection, signal correlation, @@ -33724,6 +33749,14 @@ components: description: User ID of the user who created the rule. format: int64 type: integer + customMessage: + description: Custom/Overridden message for generated signals (used in case + of Default rule update). + type: string + customName: + description: Custom/Overridden name of the rule (used in case of Default + rule update). + type: string deprecationDate: description: When the rule will be deprecated, timestamp in milliseconds. format: int64 @@ -34111,6 +34144,14 @@ components: items: $ref: '#/components/schemas/SecurityMonitoringRuleCaseCreate' type: array + customMessage: + description: Custom/Overridden message for generated signals (used in case + of Default rule update). + type: string + customName: + description: Custom/Overridden name of the rule (used in case of Default + rule update). + type: string filters: description: Additional queries to filter matched events before they are processed. This field is deprecated for log detection, signal correlation, @@ -34188,6 +34229,10 @@ components: properties: aggregation: $ref: '#/components/schemas/SecurityMonitoringRuleQueryAggregation' + customQueryExtension: + description: Query extension to append to the logs query. + example: a > 3 + type: string dataSource: $ref: '#/components/schemas/SecurityMonitoringStandardDataSource' distinctFields: @@ -34251,6 +34296,14 @@ components: description: User ID of the user who created the rule. format: int64 type: integer + customMessage: + description: Custom/Overridden message for generated signals (used in case + of Default rule update). + type: string + customName: + description: Custom/Overridden name of the rule (used in case of Default + rule update). + type: string defaultTags: description: Default Tags for default rules (included in tags) example: @@ -34697,6 +34750,8 @@ components: SecurityMonitoringThirdPartyRuleCase: description: Case when signal is generated by a third party rule. properties: + customStatus: + $ref: '#/components/schemas/SecurityMonitoringRuleSeverity' name: description: Name of the case. type: string diff --git a/src/main/java/com/datadog/api/client/v2/model/CloudConfigurationRulePayload.java b/src/main/java/com/datadog/api/client/v2/model/CloudConfigurationRulePayload.java index 12f7af54100..ee40d157197 100644 --- a/src/main/java/com/datadog/api/client/v2/model/CloudConfigurationRulePayload.java +++ b/src/main/java/com/datadog/api/client/v2/model/CloudConfigurationRulePayload.java @@ -23,6 +23,8 @@ @JsonPropertyOrder({ CloudConfigurationRulePayload.JSON_PROPERTY_CASES, CloudConfigurationRulePayload.JSON_PROPERTY_COMPLIANCE_SIGNAL_OPTIONS, + CloudConfigurationRulePayload.JSON_PROPERTY_CUSTOM_MESSAGE, + CloudConfigurationRulePayload.JSON_PROPERTY_CUSTOM_NAME, CloudConfigurationRulePayload.JSON_PROPERTY_FILTERS, CloudConfigurationRulePayload.JSON_PROPERTY_IS_ENABLED, CloudConfigurationRulePayload.JSON_PROPERTY_MESSAGE, @@ -41,6 +43,12 @@ public class CloudConfigurationRulePayload { public static final String JSON_PROPERTY_COMPLIANCE_SIGNAL_OPTIONS = "complianceSignalOptions"; private CloudConfigurationRuleComplianceSignalOptions complianceSignalOptions; + public static final String JSON_PROPERTY_CUSTOM_MESSAGE = "customMessage"; + private String customMessage; + + public static final String JSON_PROPERTY_CUSTOM_NAME = "customName"; + private String customName; + public static final String JSON_PROPERTY_FILTERS = "filters"; private List filters = null; @@ -138,6 +146,48 @@ public void setComplianceSignalOptions( this.complianceSignalOptions = complianceSignalOptions; } + public CloudConfigurationRulePayload customMessage(String customMessage) { + this.customMessage = customMessage; + return this; + } + + /** + * Custom/Overridden message for generated signals (used in case of Default rule update). + * + * @return customMessage + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } + + public CloudConfigurationRulePayload customName(String customName) { + this.customName = customName; + return this; + } + + /** + * Custom/Overridden name of the rule (used in case of Default rule update). + * + * @return customName + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomName() { + return customName; + } + + public void setCustomName(String customName) { + this.customName = customName; + } + public CloudConfigurationRulePayload filters(List filters) { this.filters = filters; for (SecurityMonitoringFilter item : filters) { @@ -365,6 +415,8 @@ public boolean equals(Object o) { return Objects.equals(this.cases, cloudConfigurationRulePayload.cases) && Objects.equals( this.complianceSignalOptions, cloudConfigurationRulePayload.complianceSignalOptions) + && Objects.equals(this.customMessage, cloudConfigurationRulePayload.customMessage) + && Objects.equals(this.customName, cloudConfigurationRulePayload.customName) && Objects.equals(this.filters, cloudConfigurationRulePayload.filters) && Objects.equals(this.isEnabled, cloudConfigurationRulePayload.isEnabled) && Objects.equals(this.message, cloudConfigurationRulePayload.message) @@ -381,6 +433,8 @@ public int hashCode() { return Objects.hash( cases, complianceSignalOptions, + customMessage, + customName, filters, isEnabled, message, @@ -399,6 +453,8 @@ public String toString() { sb.append(" complianceSignalOptions: ") .append(toIndentedString(complianceSignalOptions)) .append("\n"); + sb.append(" customMessage: ").append(toIndentedString(customMessage)).append("\n"); + sb.append(" customName: ").append(toIndentedString(customName)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n"); sb.append(" message: ").append(toIndentedString(message)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleCase.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleCase.java index 7797826424b..774bec54c6d 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleCase.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleCase.java @@ -22,6 +22,7 @@ @JsonPropertyOrder({ SecurityMonitoringRuleCase.JSON_PROPERTY_ACTIONS, SecurityMonitoringRuleCase.JSON_PROPERTY_CONDITION, + SecurityMonitoringRuleCase.JSON_PROPERTY_CUSTOM_STATUS, SecurityMonitoringRuleCase.JSON_PROPERTY_NAME, SecurityMonitoringRuleCase.JSON_PROPERTY_NOTIFICATIONS, SecurityMonitoringRuleCase.JSON_PROPERTY_STATUS @@ -36,6 +37,9 @@ public class SecurityMonitoringRuleCase { public static final String JSON_PROPERTY_CONDITION = "condition"; private String condition; + public static final String JSON_PROPERTY_CUSTOM_STATUS = "customStatus"; + private SecurityMonitoringRuleSeverity customStatus; + public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -101,6 +105,31 @@ public void setCondition(String condition) { this.condition = condition; } + public SecurityMonitoringRuleCase customStatus(SecurityMonitoringRuleSeverity customStatus) { + this.customStatus = customStatus; + this.unparsed |= !customStatus.isValid(); + return this; + } + + /** + * Severity of the Security Signal. + * + * @return customStatus + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public SecurityMonitoringRuleSeverity getCustomStatus() { + return customStatus; + } + + public void setCustomStatus(SecurityMonitoringRuleSeverity customStatus) { + if (!customStatus.isValid()) { + this.unparsed = true; + } + this.customStatus = customStatus; + } + public SecurityMonitoringRuleCase name(String name) { this.name = name; return this; @@ -234,6 +263,7 @@ public boolean equals(Object o) { SecurityMonitoringRuleCase securityMonitoringRuleCase = (SecurityMonitoringRuleCase) o; return Objects.equals(this.actions, securityMonitoringRuleCase.actions) && Objects.equals(this.condition, securityMonitoringRuleCase.condition) + && Objects.equals(this.customStatus, securityMonitoringRuleCase.customStatus) && Objects.equals(this.name, securityMonitoringRuleCase.name) && Objects.equals(this.notifications, securityMonitoringRuleCase.notifications) && Objects.equals(this.status, securityMonitoringRuleCase.status) @@ -243,7 +273,8 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(actions, condition, name, notifications, status, additionalProperties); + return Objects.hash( + actions, condition, customStatus, name, notifications, status, additionalProperties); } @Override @@ -252,6 +283,7 @@ public String toString() { sb.append("class SecurityMonitoringRuleCase {\n"); sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); + sb.append(" customStatus: ").append(toIndentedString(customStatus)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" notifications: ").append(toIndentedString(notifications)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleUpdatePayload.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleUpdatePayload.java index 0d660c9b825..b4700dfaa34 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleUpdatePayload.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleUpdatePayload.java @@ -22,6 +22,8 @@ @JsonPropertyOrder({ SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_CASES, SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_COMPLIANCE_SIGNAL_OPTIONS, + SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_CUSTOM_MESSAGE, + SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_CUSTOM_NAME, SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_FILTERS, SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_GROUP_SIGNALS_BY, SecurityMonitoringRuleUpdatePayload.JSON_PROPERTY_HAS_EXTENDED_TITLE, @@ -45,6 +47,12 @@ public class SecurityMonitoringRuleUpdatePayload { public static final String JSON_PROPERTY_COMPLIANCE_SIGNAL_OPTIONS = "complianceSignalOptions"; private CloudConfigurationRuleComplianceSignalOptions complianceSignalOptions; + public static final String JSON_PROPERTY_CUSTOM_MESSAGE = "customMessage"; + private String customMessage; + + public static final String JSON_PROPERTY_CUSTOM_NAME = "customName"; + private String customName; + public static final String JSON_PROPERTY_FILTERS = "filters"; private List filters = null; @@ -138,6 +146,48 @@ public void setComplianceSignalOptions( this.complianceSignalOptions = complianceSignalOptions; } + public SecurityMonitoringRuleUpdatePayload customMessage(String customMessage) { + this.customMessage = customMessage; + return this; + } + + /** + * Custom/Overridden Message for generated signals (used in case of Default rule update). + * + * @return customMessage + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } + + public SecurityMonitoringRuleUpdatePayload customName(String customName) { + this.customName = customName; + return this; + } + + /** + * Custom/Overridden name (used in case of Default rule update). + * + * @return customName + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomName() { + return customName; + } + + public void setCustomName(String customName) { + this.customName = customName; + } + public SecurityMonitoringRuleUpdatePayload filters(List filters) { this.filters = filters; for (SecurityMonitoringFilter item : filters) { @@ -523,6 +573,8 @@ public boolean equals(Object o) { && Objects.equals( this.complianceSignalOptions, securityMonitoringRuleUpdatePayload.complianceSignalOptions) + && Objects.equals(this.customMessage, securityMonitoringRuleUpdatePayload.customMessage) + && Objects.equals(this.customName, securityMonitoringRuleUpdatePayload.customName) && Objects.equals(this.filters, securityMonitoringRuleUpdatePayload.filters) && Objects.equals(this.groupSignalsBy, securityMonitoringRuleUpdatePayload.groupSignalsBy) && Objects.equals( @@ -545,6 +597,8 @@ public int hashCode() { return Objects.hash( cases, complianceSignalOptions, + customMessage, + customName, filters, groupSignalsBy, hasExtendedTitle, @@ -568,6 +622,8 @@ public String toString() { sb.append(" complianceSignalOptions: ") .append(toIndentedString(complianceSignalOptions)) .append("\n"); + sb.append(" customMessage: ").append(toIndentedString(customMessage)).append("\n"); + sb.append(" customName: ").append(toIndentedString(customName)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" groupSignalsBy: ").append(toIndentedString(groupSignalsBy)).append("\n"); sb.append(" hasExtendedTitle: ").append(toIndentedString(hasExtendedTitle)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRulePayload.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRulePayload.java index 871d2662674..db4a6d1acab 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRulePayload.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRulePayload.java @@ -22,6 +22,8 @@ /** The payload of a signal correlation rule. */ @JsonPropertyOrder({ SecurityMonitoringSignalRulePayload.JSON_PROPERTY_CASES, + SecurityMonitoringSignalRulePayload.JSON_PROPERTY_CUSTOM_MESSAGE, + SecurityMonitoringSignalRulePayload.JSON_PROPERTY_CUSTOM_NAME, SecurityMonitoringSignalRulePayload.JSON_PROPERTY_FILTERS, SecurityMonitoringSignalRulePayload.JSON_PROPERTY_HAS_EXTENDED_TITLE, SecurityMonitoringSignalRulePayload.JSON_PROPERTY_IS_ENABLED, @@ -39,6 +41,12 @@ public class SecurityMonitoringSignalRulePayload { public static final String JSON_PROPERTY_CASES = "cases"; private List cases = new ArrayList<>(); + public static final String JSON_PROPERTY_CUSTOM_MESSAGE = "customMessage"; + private String customMessage; + + public static final String JSON_PROPERTY_CUSTOM_NAME = "customName"; + private String customName; + public static final String JSON_PROPERTY_FILTERS = "filters"; private List filters = null; @@ -118,6 +126,48 @@ public void setCases(List cases) { this.cases = cases; } + public SecurityMonitoringSignalRulePayload customMessage(String customMessage) { + this.customMessage = customMessage; + return this; + } + + /** + * Custom/Overridden message for generated signals (used in case of Default rule update). + * + * @return customMessage + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } + + public SecurityMonitoringSignalRulePayload customName(String customName) { + this.customName = customName; + return this; + } + + /** + * Custom/Overridden name of the rule (used in case of Default rule update). + * + * @return customName + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomName() { + return customName; + } + + public void setCustomName(String customName) { + this.customName = customName; + } + public SecurityMonitoringSignalRulePayload filters(List filters) { this.filters = filters; for (SecurityMonitoringFilter item : filters) { @@ -397,6 +447,8 @@ public boolean equals(Object o) { SecurityMonitoringSignalRulePayload securityMonitoringSignalRulePayload = (SecurityMonitoringSignalRulePayload) o; return Objects.equals(this.cases, securityMonitoringSignalRulePayload.cases) + && Objects.equals(this.customMessage, securityMonitoringSignalRulePayload.customMessage) + && Objects.equals(this.customName, securityMonitoringSignalRulePayload.customName) && Objects.equals(this.filters, securityMonitoringSignalRulePayload.filters) && Objects.equals( this.hasExtendedTitle, securityMonitoringSignalRulePayload.hasExtendedTitle) @@ -415,6 +467,8 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash( cases, + customMessage, + customName, filters, hasExtendedTitle, isEnabled, @@ -432,6 +486,8 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SecurityMonitoringSignalRulePayload {\n"); sb.append(" cases: ").append(toIndentedString(cases)).append("\n"); + sb.append(" customMessage: ").append(toIndentedString(customMessage)).append("\n"); + sb.append(" customName: ").append(toIndentedString(customName)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" hasExtendedTitle: ").append(toIndentedString(hasExtendedTitle)).append("\n"); sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRuleResponse.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRuleResponse.java index 0e8d608b74a..9939e8b1b54 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRuleResponse.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringSignalRuleResponse.java @@ -23,6 +23,8 @@ SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_CASES, SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_CREATED_AT, SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_CREATION_AUTHOR_ID, + SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_CUSTOM_MESSAGE, + SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_CUSTOM_NAME, SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_DEPRECATION_DATE, SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_FILTERS, SecurityMonitoringSignalRuleResponse.JSON_PROPERTY_HAS_EXTENDED_TITLE, @@ -52,6 +54,12 @@ public class SecurityMonitoringSignalRuleResponse { public static final String JSON_PROPERTY_CREATION_AUTHOR_ID = "creationAuthorId"; private Long creationAuthorId; + public static final String JSON_PROPERTY_CUSTOM_MESSAGE = "customMessage"; + private String customMessage; + + public static final String JSON_PROPERTY_CUSTOM_NAME = "customName"; + private String customName; + public static final String JSON_PROPERTY_DEPRECATION_DATE = "deprecationDate"; private Long deprecationDate; @@ -172,6 +180,48 @@ public void setCreationAuthorId(Long creationAuthorId) { this.creationAuthorId = creationAuthorId; } + public SecurityMonitoringSignalRuleResponse customMessage(String customMessage) { + this.customMessage = customMessage; + return this; + } + + /** + * Custom/Overridden message for generated signals (used in case of Default rule update). + * + * @return customMessage + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } + + public SecurityMonitoringSignalRuleResponse customName(String customName) { + this.customName = customName; + return this; + } + + /** + * Custom/Overridden name of the rule (used in case of Default rule update). + * + * @return customName + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomName() { + return customName; + } + + public void setCustomName(String customName) { + this.customName = customName; + } + public SecurityMonitoringSignalRuleResponse deprecationDate(Long deprecationDate) { this.deprecationDate = deprecationDate; return this; @@ -588,6 +638,8 @@ public boolean equals(Object o) { && Objects.equals(this.createdAt, securityMonitoringSignalRuleResponse.createdAt) && Objects.equals( this.creationAuthorId, securityMonitoringSignalRuleResponse.creationAuthorId) + && Objects.equals(this.customMessage, securityMonitoringSignalRuleResponse.customMessage) + && Objects.equals(this.customName, securityMonitoringSignalRuleResponse.customName) && Objects.equals( this.deprecationDate, securityMonitoringSignalRuleResponse.deprecationDate) && Objects.equals(this.filters, securityMonitoringSignalRuleResponse.filters) @@ -615,6 +667,8 @@ public int hashCode() { cases, createdAt, creationAuthorId, + customMessage, + customName, deprecationDate, filters, hasExtendedTitle, @@ -640,6 +694,8 @@ public String toString() { sb.append(" cases: ").append(toIndentedString(cases)).append("\n"); sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" creationAuthorId: ").append(toIndentedString(creationAuthorId)).append("\n"); + sb.append(" customMessage: ").append(toIndentedString(customMessage)).append("\n"); + sb.append(" customName: ").append(toIndentedString(customName)).append("\n"); sb.append(" deprecationDate: ").append(toIndentedString(deprecationDate)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" hasExtendedTitle: ").append(toIndentedString(hasExtendedTitle)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRulePayload.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRulePayload.java index 06eb67af181..986ccf8310b 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRulePayload.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRulePayload.java @@ -22,6 +22,8 @@ /** The payload of a rule. */ @JsonPropertyOrder({ SecurityMonitoringStandardRulePayload.JSON_PROPERTY_CASES, + SecurityMonitoringStandardRulePayload.JSON_PROPERTY_CUSTOM_MESSAGE, + SecurityMonitoringStandardRulePayload.JSON_PROPERTY_CUSTOM_NAME, SecurityMonitoringStandardRulePayload.JSON_PROPERTY_FILTERS, SecurityMonitoringStandardRulePayload.JSON_PROPERTY_GROUP_SIGNALS_BY, SecurityMonitoringStandardRulePayload.JSON_PROPERTY_HAS_EXTENDED_TITLE, @@ -42,6 +44,12 @@ public class SecurityMonitoringStandardRulePayload { public static final String JSON_PROPERTY_CASES = "cases"; private List cases = new ArrayList<>(); + public static final String JSON_PROPERTY_CUSTOM_MESSAGE = "customMessage"; + private String customMessage; + + public static final String JSON_PROPERTY_CUSTOM_NAME = "customName"; + private String customName; + public static final String JSON_PROPERTY_FILTERS = "filters"; private List filters = null; @@ -130,6 +138,48 @@ public void setCases(List cases) { this.cases = cases; } + public SecurityMonitoringStandardRulePayload customMessage(String customMessage) { + this.customMessage = customMessage; + return this; + } + + /** + * Custom/Overridden message for generated signals (used in case of Default rule update). + * + * @return customMessage + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } + + public SecurityMonitoringStandardRulePayload customName(String customName) { + this.customName = customName; + return this; + } + + /** + * Custom/Overridden name of the rule (used in case of Default rule update). + * + * @return customName + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomName() { + return customName; + } + + public void setCustomName(String customName) { + this.customName = customName; + } + public SecurityMonitoringStandardRulePayload filters(List filters) { this.filters = filters; for (SecurityMonitoringFilter item : filters) { @@ -510,6 +560,8 @@ public boolean equals(Object o) { SecurityMonitoringStandardRulePayload securityMonitoringStandardRulePayload = (SecurityMonitoringStandardRulePayload) o; return Objects.equals(this.cases, securityMonitoringStandardRulePayload.cases) + && Objects.equals(this.customMessage, securityMonitoringStandardRulePayload.customMessage) + && Objects.equals(this.customName, securityMonitoringStandardRulePayload.customName) && Objects.equals(this.filters, securityMonitoringStandardRulePayload.filters) && Objects.equals(this.groupSignalsBy, securityMonitoringStandardRulePayload.groupSignalsBy) && Objects.equals( @@ -533,6 +585,8 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash( cases, + customMessage, + customName, filters, groupSignalsBy, hasExtendedTitle, @@ -553,6 +607,8 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SecurityMonitoringStandardRulePayload {\n"); sb.append(" cases: ").append(toIndentedString(cases)).append("\n"); + sb.append(" customMessage: ").append(toIndentedString(customMessage)).append("\n"); + sb.append(" customName: ").append(toIndentedString(customName)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" groupSignalsBy: ").append(toIndentedString(groupSignalsBy)).append("\n"); sb.append(" hasExtendedTitle: ").append(toIndentedString(hasExtendedTitle)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java index d05f5fd2c05..4542e6f0456 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java @@ -21,6 +21,7 @@ /** Query for matching rule. */ @JsonPropertyOrder({ SecurityMonitoringStandardRuleQuery.JSON_PROPERTY_AGGREGATION, + SecurityMonitoringStandardRuleQuery.JSON_PROPERTY_CUSTOM_QUERY_EXTENSION, SecurityMonitoringStandardRuleQuery.JSON_PROPERTY_DATA_SOURCE, SecurityMonitoringStandardRuleQuery.JSON_PROPERTY_DISTINCT_FIELDS, SecurityMonitoringStandardRuleQuery.JSON_PROPERTY_GROUP_BY_FIELDS, @@ -37,6 +38,9 @@ public class SecurityMonitoringStandardRuleQuery { public static final String JSON_PROPERTY_AGGREGATION = "aggregation"; private SecurityMonitoringRuleQueryAggregation aggregation; + public static final String JSON_PROPERTY_CUSTOM_QUERY_EXTENSION = "customQueryExtension"; + private String customQueryExtension; + public static final String JSON_PROPERTY_DATA_SOURCE = "dataSource"; private SecurityMonitoringStandardDataSource dataSource = SecurityMonitoringStandardDataSource.LOGS; @@ -89,6 +93,27 @@ public void setAggregation(SecurityMonitoringRuleQueryAggregation aggregation) { this.aggregation = aggregation; } + public SecurityMonitoringStandardRuleQuery customQueryExtension(String customQueryExtension) { + this.customQueryExtension = customQueryExtension; + return this; + } + + /** + * Query extension to append to the logs query. + * + * @return customQueryExtension + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_QUERY_EXTENSION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomQueryExtension() { + return customQueryExtension; + } + + public void setCustomQueryExtension(String customQueryExtension) { + this.customQueryExtension = customQueryExtension; + } + public SecurityMonitoringStandardRuleQuery dataSource( SecurityMonitoringStandardDataSource dataSource) { this.dataSource = dataSource; @@ -342,6 +367,8 @@ public boolean equals(Object o) { SecurityMonitoringStandardRuleQuery securityMonitoringStandardRuleQuery = (SecurityMonitoringStandardRuleQuery) o; return Objects.equals(this.aggregation, securityMonitoringStandardRuleQuery.aggregation) + && Objects.equals( + this.customQueryExtension, securityMonitoringStandardRuleQuery.customQueryExtension) && Objects.equals(this.dataSource, securityMonitoringStandardRuleQuery.dataSource) && Objects.equals(this.distinctFields, securityMonitoringStandardRuleQuery.distinctFields) && Objects.equals(this.groupByFields, securityMonitoringStandardRuleQuery.groupByFields) @@ -360,6 +387,7 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash( aggregation, + customQueryExtension, dataSource, distinctFields, groupByFields, @@ -376,6 +404,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SecurityMonitoringStandardRuleQuery {\n"); sb.append(" aggregation: ").append(toIndentedString(aggregation)).append("\n"); + sb.append(" customQueryExtension: ") + .append(toIndentedString(customQueryExtension)) + .append("\n"); sb.append(" dataSource: ").append(toIndentedString(dataSource)).append("\n"); sb.append(" distinctFields: ").append(toIndentedString(distinctFields)).append("\n"); sb.append(" groupByFields: ").append(toIndentedString(groupByFields)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleResponse.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleResponse.java index c35f915c4a6..13094791ec4 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleResponse.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleResponse.java @@ -24,6 +24,8 @@ SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_COMPLIANCE_SIGNAL_OPTIONS, SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_CREATED_AT, SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_CREATION_AUTHOR_ID, + SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_CUSTOM_MESSAGE, + SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_CUSTOM_NAME, SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_DEFAULT_TAGS, SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_DEPRECATION_DATE, SecurityMonitoringStandardRuleResponse.JSON_PROPERTY_FILTERS, @@ -61,6 +63,12 @@ public class SecurityMonitoringStandardRuleResponse { public static final String JSON_PROPERTY_CREATION_AUTHOR_ID = "creationAuthorId"; private Long creationAuthorId; + public static final String JSON_PROPERTY_CUSTOM_MESSAGE = "customMessage"; + private String customMessage; + + public static final String JSON_PROPERTY_CUSTOM_NAME = "customName"; + private String customName; + public static final String JSON_PROPERTY_DEFAULT_TAGS = "defaultTags"; private List defaultTags = null; @@ -220,6 +228,48 @@ public void setCreationAuthorId(Long creationAuthorId) { this.creationAuthorId = creationAuthorId; } + public SecurityMonitoringStandardRuleResponse customMessage(String customMessage) { + this.customMessage = customMessage; + return this; + } + + /** + * Custom/Overridden message for generated signals (used in case of Default rule update). + * + * @return customMessage + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_MESSAGE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } + + public SecurityMonitoringStandardRuleResponse customName(String customName) { + this.customName = customName; + return this; + } + + /** + * Custom/Overridden name of the rule (used in case of Default rule update). + * + * @return customName + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getCustomName() { + return customName; + } + + public void setCustomName(String customName) { + this.customName = customName; + } + public SecurityMonitoringStandardRuleResponse defaultTags(List defaultTags) { this.defaultTags = defaultTags; return this; @@ -790,6 +840,8 @@ public boolean equals(Object o) { && Objects.equals(this.createdAt, securityMonitoringStandardRuleResponse.createdAt) && Objects.equals( this.creationAuthorId, securityMonitoringStandardRuleResponse.creationAuthorId) + && Objects.equals(this.customMessage, securityMonitoringStandardRuleResponse.customMessage) + && Objects.equals(this.customName, securityMonitoringStandardRuleResponse.customName) && Objects.equals(this.defaultTags, securityMonitoringStandardRuleResponse.defaultTags) && Objects.equals( this.deprecationDate, securityMonitoringStandardRuleResponse.deprecationDate) @@ -827,6 +879,8 @@ public int hashCode() { complianceSignalOptions, createdAt, creationAuthorId, + customMessage, + customName, defaultTags, deprecationDate, filters, @@ -860,6 +914,8 @@ public String toString() { .append("\n"); sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" creationAuthorId: ").append(toIndentedString(creationAuthorId)).append("\n"); + sb.append(" customMessage: ").append(toIndentedString(customMessage)).append("\n"); + sb.append(" customName: ").append(toIndentedString(customName)).append("\n"); sb.append(" defaultTags: ").append(toIndentedString(defaultTags)).append("\n"); sb.append(" deprecationDate: ").append(toIndentedString(deprecationDate)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringThirdPartyRuleCase.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringThirdPartyRuleCase.java index c25605836fb..655f79d1502 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringThirdPartyRuleCase.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringThirdPartyRuleCase.java @@ -20,6 +20,7 @@ /** Case when signal is generated by a third party rule. */ @JsonPropertyOrder({ + SecurityMonitoringThirdPartyRuleCase.JSON_PROPERTY_CUSTOM_STATUS, SecurityMonitoringThirdPartyRuleCase.JSON_PROPERTY_NAME, SecurityMonitoringThirdPartyRuleCase.JSON_PROPERTY_NOTIFICATIONS, SecurityMonitoringThirdPartyRuleCase.JSON_PROPERTY_QUERY, @@ -29,6 +30,9 @@ value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") public class SecurityMonitoringThirdPartyRuleCase { @JsonIgnore public boolean unparsed = false; + public static final String JSON_PROPERTY_CUSTOM_STATUS = "customStatus"; + private SecurityMonitoringRuleSeverity customStatus; + public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -41,6 +45,32 @@ public class SecurityMonitoringThirdPartyRuleCase { public static final String JSON_PROPERTY_STATUS = "status"; private SecurityMonitoringRuleSeverity status; + public SecurityMonitoringThirdPartyRuleCase customStatus( + SecurityMonitoringRuleSeverity customStatus) { + this.customStatus = customStatus; + this.unparsed |= !customStatus.isValid(); + return this; + } + + /** + * Severity of the Security Signal. + * + * @return customStatus + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CUSTOM_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public SecurityMonitoringRuleSeverity getCustomStatus() { + return customStatus; + } + + public void setCustomStatus(SecurityMonitoringRuleSeverity customStatus) { + if (!customStatus.isValid()) { + this.unparsed = true; + } + this.customStatus = customStatus; + } + public SecurityMonitoringThirdPartyRuleCase name(String name) { this.name = name; return this; @@ -194,7 +224,8 @@ public boolean equals(Object o) { } SecurityMonitoringThirdPartyRuleCase securityMonitoringThirdPartyRuleCase = (SecurityMonitoringThirdPartyRuleCase) o; - return Objects.equals(this.name, securityMonitoringThirdPartyRuleCase.name) + return Objects.equals(this.customStatus, securityMonitoringThirdPartyRuleCase.customStatus) + && Objects.equals(this.name, securityMonitoringThirdPartyRuleCase.name) && Objects.equals(this.notifications, securityMonitoringThirdPartyRuleCase.notifications) && Objects.equals(this.query, securityMonitoringThirdPartyRuleCase.query) && Objects.equals(this.status, securityMonitoringThirdPartyRuleCase.status) @@ -204,13 +235,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(name, notifications, query, status, additionalProperties); + return Objects.hash(customStatus, name, notifications, query, status, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SecurityMonitoringThirdPartyRuleCase {\n"); + sb.append(" customStatus: ").append(toIndentedString(customStatus)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" notifications: ").append(toIndentedString(notifications)).append("\n"); sb.append(" query: ").append(toIndentedString(query)).append("\n");