Merge pull request #3421 from DataDog/datadog-api-spec/generated/5468

Security Monitoring - expand learningDuration and forgetAfter to support up to 30 days

Author: nogates

.generator/schemas/v2/openapi.yaml

@@ -64576,35 +64576,17 @@ components:
       type: object
     SecurityMonitoringRuleNewValueOptionsForgetAfter:
       description: The duration in days after which a learned value is forgotten.
-      enum:
-        - 1
-        - 2
-        - 7
-        - 14
-        - 21
-        - 28
       format: int32
+      maximum: 30
+      minimum: 1
       type: integer
-      x-enum-varnames:
-        - ONE_DAY
-        - TWO_DAYS
-        - ONE_WEEK
-        - TWO_WEEKS
-        - THREE_WEEKS
-        - FOUR_WEEKS
     SecurityMonitoringRuleNewValueOptionsLearningDuration:
       default: 0
       description: "The duration in days during which values are learned, and after which signals will be generated for values that\nweren't learned. If set to 0, a signal will be generated for all new values after the first value is learned."
-      enum:
-        - 0
-        - 1
-        - 7
       format: int32
+      maximum: 30
+      minimum: 0
       type: integer
-      x-enum-varnames:
-        - ZERO_DAYS
-        - ONE_DAY
-        - SEVEN_DAYS
     SecurityMonitoringRuleNewValueOptionsLearningMethod:
       default: duration
       description: The learning method used to determine when signals should be generated for values that weren't learned.

docs/datadog_api_client.v2.model.rst

@@ -28718,20 +28718,6 @@ datadog\_api\_client.v2.model.security\_monitoring\_rule\_new\_value\_options mo
    :members:
    :show-inheritance:
 
-datadog\_api\_client.v2.model.security\_monitoring\_rule\_new\_value\_options\_forget\_after module
----------------------------------------------------------------------------------------------------
-
-.. automodule:: datadog_api_client.v2.model.security_monitoring_rule_new_value_options_forget_after
-   :members:
-   :show-inheritance:
-
-datadog\_api\_client.v2.model.security\_monitoring\_rule\_new\_value\_options\_learning\_duration module
---------------------------------------------------------------------------------------------------------
-
-.. automodule:: datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_duration
-   :members:
-   :show-inheritance:
-
 datadog\_api\_client.v2.model.security\_monitoring\_rule\_new\_value\_options\_learning\_method module
 ------------------------------------------------------------------------------------------------------
 

examples/v2/security-monitoring/ValidateSecurityMonitoringRule_2609327779.py

@@ -15,12 +15,6 @@
     SecurityMonitoringRuleMaxSignalDuration,
 )
 from datadog_api_client.v2.model.security_monitoring_rule_new_value_options import SecurityMonitoringRuleNewValueOptions
-from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_forget_after import (
-    SecurityMonitoringRuleNewValueOptionsForgetAfter,
-)
-from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_duration import (
-    SecurityMonitoringRuleNewValueOptionsLearningDuration,
-)
 from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_method import (
     SecurityMonitoringRuleNewValueOptionsLearningMethod,
 )
@@ -55,9 +49,9 @@
         max_signal_duration=SecurityMonitoringRuleMaxSignalDuration.TEN_MINUTES,
         detection_method=SecurityMonitoringRuleDetectionMethod.NEW_VALUE,
         new_value_options=SecurityMonitoringRuleNewValueOptions(
-            forget_after=SecurityMonitoringRuleNewValueOptionsForgetAfter.ONE_WEEK,
+            forget_after=7,
             instantaneous_baseline=True,
-            learning_duration=SecurityMonitoringRuleNewValueOptionsLearningDuration.ONE_DAY,
+            learning_duration=1,
             learning_threshold=SecurityMonitoringRuleNewValueOptionsLearningThreshold.ZERO_OCCURRENCES,
             learning_method=SecurityMonitoringRuleNewValueOptionsLearningMethod.DURATION,
         ),

src/datadog_api_client/v2/model/security_monitoring_rule_new_value_options.py

@@ -14,12 +14,6 @@
 
 
 if TYPE_CHECKING:
-    from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_forget_after import (
-        SecurityMonitoringRuleNewValueOptionsForgetAfter,
-    )
-    from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_duration import (
-        SecurityMonitoringRuleNewValueOptionsLearningDuration,
-    )
     from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_method import (
         SecurityMonitoringRuleNewValueOptionsLearningMethod,
     )
@@ -29,14 +23,19 @@
 
 
 class SecurityMonitoringRuleNewValueOptions(ModelNormal):
+    validations = {
+        "forget_after": {
+            "inclusive_maximum": 30,
+            "inclusive_minimum": 1,
+        },
+        "learning_duration": {
+            "inclusive_maximum": 30,
+            "inclusive_minimum": 0,
+        },
+    }
+
     @cached_property
     def openapi_types(_):
-        from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_forget_after import (
-            SecurityMonitoringRuleNewValueOptionsForgetAfter,
-        )
-        from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_duration import (
-            SecurityMonitoringRuleNewValueOptionsLearningDuration,
-        )
         from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_method import (
             SecurityMonitoringRuleNewValueOptionsLearningMethod,
         )
@@ -45,9 +44,9 @@ def openapi_types(_):
         )
 
         return {
-            "forget_after": (SecurityMonitoringRuleNewValueOptionsForgetAfter,),
+            "forget_after": (int,),
             "instantaneous_baseline": (bool,),
-            "learning_duration": (SecurityMonitoringRuleNewValueOptionsLearningDuration,),
+            "learning_duration": (int,),
             "learning_method": (SecurityMonitoringRuleNewValueOptionsLearningMethod,),
             "learning_threshold": (SecurityMonitoringRuleNewValueOptionsLearningThreshold,),
         }
@@ -62,9 +61,9 @@ def openapi_types(_):
 
     def __init__(
         self_,
-        forget_after: Union[SecurityMonitoringRuleNewValueOptionsForgetAfter, UnsetType] = unset,
+        forget_after: Union[int, UnsetType] = unset,
         instantaneous_baseline: Union[bool, UnsetType] = unset,
-        learning_duration: Union[SecurityMonitoringRuleNewValueOptionsLearningDuration, UnsetType] = unset,
+        learning_duration: Union[int, UnsetType] = unset,
         learning_method: Union[SecurityMonitoringRuleNewValueOptionsLearningMethod, UnsetType] = unset,
         learning_threshold: Union[SecurityMonitoringRuleNewValueOptionsLearningThreshold, UnsetType] = unset,
         **kwargs,
@@ -73,14 +72,14 @@ def __init__(
         Options on new value detection method.
 
         :param forget_after: The duration in days after which a learned value is forgotten.
-        :type forget_after: SecurityMonitoringRuleNewValueOptionsForgetAfter, optional
+        :type forget_after: int, optional
 
         :param instantaneous_baseline: When set to true, Datadog uses previous values that fall within the defined learning window to construct the baseline, enabling the system to establish an accurate baseline more rapidly rather than relying solely on gradual learning over time.
         :type instantaneous_baseline: bool, optional
 
         :param learning_duration: The duration in days during which values are learned, and after which signals will be generated for values that
             weren't learned. If set to 0, a signal will be generated for all new values after the first value is learned.
-        :type learning_duration: SecurityMonitoringRuleNewValueOptionsLearningDuration, optional
+        :type learning_duration: int, optional
 
         :param learning_method: The learning method used to determine when signals should be generated for values that weren't learned.
         :type learning_method: SecurityMonitoringRuleNewValueOptionsLearningMethod, optional

src/datadog_api_client/v2/model/security_monitoring_rule_new_value_options_forget_after.py

@@ -5807,12 +5807,6 @@
     SecurityMonitoringRuleMaxSignalDuration,
 )
 from datadog_api_client.v2.model.security_monitoring_rule_new_value_options import SecurityMonitoringRuleNewValueOptions
-from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_forget_after import (
-    SecurityMonitoringRuleNewValueOptionsForgetAfter,
-)
-from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_duration import (
-    SecurityMonitoringRuleNewValueOptionsLearningDuration,
-)
 from datadog_api_client.v2.model.security_monitoring_rule_new_value_options_learning_method import (
     SecurityMonitoringRuleNewValueOptionsLearningMethod,
 )
@@ -11615,8 +11609,6 @@
     "SecurityMonitoringRuleKeepAlive",
     "SecurityMonitoringRuleMaxSignalDuration",
     "SecurityMonitoringRuleNewValueOptions",
-    "SecurityMonitoringRuleNewValueOptionsForgetAfter",
-    "SecurityMonitoringRuleNewValueOptionsLearningDuration",
     "SecurityMonitoringRuleNewValueOptionsLearningMethod",
     "SecurityMonitoringRuleNewValueOptionsLearningThreshold",
     "SecurityMonitoringRuleOptions",