diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 95f5775c6b9..e301432aca7 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -6766,6 +6766,8 @@ components:
           description: Optional prefix for blobs written to the container.
           example: logs/
           type: string
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         container_name:
           description: The name of the Azure Blob Storage container to store logs
             in.
@@ -24021,6 +24023,22 @@ components:
           type: string
         flaky_state:
           $ref: '#/components/schemas/FlakyTestAttributesFlakyState'
+        history:
+          description: 'Chronological history of status changes for this flaky test,
+            ordered from most recent to oldest.
+
+            Includes state transitions like new -> quarantined -> fixed, along with
+            the associated commit SHA when available.'
+          example:
+          - commit_sha: abc123def456
+            status: quarantined
+            timestamp: 1704067200000
+          - commit_sha: ''
+            status: new
+            timestamp: 1703980800000
+          items:
+            $ref: '#/components/schemas/FlakyTestHistory'
+          type: array
         last_flaked_branch:
           description: The branch name where the test exhibited flakiness for the
             last time.
@@ -24105,6 +24123,29 @@ components:
       - FIXED
       - QUARANTINED
       - DISABLED
+    FlakyTestHistory:
+      description: A single history entry representing a status change for a flaky
+        test.
+      properties:
+        commit_sha:
+          description: The commit SHA associated with this status change. Will be
+            an empty string if the commit SHA is not available.
+          example: abc123def456
+          type: string
+        status:
+          description: The test status at this point in history.
+          example: quarantined
+          type: string
+        timestamp:
+          description: Unix timestamp in milliseconds when this status change occurred.
+          example: 1704067200000
+          format: int64
+          type: integer
+      required:
+      - status
+      - commit_sha
+      - timestamp
+      type: object
     FlakyTestPipelineStats:
       description: CI pipeline related statistics for the flaky test. This information
         is only available if test runs are associated with CI pipeline events from
@@ -24251,6 +24292,17 @@ components:
       properties:
         filter:
           $ref: '#/components/schemas/FlakyTestsSearchFilter'
+        include_history:
+          default: false
+          description: 'Whether to include the status change history for each flaky
+            test in the response.
+
+            When set to true, each test will include a `history` array with chronological
+            status changes.
+
+            Defaults to false.'
+          example: true
+          type: boolean
         page:
           $ref: '#/components/schemas/FlakyTestsSearchPageOptions'
         sort:
@@ -36391,6 +36443,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         client_id:
           description: Azure AD client ID used for authentication.
           example: a1b2c3d4-5678-90ab-cdef-1234567890ab
@@ -38337,6 +38391,8 @@ components:
       properties:
         auth:
           $ref: '#/components/schemas/ObservabilityPipelineAmazonOpenSearchDestinationAuth'
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         bulk_index:
           description: The index to write logs to.
           example: logs-index
@@ -38418,6 +38474,8 @@ components:
           description: S3 bucket name.
           example: error-logs
           type: string
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: Unique identifier for the destination component.
           example: amazon-s3-destination
@@ -38539,6 +38597,8 @@ components:
           description: Name of the Amazon S3 bucket in Security Lake (3-63 characters).
           example: security-lake-bucket
           type: string
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         custom_source_name:
           description: Custom source name for the logs in Security Lake.
           example: my-custom-source
@@ -38598,6 +38658,39 @@ components:
             role session.
           type: string
       type: object
+    ObservabilityPipelineBufferOptions:
+      description: Configuration for buffer settings on destination components.
+      oneOf:
+      - $ref: '#/components/schemas/ObservabilityPipelineDiskBufferOptions'
+      - $ref: '#/components/schemas/ObservabilityPipelineMemoryBufferOptions'
+      - $ref: '#/components/schemas/ObservabilityPipelineMemoryBufferSizeOptions'
+    ObservabilityPipelineBufferOptionsDiskType:
+      default: disk
+      description: The type of the buffer that will be configured, a disk buffer.
+      enum:
+      - disk
+      type: string
+      x-enum-varnames:
+      - DISK
+    ObservabilityPipelineBufferOptionsMemoryType:
+      default: memory
+      description: The type of the buffer that will be configured, a memory buffer.
+      enum:
+      - memory
+      type: string
+      x-enum-varnames:
+      - MEMORY
+    ObservabilityPipelineBufferOptionsWhenFull:
+      default: block
+      description: Behavior when the buffer is full (block and stop accepting new
+        events, or drop new events)
+      enum:
+      - block
+      - drop_newest
+      type: string
+      x-enum-varnames:
+      - BLOCK
+      - DROP_NEWEST
     ObservabilityPipelineCloudPremDestination:
       description: 'The `cloud_prem` destination sends logs to Datadog CloudPrem.
 
@@ -38868,6 +38961,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         compression:
           $ref: '#/components/schemas/ObservabilityPipelineCrowdStrikeNextGenSiemDestinationCompression'
         encoding:
@@ -39093,6 +39188,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: The unique identifier for this component.
           example: datadog-logs-destination
@@ -39347,6 +39444,19 @@ components:
       type: string
       x-enum-varnames:
       - DEDUPE
+    ObservabilityPipelineDiskBufferOptions:
+      description: Options for configuring a disk buffer.
+      properties:
+        max_size:
+          description: Maximum size of the disk buffer.
+          example: 4096
+          format: int64
+          type: integer
+        type:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptionsDiskType'
+        when_full:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptionsWhenFull'
+      type: object
     ObservabilityPipelineElasticsearchDestination:
       description: 'The `elasticsearch` destination writes logs to an Elasticsearch
         cluster.
@@ -39356,6 +39466,8 @@ components:
       properties:
         api_version:
           $ref: '#/components/schemas/ObservabilityPipelineElasticsearchDestinationApiVersion'
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         bulk_index:
           description: The index to write logs to in Elasticsearch.
           example: logs-index
@@ -39901,6 +40013,8 @@ components:
       properties:
         auth:
           $ref: '#/components/schemas/ObservabilityPipelineGcpAuth'
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         customer_id:
           description: The Google Chronicle customer ID.
           example: abcdefg123456789
@@ -39969,6 +40083,8 @@ components:
           description: Name of the GCS bucket.
           example: error-logs
           type: string
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: Unique identifier for the destination component.
           example: gcs-destination
@@ -40053,6 +40169,8 @@ components:
       properties:
         auth:
           $ref: '#/components/schemas/ObservabilityPipelineGcpAuth'
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         encoding:
           $ref: '#/components/schemas/ObservabilityPipelineGooglePubSubDestinationEncoding'
         id:
@@ -40579,6 +40697,28 @@ components:
       type: string
       x-enum-varnames:
       - LOGSTASH
+    ObservabilityPipelineMemoryBufferOptions:
+      description: Options for configuring a memory buffer by byte size.
+      properties:
+        max_size:
+          description: Maximum size of the memory buffer.
+          example: 4096
+          format: int64
+          type: integer
+        type:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptionsMemoryType'
+      type: object
+    ObservabilityPipelineMemoryBufferSizeOptions:
+      description: Options for configuring a memory buffer by queue length.
+      properties:
+        max_events:
+          description: Maximum events for the memory buffer.
+          example: 500
+          format: int64
+          type: integer
+        type:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptionsMemoryType'
+      type: object
     ObservabilityPipelineMetadataEntry:
       description: A custom metadata entry.
       properties:
@@ -40701,6 +40841,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: The unique identifier for this component.
           example: new-relic-destination
@@ -40847,6 +40989,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         bulk_index:
           description: The index to write logs to.
           example: logs-index
@@ -41560,6 +41704,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: The unique identifier for this component.
           example: rsyslog-destination
@@ -42065,6 +42211,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: The unique identifier for this component.
           example: sentinelone-destination
@@ -42119,6 +42267,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         encoding:
           $ref: '#/components/schemas/ObservabilityPipelineSocketDestinationEncoding'
         framing:
@@ -42495,6 +42645,8 @@ components:
             If `false`, Splunk assigns the time the event was received.'
           example: true
           type: boolean
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         encoding:
           $ref: '#/components/schemas/ObservabilityPipelineSplunkHecDestinationEncoding'
         id:
@@ -42619,6 +42771,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         encoding:
           $ref: '#/components/schemas/ObservabilityPipelineSumoLogicDestinationEncoding'
         header_custom_fields:
@@ -42732,6 +42886,8 @@ components:
 
         **Supported pipeline types:** logs'
       properties:
+        buffer:
+          $ref: '#/components/schemas/ObservabilityPipelineBufferOptions'
         id:
           description: The unique identifier for this component.
           example: syslog-ng-destination
@@ -45141,6 +45297,92 @@ components:
       type: string
       x-enum-varnames:
       - MARKDOWN
+    PostmortemTemplateAttributesRequest:
+      properties:
+        name:
+          description: The name of the template
+          example: Standard Postmortem Template
+          type: string
+      required:
+      - name
+      type: object
+    PostmortemTemplateAttributesResponse:
+      properties:
+        createdAt:
+          description: When the template was created
+          example: '2026-01-13T17:15:53.208340Z'
+          format: date-time
+          type: string
+        modifiedAt:
+          description: When the template was last modified
+          example: '2026-01-13T17:15:53.208340Z'
+          format: date-time
+          type: string
+        name:
+          description: The name of the template
+          example: Standard Postmortem Template
+          type: string
+      required:
+      - name
+      - createdAt
+      - modifiedAt
+      type: object
+    PostmortemTemplateDataRequest:
+      properties:
+        attributes:
+          $ref: '#/components/schemas/PostmortemTemplateAttributesRequest'
+        type:
+          $ref: '#/components/schemas/PostmortemTemplateType'
+      required:
+      - type
+      - attributes
+      type: object
+    PostmortemTemplateDataResponse:
+      properties:
+        attributes:
+          $ref: '#/components/schemas/PostmortemTemplateAttributesResponse'
+        id:
+          description: The ID of the template
+          example: template-456
+          type: string
+        type:
+          $ref: '#/components/schemas/PostmortemTemplateType'
+      required:
+      - id
+      - type
+      - attributes
+      type: object
+    PostmortemTemplateRequest:
+      properties:
+        data:
+          $ref: '#/components/schemas/PostmortemTemplateDataRequest'
+      required:
+      - data
+      type: object
+    PostmortemTemplateResponse:
+      properties:
+        data:
+          $ref: '#/components/schemas/PostmortemTemplateDataResponse'
+      required:
+      - data
+      type: object
+    PostmortemTemplateType:
+      description: Postmortem template resource type
+      enum:
+      - postmortem_template
+      example: postmortem_template
+      type: string
+      x-enum-varnames:
+      - POSTMORTEM_TEMPLATE
+    PostmortemTemplatesResponse:
+      properties:
+        data:
+          items:
+            $ref: '#/components/schemas/PostmortemTemplateDataResponse'
+          type: array
+      required:
+      - data
+      type: object
     Powerpack:
       description: Powerpacks are templated groups of dashboard widgets you can save
         from an existing dashboard and turn into reusable packs in the widget tray.
@@ -55897,8 +56139,9 @@ components:
 
             The number of keywords in the list must be less than or equal to 30.'
           example:
-          - credit card
-          - cc
+          - email
+          - address
+          - login
           items:
             type: string
           type: array
@@ -56037,6 +56280,8 @@ components:
           maximum: 5
           minimum: 1
           type: integer
+        suppressions:
+          $ref: '#/components/schemas/SensitiveDataScannerSuppressions'
         tags:
           description: List of tags.
           items:
@@ -56258,6 +56503,41 @@ components:
         type:
           $ref: '#/components/schemas/SensitiveDataScannerStandardPatternType'
       type: object
+    SensitiveDataScannerSuppressions:
+      description: 'Object describing the suppressions for a rule. There are three
+        types of suppressions, `starts_with`, `ends_with`, and `exact_match`.
+
+        Suppressed matches are not obfuscated, counted in metrics, or displayed in
+        the Findings page.'
+      properties:
+        ends_with:
+          description: List of strings to use for suppression of matches ending with
+            these strings.
+          example:
+          - '@example.com'
+          - another.example.com
+          items:
+            type: string
+          type: array
+        exact_match:
+          description: List of strings to use for suppression of matches exactly matching
+            these strings.
+          example:
+          - admin@example.com
+          - user@example.com
+          items:
+            type: string
+          type: array
+        starts_with:
+          description: List of strings to use for suppression of matches starting
+            with these strings.
+          example:
+          - admin
+          - user
+          items:
+            type: string
+          type: array
+      type: object
     SensitiveDataScannerTextReplacement:
       description: Object describing how the scanned event will be replaced.
       properties:
@@ -78136,6 +78416,184 @@ paths:
         - incident_notification_settings_write
       x-unstable: '**Note**: This endpoint is in Preview.
 
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+  /api/v2/incidents/config/postmortem-templates:
+    get:
+      description: Retrieve a list of all postmortem templates for incidents.
+      operationId: ListIncidentPostmortemTemplates
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PostmortemTemplatesResponse'
+          description: OK
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      summary: List postmortem templates
+      tags:
+      - Incidents
+      x-unstable: '**Note**: This endpoint is in preview and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+    post:
+      description: Create a new postmortem template for incidents.
+      operationId: CreateIncidentPostmortemTemplate
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PostmortemTemplateRequest'
+        required: true
+      responses:
+        '201':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PostmortemTemplateResponse'
+          description: Created
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Forbidden
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      summary: Create postmortem template
+      tags:
+      - Incidents
+      x-unstable: '**Note**: This endpoint is in preview and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+  /api/v2/incidents/config/postmortem-templates/{template_id}:
+    delete:
+      description: Delete a postmortem template.
+      operationId: DeleteIncidentPostmortemTemplate
+      parameters:
+      - description: The ID of the postmortem template
+        in: path
+        name: template_id
+        required: true
+        schema:
+          example: template-456
+          type: string
+      responses:
+        '204':
+          description: No Content
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Not Found
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      summary: Delete postmortem template
+      tags:
+      - Incidents
+      x-unstable: '**Note**: This endpoint is in preview and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+    get:
+      description: Retrieve details of a specific postmortem template.
+      operationId: GetIncidentPostmortemTemplate
+      parameters:
+      - description: The ID of the postmortem template
+        in: path
+        name: template_id
+        required: true
+        schema:
+          example: template-456
+          type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PostmortemTemplateResponse'
+          description: OK
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Not Found
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      summary: Get postmortem template
+      tags:
+      - Incidents
+      x-unstable: '**Note**: This endpoint is in preview and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+    patch:
+      description: Update an existing postmortem template.
+      operationId: UpdateIncidentPostmortemTemplate
+      parameters:
+      - description: The ID of the postmortem template
+        in: path
+        name: template_id
+        required: true
+        schema:
+          example: template-456
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PostmortemTemplateRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PostmortemTemplateResponse'
+          description: OK
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Not Found
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      summary: Update postmortem template
+      tags:
+      - Incidents
+      x-unstable: '**Note**: This endpoint is in preview and is subject to change.
+
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
   /api/v2/incidents/config/types:
     get:
@@ -100677,8 +101135,33 @@ paths:
 
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
     post:
-      description: List endpoint returning flaky tests from Flaky Test Management.
+      description: 'List endpoint returning flaky tests from Flaky Test Management.
         Results are paginated.
+
+
+        The response includes comprehensive test information including:
+
+        - Test identification and metadata (module, suite, name)
+
+        - Flaky state and categorization
+
+        - First and last flake occurrences (timestamp, branch, commit SHA)
+
+        - Test execution statistics from the last 7 days (failure rate)
+
+        - Pipeline impact metrics (failed pipelines count, total lost time)
+
+        - Complete status change history (optional, ordered from most recent to oldest)
+
+
+        Set `include_history` to `true` in the request to receive the status change
+        history for each test.
+
+        History is disabled by default for better performance.
+
+
+        Results support filtering by various facets including service, environment,
+        repository, branch, and test state.'
       operationId: SearchFlakyTests
       requestBody:
         content:
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.frozen
index ea87314c859..c2c397eabd2 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:03.221Z
\ No newline at end of file
+2026-02-04T15:35:09.418Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.yml
index 55ba5c547a1..9058f7c0f74 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Group-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:03 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:09 GMT
   request:
     body: null
     headers:
@@ -10,18 +10,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":277985}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286461}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:03 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:09 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"filter":{"query":"*"},"is_enabled":false,"name":"Test-Create_Scanning_Group_returns_OK_response-1768828263","product_list":["logs"]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},"meta":{}}'
+      string: '{"data":{"attributes":{"filter":{"query":"*"},"is_enabled":false,"name":"Test-Create_Scanning_Group_returns_OK_response-1770219309","product_list":["logs"]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -32,14 +32,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"b9c899da-45e7-47d6-ae95-8372577923e5","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Test-Create_Scanning_Group_returns_OK_response-1768828263","product_list":["logs"],"samplings":[]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":277986}}'
+      string: '{"data":{"id":"693599bb-8eee-4c5a-89a8-5ee9b89d9aff","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Test-Create_Scanning_Group_returns_OK_response-1770219309","product_list":["logs"],"samplings":[]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286461,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:03 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:09 GMT
   request:
     body:
       encoding: UTF-8
@@ -50,11 +50,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/b9c899da-45e7-47d6-ae95-8372577923e5
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/693599bb-8eee-4c5a-89a8-5ee9b89d9aff
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277987}}'
+      string: '{"meta":{"version":286463}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.frozen
index 36c0a722429..33530e0ca57 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:04.324Z
\ No newline at end of file
+2026-02-04T15:35:10.455Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.yml b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.yml
index ad7c2e0b2c3..30eb50ac607 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-Bad-Request-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:04 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:10 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":277987}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286463}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:04 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:10 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,18 +32,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"bd80b15d-a3e1-4e4a-af44-ae29bf8816f8","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":277988}}'
+      string: '{"data":{"id":"779da6c9-c6e5-4103-836a-9f9b6cd45991","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286463,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:04 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:10 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"is_enabled":true,"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"bd80b15d-a3e1-4e4a-af44-ae29bf8816f8","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
+      string: '{"data":{"attributes":{"is_enabled":true,"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"779da6c9-c6e5-4103-836a-9f9b6cd45991","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -62,7 +62,7 @@ http_interactions:
     status:
       code: 400
       message: Bad Request
-- recorded_at: Mon, 19 Jan 2026 13:11:04 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:10 GMT
   request:
     body:
       encoding: UTF-8
@@ -73,11 +73,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/bd80b15d-a3e1-4e4a-af44-ae29bf8816f8
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/779da6c9-c6e5-4103-836a-9f9b6cd45991
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277989}}'
+      string: '{"meta":{"version":286465}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen
index 54eb686bb7c..aef7fffbfaf 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:06.289Z
\ No newline at end of file
+2026-02-04T15:35:12.357Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml
index 71ac1b57634..39e722a4108 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:06 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:12 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":277989}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286465}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:06 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:12 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,19 +32,19 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"e08a29f3-f7b2-4e32-af1f-f19ece1a12b3","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":277990}}'
+      string: '{"data":{"id":"f0288bc7-4f14-43bf-8f51-c0914df1d182","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286465,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:06 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:12 GMT
   request:
     body:
       encoding: UTF-8
       string: '{"data":{"attributes":{"excluded_namespaces":["admin.name"],"included_keyword_configuration":{"character_count":35,"keywords":["credit
-        card"]},"is_enabled":true,"name":"Test-Create_Scanning_Rule_returns_OK_response-1768828266","namespaces":["admin"],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"e08a29f3-f7b2-4e32-af1f-f19ece1a12b3","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
+        card"]},"is_enabled":true,"name":"Test-Create_Scanning_Rule_returns_OK_response-1770219312","namespaces":["admin"],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"f0288bc7-4f14-43bf-8f51-c0914df1d182","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -55,15 +55,15 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"b86c065a-c185-41b7-a24b-718480129c1a","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":["admin.name"],"included_keyword_configuration":{"keywords":["credit
-        card"],"character_count":35},"is_enabled":true,"labels":[],"name":"Test-Create_Scanning_Rule_returns_OK_response-1768828266","namespaces":["admin"],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"e08a29f3-f7b2-4e32-af1f-f19ece1a12b3","type":"sensitive_data_scanner_group"}}}},"meta":{"version":277991}}'
+      string: '{"data":{"id":"b14f367d-9a45-4ced-b475-7384f7dba78c","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":["admin.name"],"included_keyword_configuration":{"keywords":["credit
+        card"],"character_count":35},"is_enabled":true,"labels":[],"name":"Test-Create_Scanning_Rule_returns_OK_response-1770219312","namespaces":["admin"],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"f0288bc7-4f14-43bf-8f51-c0914df1d182","type":"sensitive_data_scanner_group"}}}},"meta":{"version":286467}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:06 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:12 GMT
   request:
     body:
       encoding: UTF-8
@@ -74,18 +74,18 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/b86c065a-c185-41b7-a24b-718480129c1a
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/b14f367d-9a45-4ced-b475-7384f7dba78c
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277992}}'
+      string: '{"meta":{"version":286468}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:06 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:12 GMT
   request:
     body:
       encoding: UTF-8
@@ -96,11 +96,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/e08a29f3-f7b2-4e32-af1f-f19ece1a12b3
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/f0288bc7-4f14-43bf-8f51-c0914df1d182
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277993}}'
+      string: '{"meta":{"version":286469}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.frozen
index 27127dc5de8..7511e30a77b 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:08.516Z
\ No newline at end of file
+2026-02-04T15:35:14.554Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.yml
index 8478a05d69d..c5f36749fd0 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-with-should-save-match-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:08 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:14 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":277993}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286469}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:08 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:14 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,18 +32,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"966a1ab3-056d-4af9-a205-68e570e54c85","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":277994}}'
+      string: '{"data":{"id":"65a06c42-397f-41ea-8105-fb3d605543f7","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286469,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:08 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:14 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Create_Scanning_Rule_with_should_save_match_returns_OK_response-1768828268","pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"replacement_string":"REDACTED","should_save_match":true,"type":"replacement_string"}},"relationships":{"group":{"data":{"id":"966a1ab3-056d-4af9-a205-68e570e54c85","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
+      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Create_Scanning_Rule_with_should_save_match_returns_OK_response-1770219314","pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"replacement_string":"REDACTED","should_save_match":true,"type":"replacement_string"}},"relationships":{"group":{"data":{"id":"65a06c42-397f-41ea-8105-fb3d605543f7","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -54,14 +54,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"55dfd131-7ae1-4021-be59-4e4824eccc6f","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Create_Scanning_Rule_with_should_save_match_returns_OK_response-1768828268","namespaces":[],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"replacement_string","replacement_string":"REDACTED","should_save_match":true}},"relationships":{"group":{"data":{"id":"966a1ab3-056d-4af9-a205-68e570e54c85","type":"sensitive_data_scanner_group"}}}},"meta":{"version":277995}}'
+      string: '{"data":{"id":"1d0d0631-4bf6-4b68-974b-5773f91a754b","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Create_Scanning_Rule_with_should_save_match_returns_OK_response-1770219314","namespaces":[],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"replacement_string","replacement_string":"REDACTED","should_save_match":true}},"relationships":{"group":{"data":{"id":"65a06c42-397f-41ea-8105-fb3d605543f7","type":"sensitive_data_scanner_group"}}}},"meta":{"version":286471}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:08 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:14 GMT
   request:
     body:
       encoding: UTF-8
@@ -72,18 +72,18 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/55dfd131-7ae1-4021-be59-4e4824eccc6f
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/1d0d0631-4bf6-4b68-974b-5773f91a754b
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277996}}'
+      string: '{"meta":{"version":286472}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:08 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:14 GMT
   request:
     body:
       encoding: UTF-8
@@ -94,11 +94,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/966a1ab3-056d-4af9-a205-68e570e54c85
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/65a06c42-397f-41ea-8105-fb3d605543f7
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277997}}'
+      string: '{"meta":{"version":286473}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.frozen
index a788485a28c..914f697d04b 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:10.959Z
\ No newline at end of file
+2026-02-04T15:35:16.741Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.yml
index 603163e0b44..d098d6ffbde 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Group-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:10 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:16 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":277997}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286473}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:10 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:16 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,14 +32,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"80bca3a7-5ddc-4e3e-a56f-4cefe4352897","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":277998}}'
+      string: '{"data":{"id":"22cb8bb1-77c1-465a-9aea-2c97b2b05feb","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286473,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:10 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:16 GMT
   request:
     body:
       encoding: UTF-8
@@ -50,18 +50,18 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/80bca3a7-5ddc-4e3e-a56f-4cefe4352897
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/22cb8bb1-77c1-465a-9aea-2c97b2b05feb
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":277999}}'
+      string: '{"meta":{"version":286475}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:10 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:16 GMT
   request:
     body:
       encoding: UTF-8
@@ -72,7 +72,7 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/80bca3a7-5ddc-4e3e-a56f-4cefe4352897
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/22cb8bb1-77c1-465a-9aea-2c97b2b05feb
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.frozen
index d127bf52e6d..d7a52b210f5 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:12.858Z
\ No newline at end of file
+2026-02-04T15:35:18.579Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.yml
index 9148c65641b..f3a28843c76 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Delete-Scanning-Rule-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:12 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:18 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":277999}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286475}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:12 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:18 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,18 +32,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"3a1a28eb-b310-4160-a442-3641c9dbc6cd","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":278000}}'
+      string: '{"data":{"id":"9f3b9b44-45ea-4bb7-ae4d-5e8d3703c86e","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286475,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:12 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:18 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Delete_Scanning_Rule_returns_OK_response-1768828272","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"3a1a28eb-b310-4160-a442-3641c9dbc6cd","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
+      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Delete_Scanning_Rule_returns_OK_response-1770219318","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"9f3b9b44-45ea-4bb7-ae4d-5e8d3703c86e","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -54,14 +54,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"6aed2005-0134-49ec-93f2-5c5e8eeb92d0","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Delete_Scanning_Rule_returns_OK_response-1768828272","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"3a1a28eb-b310-4160-a442-3641c9dbc6cd","type":"sensitive_data_scanner_group"}}}},"meta":{"version":278001}}'
+      string: '{"data":{"id":"2346c8b6-25a9-404a-83b0-a41f9a01c39b","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Delete_Scanning_Rule_returns_OK_response-1770219318","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"9f3b9b44-45ea-4bb7-ae4d-5e8d3703c86e","type":"sensitive_data_scanner_group"}}}},"meta":{"version":286477}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:12 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:18 GMT
   request:
     body:
       encoding: UTF-8
@@ -72,18 +72,18 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/6aed2005-0134-49ec-93f2-5c5e8eeb92d0
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/2346c8b6-25a9-404a-83b0-a41f9a01c39b
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278002}}'
+      string: '{"meta":{"version":286478}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:12 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:18 GMT
   request:
     body:
       encoding: UTF-8
@@ -94,7 +94,7 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/6aed2005-0134-49ec-93f2-5c5e8eeb92d0
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/2346c8b6-25a9-404a-83b0-a41f9a01c39b
   response:
     body:
       encoding: UTF-8
@@ -106,7 +106,7 @@ http_interactions:
     status:
       code: 404
       message: Not Found
-- recorded_at: Mon, 19 Jan 2026 13:11:12 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:18 GMT
   request:
     body:
       encoding: UTF-8
@@ -117,11 +117,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/3a1a28eb-b310-4160-a442-3641c9dbc6cd
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/9f3b9b44-45ea-4bb7-ae4d-5e8d3703c86e
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278003}}'
+      string: '{"meta":{"version":286479}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.frozen
index 29c952c646e..d65e54d2650 100644
--- a/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:15.597Z
\ No newline at end of file
+2026-02-04T15:35:21.683Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.yml
index a5b0766b14c..9c12a551ac7 100644
--- a/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/List-Scanning-Groups-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:15 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:21 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":278003}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286479}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:15 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:21 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,14 +32,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"c0df76e1-ba56-4c93-a655-d97fbca1c35b","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":278004}}'
+      string: '{"data":{"id":"6e70d6cf-e0cc-4c78-b57c-542d26dec9ac","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286479,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:15 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:21 GMT
   request:
     body: null
     headers:
@@ -50,14 +50,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"c0df76e1-ba56-4c93-a655-d97fbca1c35b","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"id":"c0df76e1-ba56-4c93-a655-d97fbca1c35b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":278004}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"},{"id":"6e70d6cf-e0cc-4c78-b57c-542d26dec9ac","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"id":"6e70d6cf-e0cc-4c78-b57c-542d26dec9ac","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286480}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:15 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:21 GMT
   request:
     body:
       encoding: UTF-8
@@ -68,11 +68,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/c0df76e1-ba56-4c93-a655-d97fbca1c35b
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/6e70d6cf-e0cc-4c78-b57c-542d26dec9ac
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278005}}'
+      string: '{"meta":{"version":286481}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.frozen
index 840c910bafa..e23ea519304 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:17.545Z
\ No newline at end of file
+2026-02-04T15:35:25.335Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.yml b/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.yml
index 8ae370203e0..76c76e8d105 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Reorder-Groups-returns-Bad-Request-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:17 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:25 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":278005}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286481}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:17 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:25 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,18 +32,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"0558174c-d6af-4846-8954-35785f06837e","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":278006}}'
+      string: '{"data":{"id":"c8d07dad-d210-4fae-9678-3cb0c16394aa","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286481,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:17 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:25 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"Test-Reorder_Groups_returns_Bad_Request_response-1768828277","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"meta":{}}'
+      string: '{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"Test-Reorder_Groups_returns_Bad_Request_response-1770219325","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -54,15 +54,16 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"errors":[{"status":"400","title":"Bad Request","detail":"invalid_argument(Scanning
-        group IDs to reorder do not match current group IDs)"}]}'
+      string: '{"errors":[{"status":"400","title":"Invalid input","detail":"The number
+        of groups in the request should be the same as the number of groups in the
+        configuration"}]}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 400
       message: Bad Request
-- recorded_at: Mon, 19 Jan 2026 13:11:17 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:25 GMT
   request:
     body:
       encoding: UTF-8
@@ -73,11 +74,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/0558174c-d6af-4846-8954-35785f06837e
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/c8d07dad-d210-4fae-9678-3cb0c16394aa
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278007}}'
+      string: '{"meta":{"version":286483}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.frozen
index acb225bd527..9fc34d39ed2 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:21.712Z
\ No newline at end of file
+2026-02-04T15:35:27.122Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.yml
index ac3894f8b7b..da6338bf594 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Group-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:21 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:27 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":278010}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286483}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:21 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:27 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,36 +32,36 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"1fd9bd81-fd37-4aeb-b194-fd8ba909850b","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":278011}}'
+      string: '{"data":{"id":"cf51218a-1bb1-432c-8f94-b7918047fe28","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286483,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:21 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:27 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"filter":{"query":"*"},"is_enabled":false,"name":"Test-Update_Scanning_Group_returns_OK_response-1768828281","product_list":["logs"]},"id":"1fd9bd81-fd37-4aeb-b194-fd8ba909850b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},"meta":{}}'
+      string: '{"data":{"attributes":{"filter":{"query":"*"},"is_enabled":false,"name":"Test-Update_Scanning_Group_returns_OK_response-1770219327","product_list":["logs"]},"id":"cf51218a-1bb1-432c-8f94-b7918047fe28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},"meta":{}}'
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/1fd9bd81-fd37-4aeb-b194-fd8ba909850b
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/cf51218a-1bb1-432c-8f94-b7918047fe28
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278012}}'
+      string: '{"meta":{"version":286485}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:21 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:27 GMT
   request:
     body:
       encoding: UTF-8
@@ -72,11 +72,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/1fd9bd81-fd37-4aeb-b194-fd8ba909850b
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/cf51218a-1bb1-432c-8f94-b7918047fe28
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278013}}'
+      string: '{"meta":{"version":286486}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.frozen
index 1d88391dc54..217ffadddb7 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:23.526Z
\ No newline at end of file
+2026-02-04T15:35:28.928Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.yml b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.yml
index ccaa9879bac..1411d56ae35 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-Bad-Request-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:23 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:28 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":278013}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286486}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:23 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:28 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,18 +32,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"87305833-8ff5-46ee-a5ff-53706a123088","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":278014}}'
+      string: '{"data":{"id":"63096684-44d0-42f1-8471-0d004ea9afa7","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286486,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:23 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:28 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_Bad_Request_response-1768828283","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"87305833-8ff5-46ee-a5ff-53706a123088","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
+      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_Bad_Request_response-1770219328","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"63096684-44d0-42f1-8471-0d004ea9afa7","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -54,25 +54,25 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"d66bec9f-9df8-4142-b437-86d372e52bab","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Update_Scanning_Rule_returns_Bad_Request_response-1768828283","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"87305833-8ff5-46ee-a5ff-53706a123088","type":"sensitive_data_scanner_group"}}}},"meta":{"version":278015}}'
+      string: '{"data":{"id":"d2d9ec28-02ab-4256-bca0-b55e70131915","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Update_Scanning_Rule_returns_Bad_Request_response-1770219328","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"63096684-44d0-42f1-8471-0d004ea9afa7","type":"sensitive_data_scanner_group"}}}},"meta":{"version":286488}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:23 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:28 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_Bad_Request_response-1768828283","pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"87305833-8ff5-46ee-a5ff-53706a123088","type":"sensitive_data_scanner_group"}}}},"meta":{}}'
+      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_Bad_Request_response-1770219328","pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"63096684-44d0-42f1-8471-0d004ea9afa7","type":"sensitive_data_scanner_group"}}}},"meta":{}}'
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/d66bec9f-9df8-4142-b437-86d372e52bab
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/d2d9ec28-02ab-4256-bca0-b55e70131915
   response:
     body:
       encoding: UTF-8
@@ -84,7 +84,7 @@ http_interactions:
     status:
       code: 400
       message: Bad Request
-- recorded_at: Mon, 19 Jan 2026 13:11:23 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:28 GMT
   request:
     body:
       encoding: UTF-8
@@ -95,18 +95,18 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/d66bec9f-9df8-4142-b437-86d372e52bab
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/d2d9ec28-02ab-4256-bca0-b55e70131915
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278016}}'
+      string: '{"meta":{"version":286489}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:23 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:28 GMT
   request:
     body:
       encoding: UTF-8
@@ -117,11 +117,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/87305833-8ff5-46ee-a5ff-53706a123088
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/63096684-44d0-42f1-8471-0d004ea9afa7
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278017}}'
+      string: '{"meta":{"version":286490}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen
index 8842dc3c7f3..352dab9932b 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen
+++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen
@@ -1 +1 @@
-2026-01-19T13:11:26.353Z
\ No newline at end of file
+2026-02-04T15:35:31.594Z
\ No newline at end of file
diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml
index 1f3d41d9c63..02d02723524 100644
--- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml
+++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Mon, 19 Jan 2026 13:11:26 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:31 GMT
   request:
     body: null
     headers:
@@ -10,14 +10,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[]}},"type":"sensitive_data_scanner_configuration"},"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":278017}}'
+      string: '{"data":{"attributes":{},"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","relationships":{"groups":{"data":[{"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","type":"sensitive_data_scanner_group"},{"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","type":"sensitive_data_scanner_group"},{"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","type":"sensitive_data_scanner_group"},{"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","type":"sensitive_data_scanner_group"},{"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","type":"sensitive_data_scanner_group"},{"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","type":"sensitive_data_scanner_group"},{"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","type":"sensitive_data_scanner_group"},{"id":"5ea46624-4909-401e-8a99-492d916d493e","type":"sensitive_data_scanner_group"},{"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","type":"sensitive_data_scanner_group"},{"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","type":"sensitive_data_scanner_group"},{"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","type":"sensitive_data_scanner_group"},{"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","type":"sensitive_data_scanner_group"},{"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","type":"sensitive_data_scanner_group"},{"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","type":"sensitive_data_scanner_group"},{"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","type":"sensitive_data_scanner_group"},{"id":"61fb1574-8541-4e67-96eb-099c6b81f159","type":"sensitive_data_scanner_group"},{"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","type":"sensitive_data_scanner_group"},{"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","type":"sensitive_data_scanner_group"},{"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","type":"sensitive_data_scanner_group"}]}},"type":"sensitive_data_scanner_configuration"},"included":[{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"40f36cf1-dc37-46fd-a4df-93d55971f6c3","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"8b25277f-4192-4079-88b9-be2d39c2a5a9","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"6b02bc6f-1588-433d-8a5d-fab867ac386d","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"99cae8b0-3cd0-4fc8-88ba-501c8ae5c8bb","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769279092","product_list":["logs"],"samplings":[]},"id":"14fa0ce6-9e1c-4570-87ec-c3d42122166e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"e83cca8a-afe8-4012-92c9-b70a3ca72483","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"fa845597-18b7-41d1-88c3-c9f0e5ccc107","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"5ea46624-4909-401e-8a99-492d916d493e","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"1b1c8fb7-2564-475e-af6f-3d1b4e740137","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769293492","product_list":["logs"],"samplings":[]},"id":"38acc1c6-416d-4dcd-bf13-d0c9ef189c28","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"75dc5014-bafb-4e6f-bee1-c5eed459ae87","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"478f26b5-06a5-4a2f-abfc-34a4c723ca00","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"49f14d2d-c39f-4b7d-9c1a-faebeca167ca","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"aed4eaf2-8223-4922-b7be-d14f719c41b4","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769307892","product_list":["logs"],"samplings":[]},"id":"bcc8bd1a-5e67-40c7-9c8c-44318df2f5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"61fb1574-8541-4e67-96eb-099c6b81f159","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769322292","product_list":["logs"],"samplings":[]},"id":"414d38df-0daa-4d10-ac56-faf07e1fa67b","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769336692","product_list":["logs"],"samplings":[]},"id":"e1dd1a1d-7a06-4502-96c8-331b8da25927","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"},{"attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"Example-Create_Scanning_Group_returns_OK_response_1769495092","product_list":["logs"],"samplings":[]},"id":"cd20f1cf-6f14-4967-9794-f28f08ddb5a5","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}},"type":"sensitive_data_scanner_group"}],"meta":{"count_limit":500,"group_count_limit":20,"has_cascading_enabled":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"is_pci_compliant":false,"min_sampling_rate":10,"rule_count_limit":500,"version":286490}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:26 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:31 GMT
   request:
     body:
       encoding: UTF-8
@@ -32,18 +32,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"3ad08396-bb28-49b6-bb0b-3743eec0b822","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":278018}}'
+      string: '{"data":{"id":"9cf4b0d5-3e8d-435b-8a5b-ba0063cd336c","type":"sensitive_data_scanner_group","attributes":{"description":"","filter":{"query":"*"},"is_enabled":false,"name":"my-test-group","product_list":["logs"],"samplings":[{"product":"logs","rate":100}]},"relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"group_count_limit":20,"rule_count_limit":500,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true,"has_cascading_enabled":false,"is_configuration_superseded":false,"is_float_sampling_rate_enabled":false,"min_sampling_rate":10,"version":286490,"count_limit":500}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:26 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:31 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1768828286","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"3ad08396-bb28-49b6-bb0b-3743eec0b822","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
+      string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1770219331","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"9cf4b0d5-3e8d-435b-8a5b-ba0063cd336c","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
@@ -54,37 +54,37 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"ab1051c8-0c7a-4974-b994-4f850b8f0306","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Update_Scanning_Rule_returns_OK_response-1768828286","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"3ad08396-bb28-49b6-bb0b-3743eec0b822","type":"sensitive_data_scanner_group"}}}},"meta":{"version":278019}}'
+      string: '{"data":{"id":"9ce36dfc-4eb8-4710-8df0-d42bf008d7fb","type":"sensitive_data_scanner_rule","attributes":{"excluded_namespaces":[],"is_enabled":true,"labels":[],"name":"Test-Update_Scanning_Rule_returns_OK_response-1770219331","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"9cf4b0d5-3e8d-435b-8a5b-ba0063cd336c","type":"sensitive_data_scanner_group"}}}},"meta":{"version":286492}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 19 Jan 2026 13:11:26 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:31 GMT
   request:
     body:
       encoding: UTF-8
       string: '{"data":{"attributes":{"included_keyword_configuration":{"character_count":35,"keywords":["credit
-        card","cc"]},"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1768828286","pattern":"pattern","priority":5,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"id":"ab1051c8-0c7a-4974-b994-4f850b8f0306","type":"sensitive_data_scanner_rule"},"meta":{}}'
+        card","cc"]},"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1770219331","pattern":"pattern","priority":5,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"id":"9ce36dfc-4eb8-4710-8df0-d42bf008d7fb","type":"sensitive_data_scanner_rule"},"meta":{}}'
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/ab1051c8-0c7a-4974-b994-4f850b8f0306
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/9ce36dfc-4eb8-4710-8df0-d42bf008d7fb
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278020}}'
+      string: '{"meta":{"version":286493}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:26 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:31 GMT
   request:
     body:
       encoding: UTF-8
@@ -95,18 +95,18 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/ab1051c8-0c7a-4974-b994-4f850b8f0306
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/9ce36dfc-4eb8-4710-8df0-d42bf008d7fb
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278021}}'
+      string: '{"meta":{"version":286494}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 19 Jan 2026 13:11:26 GMT
+- recorded_at: Wed, 04 Feb 2026 15:35:31 GMT
   request:
     body:
       encoding: UTF-8
@@ -117,11 +117,11 @@ http_interactions:
       Content-Type:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/3ad08396-bb28-49b6-bb0b-3743eec0b822
+    uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/9cf4b0d5-3e8d-435b-8a5b-ba0063cd336c
   response:
     body:
       encoding: UTF-8
-      string: '{"meta":{"version":278022}}'
+      string: '{"meta":{"version":286495}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/examples/v2/incidents/CreateIncidentPostmortemTemplate.rb b/examples/v2/incidents/CreateIncidentPostmortemTemplate.rb
new file mode 100644
index 00000000000..5f83cd3c739
--- /dev/null
+++ b/examples/v2/incidents/CreateIncidentPostmortemTemplate.rb
@@ -0,0 +1,17 @@
+# Create postmortem template returns "Created" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.create_incident_postmortem_template".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::IncidentsAPI.new
+
+body = DatadogAPIClient::V2::PostmortemTemplateRequest.new({
+  data: DatadogAPIClient::V2::PostmortemTemplateDataRequest.new({
+    attributes: DatadogAPIClient::V2::PostmortemTemplateAttributesRequest.new({
+      name: "Standard Postmortem Template",
+    }),
+    type: DatadogAPIClient::V2::PostmortemTemplateType::POSTMORTEM_TEMPLATE,
+  }),
+})
+p api_instance.create_incident_postmortem_template(body)
diff --git a/examples/v2/incidents/DeleteIncidentPostmortemTemplate.rb b/examples/v2/incidents/DeleteIncidentPostmortemTemplate.rb
new file mode 100644
index 00000000000..f02aba4e5db
--- /dev/null
+++ b/examples/v2/incidents/DeleteIncidentPostmortemTemplate.rb
@@ -0,0 +1,8 @@
+# Delete postmortem template returns "No Content" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.delete_incident_postmortem_template".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::IncidentsAPI.new
+api_instance.delete_incident_postmortem_template("template-456")
diff --git a/examples/v2/incidents/GetIncidentPostmortemTemplate.rb b/examples/v2/incidents/GetIncidentPostmortemTemplate.rb
new file mode 100644
index 00000000000..502f06f0f69
--- /dev/null
+++ b/examples/v2/incidents/GetIncidentPostmortemTemplate.rb
@@ -0,0 +1,8 @@
+# Get postmortem template returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.get_incident_postmortem_template".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::IncidentsAPI.new
+p api_instance.get_incident_postmortem_template("template-456")
diff --git a/examples/v2/incidents/ListIncidentPostmortemTemplates.rb b/examples/v2/incidents/ListIncidentPostmortemTemplates.rb
new file mode 100644
index 00000000000..daf7012b132
--- /dev/null
+++ b/examples/v2/incidents/ListIncidentPostmortemTemplates.rb
@@ -0,0 +1,8 @@
+# List postmortem templates returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.list_incident_postmortem_templates".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::IncidentsAPI.new
+p api_instance.list_incident_postmortem_templates()
diff --git a/examples/v2/incidents/UpdateIncidentPostmortemTemplate.rb b/examples/v2/incidents/UpdateIncidentPostmortemTemplate.rb
new file mode 100644
index 00000000000..6a721b93762
--- /dev/null
+++ b/examples/v2/incidents/UpdateIncidentPostmortemTemplate.rb
@@ -0,0 +1,17 @@
+# Update postmortem template returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.update_incident_postmortem_template".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::IncidentsAPI.new
+
+body = DatadogAPIClient::V2::PostmortemTemplateRequest.new({
+  data: DatadogAPIClient::V2::PostmortemTemplateDataRequest.new({
+    attributes: DatadogAPIClient::V2::PostmortemTemplateAttributesRequest.new({
+      name: "Standard Postmortem Template",
+    }),
+    type: DatadogAPIClient::V2::PostmortemTemplateType::POSTMORTEM_TEMPLATE,
+  }),
+})
+p api_instance.update_incident_postmortem_template("template-456", body)
diff --git a/examples/v2/test-optimization/SearchFlakyTests.rb b/examples/v2/test-optimization/SearchFlakyTests.rb
index d0707c69930..a1f4e85d854 100644
--- a/examples/v2/test-optimization/SearchFlakyTests.rb
+++ b/examples/v2/test-optimization/SearchFlakyTests.rb
@@ -12,6 +12,7 @@
       filter: DatadogAPIClient::V2::FlakyTestsSearchFilter.new({
         query: 'flaky_test_state:active @git.repository.id_v2:"github.com/datadog/shopist"',
       }),
+      include_history: true,
       page: DatadogAPIClient::V2::FlakyTestsSearchPageOptions.new({
         cursor: "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==",
         limit: 25,
diff --git a/examples/v2/test-optimization/SearchFlakyTests_1224086727.rb b/examples/v2/test-optimization/SearchFlakyTests_1224086727.rb
index 0fa528df442..3a73c924473 100644
--- a/examples/v2/test-optimization/SearchFlakyTests_1224086727.rb
+++ b/examples/v2/test-optimization/SearchFlakyTests_1224086727.rb
@@ -12,6 +12,7 @@
       filter: DatadogAPIClient::V2::FlakyTestsSearchFilter.new({
         query: 'flaky_test_state:active @git.repository.id_v2:"github.com/datadog/shopist"',
       }),
+      include_history: true,
       page: DatadogAPIClient::V2::FlakyTestsSearchPageOptions.new({
         cursor: "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==",
         limit: 25,
diff --git a/examples/v2/test-optimization/SearchFlakyTests_209064879.rb b/examples/v2/test-optimization/SearchFlakyTests_209064879.rb
new file mode 100644
index 00000000000..7f3a97502a8
--- /dev/null
+++ b/examples/v2/test-optimization/SearchFlakyTests_209064879.rb
@@ -0,0 +1,27 @@
+# Search flaky tests returns "OK" response with history
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.search_flaky_tests".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::TestOptimizationAPI.new
+
+body = DatadogAPIClient::V2::FlakyTestsSearchRequest.new({
+  data: DatadogAPIClient::V2::FlakyTestsSearchRequestData.new({
+    attributes: DatadogAPIClient::V2::FlakyTestsSearchRequestAttributes.new({
+      filter: DatadogAPIClient::V2::FlakyTestsSearchFilter.new({
+        query: 'flaky_test_state:active @git.repository.id_v2:"github.com/datadog/shopist"',
+      }),
+      page: DatadogAPIClient::V2::FlakyTestsSearchPageOptions.new({
+        limit: 10,
+      }),
+      sort: DatadogAPIClient::V2::FlakyTestsSearchSort::FQN_ASCENDING,
+      include_history: true,
+    }),
+    type: DatadogAPIClient::V2::FlakyTestsSearchRequestDataType::SEARCH_FLAKY_TESTS_REQUEST,
+  }),
+})
+opts = {
+  body: body,
+}
+p api_instance.search_flaky_tests(opts)
diff --git a/features/scenarios_model_mapping.rb b/features/scenarios_model_mapping.rb
index f9f955f3192..833c5168665 100644
--- a/features/scenarios_model_mapping.rb
+++ b/features/scenarios_model_mapping.rb
@@ -2151,6 +2151,19 @@
             "include" => "String",
             "body" => "PatchIncidentNotificationTemplateRequest",
     },
+    "v2.CreateIncidentPostmortemTemplate" => {
+            "body" => "PostmortemTemplateRequest",
+    },
+    "v2.DeleteIncidentPostmortemTemplate" => {
+            "template_id" => "String",
+    },
+    "v2.GetIncidentPostmortemTemplate" => {
+            "template_id" => "String",
+    },
+    "v2.UpdateIncidentPostmortemTemplate" => {
+            "template_id" => "String",
+            "body" => "PostmortemTemplateRequest",
+    },
     "v2.ListIncidentTypes" => {
             "include_deleted" => "Boolean",
     },
diff --git a/features/v2/incidents.feature b/features/v2/incidents.feature
index db706355841..a683c2cac14 100644
--- a/features/v2/incidents.feature
+++ b/features/v2/incidents.feature
@@ -290,6 +290,22 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 Created
 
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Create postmortem template returns "Bad Request" response
+    Given operation "CreateIncidentPostmortemTemplate" enabled
+    And new "CreateIncidentPostmortemTemplate" request
+    And body with value {"data": {"attributes": {"name": "Standard Postmortem Template"}, "type": "postmortem_template"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Create postmortem template returns "Created" response
+    Given operation "CreateIncidentPostmortemTemplate" enabled
+    And new "CreateIncidentPostmortemTemplate" request
+    And body with value {"data": {"attributes": {"name": "Standard Postmortem Template"}, "type": "postmortem_template"}}
+    When the request is sent
+    Then the response status is 201 Created
+
   @generated @skip @team:Datadog/incident-app
   Scenario: Delete a notification template returns "Bad Request" response
     Given operation "DeleteIncidentNotificationTemplate" enabled
@@ -537,6 +553,30 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Delete postmortem template returns "Bad Request" response
+    Given operation "DeleteIncidentPostmortemTemplate" enabled
+    And new "DeleteIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Delete postmortem template returns "No Content" response
+    Given operation "DeleteIncidentPostmortemTemplate" enabled
+    And new "DeleteIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 204 No Content
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Delete postmortem template returns "Not Found" response
+    Given operation "DeleteIncidentPostmortemTemplate" enabled
+    And new "DeleteIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
   @generated @skip @team:DataDog/incident-app
   Scenario: Get a list of an incident's integration metadata returns "Bad Request" response
     Given operation "ListIncidentIntegrations" enabled
@@ -811,6 +851,30 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Get postmortem template returns "Bad Request" response
+    Given operation "GetIncidentPostmortemTemplate" enabled
+    And new "GetIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Get postmortem template returns "Not Found" response
+    Given operation "GetIncidentPostmortemTemplate" enabled
+    And new "GetIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Get postmortem template returns "OK" response
+    Given operation "GetIncidentPostmortemTemplate" enabled
+    And new "GetIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/incident-app
   Scenario: Get the details of an incident returns "Bad Request" response
     Given operation "GetIncident" enabled
@@ -940,6 +1004,20 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data" has length 0
 
+  @generated @skip @team:DataDog/incident-app
+  Scenario: List postmortem templates returns "Bad Request" response
+    Given operation "ListIncidentPostmortemTemplates" enabled
+    And new "ListIncidentPostmortemTemplates" request
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: List postmortem templates returns "OK" response
+    Given operation "ListIncidentPostmortemTemplates" enabled
+    And new "ListIncidentPostmortemTemplates" request
+    When the request is sent
+    Then the response status is 200 OK
+
   @team:DataDog/incident-app
   Scenario: Remove commander from an incident returns "OK" response
     Given operation "UpdateIncident" enabled
@@ -1270,3 +1348,30 @@ Feature: Incidents
     And the response "data.id" has the same value as "notification_template.data.id"
     And the response "data.attributes.name" has the same value as "unique"
     And the response "data.attributes.category" is equal to "update"
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Update postmortem template returns "Bad Request" response
+    Given operation "UpdateIncidentPostmortemTemplate" enabled
+    And new "UpdateIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"name": "Standard Postmortem Template"}, "type": "postmortem_template"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Update postmortem template returns "Not Found" response
+    Given operation "UpdateIncidentPostmortemTemplate" enabled
+    And new "UpdateIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"name": "Standard Postmortem Template"}, "type": "postmortem_template"}}
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/incident-app
+  Scenario: Update postmortem template returns "OK" response
+    Given operation "UpdateIncidentPostmortemTemplate" enabled
+    And new "UpdateIncidentPostmortemTemplate" request
+    And request contains "template_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"name": "Standard Postmortem Template"}, "type": "postmortem_template"}}
+    When the request is sent
+    Then the response status is 200 OK
diff --git a/features/v2/sensitive_data_scanner.feature b/features/v2/sensitive_data_scanner.feature
index d4b0d41f827..d439e16daa2 100644
--- a/features/v2/sensitive_data_scanner.feature
+++ b/features/v2/sensitive_data_scanner.feature
@@ -201,7 +201,7 @@ Feature: Sensitive Data Scanner
   Scenario: Update Scanning Rule returns "Not Found" response
     Given new "UpdateScanningRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"excluded_namespaces": ["admin.name"], "included_keyword_configuration": {"character_count": 30, "keywords": ["credit card", "cc"]}, "namespaces": ["admin"], "tags": [], "text_replacement": {"type": "none"}}, "relationships": {"group": {"data": {"type": "sensitive_data_scanner_group"}}, "standard_pattern": {"data": {"type": "sensitive_data_scanner_standard_pattern"}}}, "type": "sensitive_data_scanner_rule"}, "meta": {"version": 0}}
+    And body with value {"data": {"attributes": {"excluded_namespaces": ["admin.name"], "included_keyword_configuration": {"character_count": 30, "keywords": ["email", "address", "login"]}, "namespaces": ["admin"], "suppressions": {"ends_with": ["@example.com", "another.example.com"], "exact_match": ["admin@example.com", "user@example.com"], "starts_with": ["admin", "user"]}, "tags": [], "text_replacement": {"type": "none"}}, "relationships": {"group": {"data": {"type": "sensitive_data_scanner_group"}}, "standard_pattern": {"data": {"type": "sensitive_data_scanner_standard_pattern"}}}, "type": "sensitive_data_scanner_rule"}, "meta": {"version": 0}}
     When the request is sent
     Then the response status is 404 Not Found
 
diff --git a/features/v2/test_optimization.feature b/features/v2/test_optimization.feature
index d21278d7646..bbf7d87075e 100644
--- a/features/v2/test_optimization.feature
+++ b/features/v2/test_optimization.feature
@@ -13,7 +13,7 @@ Feature: Test Optimization
   Scenario: Search flaky tests returns "Bad Request" response
     Given operation "SearchFlakyTests" enabled
     And new "SearchFlakyTests" request
-    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
+    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "include_history": true, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -29,7 +29,7 @@ Feature: Test Optimization
   Scenario: Search flaky tests returns "OK" response
     Given operation "SearchFlakyTests" enabled
     And new "SearchFlakyTests" request
-    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
+    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "include_history": true, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
     When the request is sent
     Then the response status is 200 OK
 
@@ -41,11 +41,23 @@ Feature: Test Optimization
     When the request with pagination is sent
     Then the response status is 200 OK
 
+  @skip @team:DataDog/ci-app-backend
+  Scenario: Search flaky tests returns "OK" response with history
+    Given operation "SearchFlakyTests" enabled
+    And new "SearchFlakyTests" request
+    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"limit": 10}, "sort": "fqn", "include_history": true}, "type": "search_flaky_tests_request"}}
+    When the request is sent
+    Then the response status is 200 OK
+    And the response "data[0].attributes" has field "history"
+    And the response "data[0].attributes.history[0]" has field "status"
+    And the response "data[0].attributes.history[0]" has field "commit_sha"
+    And the response "data[0].attributes.history[0]" has field "timestamp"
+
   @generated @skip @team:DataDog/ci-app-backend @with-pagination
   Scenario: Search flaky tests returns "OK" response with pagination
     Given operation "SearchFlakyTests" enabled
     And new "SearchFlakyTests" request
-    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
+    And body with value {"data": {"attributes": {"filter": {"query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "include_history": true, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
     When the request with pagination is sent
     Then the response status is 200 OK
 
diff --git a/features/v2/undo.json b/features/v2/undo.json
index 7e549784ee6..c77dfee3356 100644
--- a/features/v2/undo.json
+++ b/features/v2/undo.json
@@ -1761,6 +1761,43 @@
       "type": "idempotent"
     }
   },
+  "ListIncidentPostmortemTemplates": {
+    "tag": "Incidents",
+    "undo": {
+      "type": "safe"
+    }
+  },
+  "CreateIncidentPostmortemTemplate": {
+    "tag": "Incidents",
+    "undo": {
+      "operationId": "DeleteIncidentPostmortemTemplate",
+      "parameters": [
+        {
+          "name": "template_id",
+          "source": "<RESPONSE_PATH>"
+        }
+      ],
+      "type": "unsafe"
+    }
+  },
+  "DeleteIncidentPostmortemTemplate": {
+    "tag": "Incidents",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
+  "GetIncidentPostmortemTemplate": {
+    "tag": "Incidents",
+    "undo": {
+      "type": "safe"
+    }
+  },
+  "UpdateIncidentPostmortemTemplate": {
+    "tag": "Incidents",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
   "ListIncidentTypes": {
     "tag": "Incidents",
     "undo": {
diff --git a/lib/datadog_api_client/configuration.rb b/lib/datadog_api_client/configuration.rb
index 1c3d360ecc9..f51747c826e 100644
--- a/lib/datadog_api_client/configuration.rb
+++ b/lib/datadog_api_client/configuration.rb
@@ -256,6 +256,7 @@ def initialize
             "v2.create_incident_notification_rule": false,
             "v2.create_incident_notification_template": false,
             "v2.create_incident_postmortem_attachment": false,
+            "v2.create_incident_postmortem_template": false,
             "v2.create_incident_todo": false,
             "v2.create_incident_type": false,
             "v2.delete_global_incident_handle": false,
@@ -264,6 +265,7 @@ def initialize
             "v2.delete_incident_integration": false,
             "v2.delete_incident_notification_rule": false,
             "v2.delete_incident_notification_template": false,
+            "v2.delete_incident_postmortem_template": false,
             "v2.delete_incident_todo": false,
             "v2.delete_incident_type": false,
             "v2.get_global_incident_settings": false,
@@ -271,6 +273,7 @@ def initialize
             "v2.get_incident_integration": false,
             "v2.get_incident_notification_rule": false,
             "v2.get_incident_notification_template": false,
+            "v2.get_incident_postmortem_template": false,
             "v2.get_incident_todo": false,
             "v2.get_incident_type": false,
             "v2.list_global_incident_handles": false,
@@ -278,6 +281,7 @@ def initialize
             "v2.list_incident_integrations": false,
             "v2.list_incident_notification_rules": false,
             "v2.list_incident_notification_templates": false,
+            "v2.list_incident_postmortem_templates": false,
             "v2.list_incidents": false,
             "v2.list_incident_todos": false,
             "v2.list_incident_types": false,
@@ -289,6 +293,7 @@ def initialize
             "v2.update_incident_integration": false,
             "v2.update_incident_notification_rule": false,
             "v2.update_incident_notification_template": false,
+            "v2.update_incident_postmortem_template": false,
             "v2.update_incident_todo": false,
             "v2.update_incident_type": false,
             "v2.create_jira_issue_template": false,
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index 8bcf2052b62..5e43080ff1d 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -2408,6 +2408,7 @@ def overrides
           "v2.flaky_test" => "FlakyTest",
           "v2.flaky_test_attributes" => "FlakyTestAttributes",
           "v2.flaky_test_attributes_flaky_state" => "FlakyTestAttributesFlakyState",
+          "v2.flaky_test_history" => "FlakyTestHistory",
           "v2.flaky_test_pipeline_stats" => "FlakyTestPipelineStats",
           "v2.flaky_test_run_metadata" => "FlakyTestRunMetadata",
           "v2.flaky_tests_pagination" => "FlakyTestsPagination",
@@ -3364,6 +3365,10 @@ def overrides
           "v2.observability_pipeline_amazon_security_lake_destination" => "ObservabilityPipelineAmazonSecurityLakeDestination",
           "v2.observability_pipeline_amazon_security_lake_destination_type" => "ObservabilityPipelineAmazonSecurityLakeDestinationType",
           "v2.observability_pipeline_aws_auth" => "ObservabilityPipelineAwsAuth",
+          "v2.observability_pipeline_buffer_options" => "ObservabilityPipelineBufferOptions",
+          "v2.observability_pipeline_buffer_options_disk_type" => "ObservabilityPipelineBufferOptionsDiskType",
+          "v2.observability_pipeline_buffer_options_memory_type" => "ObservabilityPipelineBufferOptionsMemoryType",
+          "v2.observability_pipeline_buffer_options_when_full" => "ObservabilityPipelineBufferOptionsWhenFull",
           "v2.observability_pipeline_cloud_prem_destination" => "ObservabilityPipelineCloudPremDestination",
           "v2.observability_pipeline_cloud_prem_destination_type" => "ObservabilityPipelineCloudPremDestinationType",
           "v2.observability_pipeline_config" => "ObservabilityPipelineConfig",
@@ -3397,6 +3402,7 @@ def overrides
           "v2.observability_pipeline_dedupe_processor" => "ObservabilityPipelineDedupeProcessor",
           "v2.observability_pipeline_dedupe_processor_mode" => "ObservabilityPipelineDedupeProcessorMode",
           "v2.observability_pipeline_dedupe_processor_type" => "ObservabilityPipelineDedupeProcessorType",
+          "v2.observability_pipeline_disk_buffer_options" => "ObservabilityPipelineDiskBufferOptions",
           "v2.observability_pipeline_elasticsearch_destination" => "ObservabilityPipelineElasticsearchDestination",
           "v2.observability_pipeline_elasticsearch_destination_api_version" => "ObservabilityPipelineElasticsearchDestinationApiVersion",
           "v2.observability_pipeline_elasticsearch_destination_data_stream" => "ObservabilityPipelineElasticsearchDestinationDataStream",
@@ -3463,6 +3469,8 @@ def overrides
           "v2.observability_pipeline_kafka_source_type" => "ObservabilityPipelineKafkaSourceType",
           "v2.observability_pipeline_logstash_source" => "ObservabilityPipelineLogstashSource",
           "v2.observability_pipeline_logstash_source_type" => "ObservabilityPipelineLogstashSourceType",
+          "v2.observability_pipeline_memory_buffer_options" => "ObservabilityPipelineMemoryBufferOptions",
+          "v2.observability_pipeline_memory_buffer_size_options" => "ObservabilityPipelineMemoryBufferSizeOptions",
           "v2.observability_pipeline_metadata_entry" => "ObservabilityPipelineMetadataEntry",
           "v2.observability_pipeline_metric_tags_processor" => "ObservabilityPipelineMetricTagsProcessor",
           "v2.observability_pipeline_metric_tags_processor_rule" => "ObservabilityPipelineMetricTagsProcessorRule",
@@ -3770,6 +3778,14 @@ def overrides
           "v2.postmortem_cell_attributes" => "PostmortemCellAttributes",
           "v2.postmortem_cell_definition" => "PostmortemCellDefinition",
           "v2.postmortem_cell_type" => "PostmortemCellType",
+          "v2.postmortem_template_attributes_request" => "PostmortemTemplateAttributesRequest",
+          "v2.postmortem_template_attributes_response" => "PostmortemTemplateAttributesResponse",
+          "v2.postmortem_template_data_request" => "PostmortemTemplateDataRequest",
+          "v2.postmortem_template_data_response" => "PostmortemTemplateDataResponse",
+          "v2.postmortem_template_request" => "PostmortemTemplateRequest",
+          "v2.postmortem_template_response" => "PostmortemTemplateResponse",
+          "v2.postmortem_templates_response" => "PostmortemTemplatesResponse",
+          "v2.postmortem_template_type" => "PostmortemTemplateType",
           "v2.powerpack" => "Powerpack",
           "v2.powerpack_attributes" => "PowerpackAttributes",
           "v2.powerpack_data" => "PowerpackData",
@@ -4469,6 +4485,7 @@ def overrides
           "v2.sensitive_data_scanner_standard_patterns_response_data" => "SensitiveDataScannerStandardPatternsResponseData",
           "v2.sensitive_data_scanner_standard_patterns_response_item" => "SensitiveDataScannerStandardPatternsResponseItem",
           "v2.sensitive_data_scanner_standard_pattern_type" => "SensitiveDataScannerStandardPatternType",
+          "v2.sensitive_data_scanner_suppressions" => "SensitiveDataScannerSuppressions",
           "v2.sensitive_data_scanner_text_replacement" => "SensitiveDataScannerTextReplacement",
           "v2.sensitive_data_scanner_text_replacement_type" => "SensitiveDataScannerTextReplacementType",
           "v2.service_account_create_attributes" => "ServiceAccountCreateAttributes",
diff --git a/lib/datadog_api_client/v2/api/incidents_api.rb b/lib/datadog_api_client/v2/api/incidents_api.rb
index 13ff0ab08e5..5f2fec4b906 100644
--- a/lib/datadog_api_client/v2/api/incidents_api.rb
+++ b/lib/datadog_api_client/v2/api/incidents_api.rb
@@ -631,6 +631,79 @@ def create_incident_postmortem_attachment_with_http_info(incident_id, body, opts
       return data, status_code, headers
     end
 
+    # Create postmortem template.
+    #
+    # @see #create_incident_postmortem_template_with_http_info
+    def create_incident_postmortem_template(body, opts = {})
+      data, _status_code, _headers = create_incident_postmortem_template_with_http_info(body, opts)
+      data
+    end
+
+    # Create postmortem template.
+    #
+    # Create a new postmortem template for incidents.
+    #
+    # @param body [PostmortemTemplateRequest] 
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(PostmortemTemplateResponse, Integer, Hash)>] PostmortemTemplateResponse data, response status code and response headers
+    def create_incident_postmortem_template_with_http_info(body, opts = {})
+      unstable_enabled = @api_client.config.unstable_operations["v2.create_incident_postmortem_template".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.create_incident_postmortem_template")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.create_incident_postmortem_template"))
+      end
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: IncidentsAPI.create_incident_postmortem_template ...'
+      end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling IncidentsAPI.create_incident_postmortem_template"
+      end
+      # resource path
+      local_var_path = '/api/v2/incidents/config/postmortem-templates'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(body)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'PostmortemTemplateResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :create_incident_postmortem_template,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: IncidentsAPI#create_incident_postmortem_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Create an incident todo.
     #
     # @see #create_incident_todo_with_http_info
@@ -1284,6 +1357,77 @@ def delete_incident_notification_template_with_http_info(id, opts = {})
       return data, status_code, headers
     end
 
+    # Delete postmortem template.
+    #
+    # @see #delete_incident_postmortem_template_with_http_info
+    def delete_incident_postmortem_template(template_id, opts = {})
+      delete_incident_postmortem_template_with_http_info(template_id, opts)
+      nil
+    end
+
+    # Delete postmortem template.
+    #
+    # Delete a postmortem template.
+    #
+    # @param template_id [String] The ID of the postmortem template
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
+    def delete_incident_postmortem_template_with_http_info(template_id, opts = {})
+      unstable_enabled = @api_client.config.unstable_operations["v2.delete_incident_postmortem_template".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.delete_incident_postmortem_template")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.delete_incident_postmortem_template"))
+      end
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: IncidentsAPI.delete_incident_postmortem_template ...'
+      end
+      # verify the required parameter 'template_id' is set
+      if @api_client.config.client_side_validation && template_id.nil?
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling IncidentsAPI.delete_incident_postmortem_template"
+      end
+      # resource path
+      local_var_path = '/api/v2/incidents/config/postmortem-templates/{template_id}'.sub('{template_id}', CGI.escape(template_id.to_s).gsub('%2F', '/'))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type]
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :delete_incident_postmortem_template,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Delete, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: IncidentsAPI#delete_incident_postmortem_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Delete an incident todo.
     #
     # @see #delete_incident_todo_with_http_info
@@ -1792,6 +1936,77 @@ def get_incident_notification_template_with_http_info(id, opts = {})
       return data, status_code, headers
     end
 
+    # Get postmortem template.
+    #
+    # @see #get_incident_postmortem_template_with_http_info
+    def get_incident_postmortem_template(template_id, opts = {})
+      data, _status_code, _headers = get_incident_postmortem_template_with_http_info(template_id, opts)
+      data
+    end
+
+    # Get postmortem template.
+    #
+    # Retrieve details of a specific postmortem template.
+    #
+    # @param template_id [String] The ID of the postmortem template
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(PostmortemTemplateResponse, Integer, Hash)>] PostmortemTemplateResponse data, response status code and response headers
+    def get_incident_postmortem_template_with_http_info(template_id, opts = {})
+      unstable_enabled = @api_client.config.unstable_operations["v2.get_incident_postmortem_template".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.get_incident_postmortem_template")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.get_incident_postmortem_template"))
+      end
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: IncidentsAPI.get_incident_postmortem_template ...'
+      end
+      # verify the required parameter 'template_id' is set
+      if @api_client.config.client_side_validation && template_id.nil?
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling IncidentsAPI.get_incident_postmortem_template"
+      end
+      # resource path
+      local_var_path = '/api/v2/incidents/config/postmortem-templates/{template_id}'.sub('{template_id}', CGI.escape(template_id.to_s).gsub('%2F', '/'))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'PostmortemTemplateResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :get_incident_postmortem_template,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: IncidentsAPI#get_incident_postmortem_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get incident todo details.
     #
     # @see #get_incident_todo_with_http_info
@@ -2358,6 +2573,72 @@ def list_incident_notification_templates_with_http_info(opts = {})
       return data, status_code, headers
     end
 
+    # List postmortem templates.
+    #
+    # @see #list_incident_postmortem_templates_with_http_info
+    def list_incident_postmortem_templates(opts = {})
+      data, _status_code, _headers = list_incident_postmortem_templates_with_http_info(opts)
+      data
+    end
+
+    # List postmortem templates.
+    #
+    # Retrieve a list of all postmortem templates for incidents.
+    #
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(PostmortemTemplatesResponse, Integer, Hash)>] PostmortemTemplatesResponse data, response status code and response headers
+    def list_incident_postmortem_templates_with_http_info(opts = {})
+      unstable_enabled = @api_client.config.unstable_operations["v2.list_incident_postmortem_templates".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.list_incident_postmortem_templates")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.list_incident_postmortem_templates"))
+      end
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: IncidentsAPI.list_incident_postmortem_templates ...'
+      end
+      # resource path
+      local_var_path = '/api/v2/incidents/config/postmortem-templates'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'PostmortemTemplatesResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :list_incident_postmortem_templates,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: IncidentsAPI#list_incident_postmortem_templates\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get a list of incidents.
     #
     # @see #list_incidents_with_http_info
@@ -3252,6 +3533,84 @@ def update_incident_notification_template_with_http_info(id, body, opts = {})
       return data, status_code, headers
     end
 
+    # Update postmortem template.
+    #
+    # @see #update_incident_postmortem_template_with_http_info
+    def update_incident_postmortem_template(template_id, body, opts = {})
+      data, _status_code, _headers = update_incident_postmortem_template_with_http_info(template_id, body, opts)
+      data
+    end
+
+    # Update postmortem template.
+    #
+    # Update an existing postmortem template.
+    #
+    # @param template_id [String] The ID of the postmortem template
+    # @param body [PostmortemTemplateRequest] 
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(PostmortemTemplateResponse, Integer, Hash)>] PostmortemTemplateResponse data, response status code and response headers
+    def update_incident_postmortem_template_with_http_info(template_id, body, opts = {})
+      unstable_enabled = @api_client.config.unstable_operations["v2.update_incident_postmortem_template".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.update_incident_postmortem_template")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.update_incident_postmortem_template"))
+      end
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: IncidentsAPI.update_incident_postmortem_template ...'
+      end
+      # verify the required parameter 'template_id' is set
+      if @api_client.config.client_side_validation && template_id.nil?
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling IncidentsAPI.update_incident_postmortem_template"
+      end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling IncidentsAPI.update_incident_postmortem_template"
+      end
+      # resource path
+      local_var_path = '/api/v2/incidents/config/postmortem-templates/{template_id}'.sub('{template_id}', CGI.escape(template_id.to_s).gsub('%2F', '/'))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(body)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'PostmortemTemplateResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :update_incident_postmortem_template,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: IncidentsAPI#update_incident_postmortem_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Update an incident todo.
     #
     # @see #update_incident_todo_with_http_info
diff --git a/lib/datadog_api_client/v2/api/test_optimization_api.rb b/lib/datadog_api_client/v2/api/test_optimization_api.rb
index 9a9967c7dfa..1432e542144 100644
--- a/lib/datadog_api_client/v2/api/test_optimization_api.rb
+++ b/lib/datadog_api_client/v2/api/test_optimization_api.rb
@@ -35,6 +35,19 @@ def search_flaky_tests(opts = {})
     #
     # List endpoint returning flaky tests from Flaky Test Management. Results are paginated.
     #
+    # The response includes comprehensive test information including:
+    # - Test identification and metadata (module, suite, name)
+    # - Flaky state and categorization
+    # - First and last flake occurrences (timestamp, branch, commit SHA)
+    # - Test execution statistics from the last 7 days (failure rate)
+    # - Pipeline impact metrics (failed pipelines count, total lost time)
+    # - Complete status change history (optional, ordered from most recent to oldest)
+    #
+    # Set `include_history` to `true` in the request to receive the status change history for each test.
+    # History is disabled by default for better performance.
+    #
+    # Results support filtering by various facets including service, environment, repository, branch, and test state.
+    #
     # @param opts [Hash] the optional parameters
     # @option opts [FlakyTestsSearchRequest] :body 
     # @return [Array<(FlakyTestsSearchResponse, Integer, Hash)>] FlakyTestsSearchResponse data, response status code and response headers
diff --git a/lib/datadog_api_client/v2/models/azure_storage_destination.rb b/lib/datadog_api_client/v2/models/azure_storage_destination.rb
index b17e732af9c..7d5d83703f2 100644
--- a/lib/datadog_api_client/v2/models/azure_storage_destination.rb
+++ b/lib/datadog_api_client/v2/models/azure_storage_destination.rb
@@ -26,6 +26,9 @@ class AzureStorageDestination
     # Optional prefix for blobs written to the container.
     attr_accessor :blob_prefix
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The name of the Azure Blob Storage container to store logs in.
     attr_reader :container_name
 
@@ -45,6 +48,7 @@ class AzureStorageDestination
     def self.attribute_map
       {
         :'blob_prefix' => :'blob_prefix',
+        :'buffer' => :'buffer',
         :'container_name' => :'container_name',
         :'id' => :'id',
         :'inputs' => :'inputs',
@@ -57,6 +61,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'blob_prefix' => :'String',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'container_name' => :'String',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
@@ -86,6 +91,10 @@ def initialize(attributes = {})
         self.blob_prefix = attributes[:'blob_prefix']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'container_name')
         self.container_name = attributes[:'container_name']
       end
@@ -183,6 +192,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           blob_prefix == o.blob_prefix &&
+          buffer == o.buffer &&
           container_name == o.container_name &&
           id == o.id &&
           inputs == o.inputs &&
@@ -194,7 +204,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [blob_prefix, container_name, id, inputs, type, additional_properties].hash
+      [blob_prefix, buffer, container_name, id, inputs, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/flaky_test_attributes.rb b/lib/datadog_api_client/v2/models/flaky_test_attributes.rb
index 81256458ad2..9f534395109 100644
--- a/lib/datadog_api_client/v2/models/flaky_test_attributes.rb
+++ b/lib/datadog_api_client/v2/models/flaky_test_attributes.rb
@@ -48,6 +48,10 @@ class FlakyTestAttributes
     # The current state of the flaky test.
     attr_accessor :flaky_state
 
+    # Chronological history of status changes for this flaky test, ordered from most recent to oldest.
+    # Includes state transitions like new -> quarantined -> fixed, along with the associated commit SHA when available.
+    attr_accessor :history
+
     # The branch name where the test exhibited flakiness for the last time.
     attr_accessor :last_flaked_branch
 
@@ -100,6 +104,7 @@ def self.attribute_map
         :'first_flaked_ts' => :'first_flaked_ts',
         :'flaky_category' => :'flaky_category',
         :'flaky_state' => :'flaky_state',
+        :'history' => :'history',
         :'last_flaked_branch' => :'last_flaked_branch',
         :'last_flaked_sha' => :'last_flaked_sha',
         :'last_flaked_ts' => :'last_flaked_ts',
@@ -125,6 +130,7 @@ def self.openapi_types
         :'first_flaked_ts' => :'Integer',
         :'flaky_category' => :'String',
         :'flaky_state' => :'FlakyTestAttributesFlakyState',
+        :'history' => :'Array<FlakyTestHistory>',
         :'last_flaked_branch' => :'String',
         :'last_flaked_sha' => :'String',
         :'last_flaked_ts' => :'Integer',
@@ -201,6 +207,12 @@ def initialize(attributes = {})
         self.flaky_state = attributes[:'flaky_state']
       end
 
+      if attributes.key?(:'history')
+        if (value = attributes[:'history']).is_a?(Array)
+          self.history = value
+        end
+      end
+
       if attributes.key?(:'last_flaked_branch')
         self.last_flaked_branch = attributes[:'last_flaked_branch']
       end
@@ -278,6 +290,7 @@ def ==(o)
           first_flaked_ts == o.first_flaked_ts &&
           flaky_category == o.flaky_category &&
           flaky_state == o.flaky_state &&
+          history == o.history &&
           last_flaked_branch == o.last_flaked_branch &&
           last_flaked_sha == o.last_flaked_sha &&
           last_flaked_ts == o.last_flaked_ts &&
@@ -295,7 +308,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [attempt_to_fix_id, codeowners, envs, first_flaked_branch, first_flaked_sha, first_flaked_ts, flaky_category, flaky_state, last_flaked_branch, last_flaked_sha, last_flaked_ts, _module, name, pipeline_stats, services, suite, test_run_metadata, test_stats, additional_properties].hash
+      [attempt_to_fix_id, codeowners, envs, first_flaked_branch, first_flaked_sha, first_flaked_ts, flaky_category, flaky_state, history, last_flaked_branch, last_flaked_sha, last_flaked_ts, _module, name, pipeline_stats, services, suite, test_run_metadata, test_stats, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/flaky_test_history.rb b/lib/datadog_api_client/v2/models/flaky_test_history.rb
new file mode 100644
index 00000000000..7b6316e067b
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/flaky_test_history.rb
@@ -0,0 +1,165 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # A single history entry representing a status change for a flaky test.
+  class FlakyTestHistory
+    include BaseGenericModel
+
+    # The commit SHA associated with this status change. Will be an empty string if the commit SHA is not available.
+    attr_reader :commit_sha
+
+    # The test status at this point in history.
+    attr_reader :status
+
+    # Unix timestamp in milliseconds when this status change occurred.
+    attr_reader :timestamp
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'commit_sha' => :'commit_sha',
+        :'status' => :'status',
+        :'timestamp' => :'timestamp'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'commit_sha' => :'String',
+        :'status' => :'String',
+        :'timestamp' => :'Integer'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::FlakyTestHistory` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'commit_sha')
+        self.commit_sha = attributes[:'commit_sha']
+      end
+
+      if attributes.key?(:'status')
+        self.status = attributes[:'status']
+      end
+
+      if attributes.key?(:'timestamp')
+        self.timestamp = attributes[:'timestamp']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @commit_sha.nil?
+      return false if @status.nil?
+      return false if @timestamp.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param commit_sha [Object] Object to be assigned
+    # @!visibility private
+    def commit_sha=(commit_sha)
+      if commit_sha.nil?
+        fail ArgumentError, 'invalid value for "commit_sha", commit_sha cannot be nil.'
+      end
+      @commit_sha = commit_sha
+    end
+
+    # Custom attribute writer method with validation
+    # @param status [Object] Object to be assigned
+    # @!visibility private
+    def status=(status)
+      if status.nil?
+        fail ArgumentError, 'invalid value for "status", status cannot be nil.'
+      end
+      @status = status
+    end
+
+    # Custom attribute writer method with validation
+    # @param timestamp [Object] Object to be assigned
+    # @!visibility private
+    def timestamp=(timestamp)
+      if timestamp.nil?
+        fail ArgumentError, 'invalid value for "timestamp", timestamp cannot be nil.'
+      end
+      @timestamp = timestamp
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          commit_sha == o.commit_sha &&
+          status == o.status &&
+          timestamp == o.timestamp &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [commit_sha, status, timestamp, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/flaky_tests_search_request_attributes.rb b/lib/datadog_api_client/v2/models/flaky_tests_search_request_attributes.rb
index 8dfed991364..6123d48bf89 100644
--- a/lib/datadog_api_client/v2/models/flaky_tests_search_request_attributes.rb
+++ b/lib/datadog_api_client/v2/models/flaky_tests_search_request_attributes.rb
@@ -24,6 +24,11 @@ class FlakyTestsSearchRequestAttributes
     # Search filter settings.
     attr_accessor :filter
 
+    # Whether to include the status change history for each flaky test in the response.
+    # When set to true, each test will include a `history` array with chronological status changes.
+    # Defaults to false.
+    attr_accessor :include_history
+
     # Pagination attributes for listing flaky tests.
     attr_accessor :page
 
@@ -37,6 +42,7 @@ class FlakyTestsSearchRequestAttributes
     def self.attribute_map
       {
         :'filter' => :'filter',
+        :'include_history' => :'include_history',
         :'page' => :'page',
         :'sort' => :'sort'
       }
@@ -47,6 +53,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'filter' => :'FlakyTestsSearchFilter',
+        :'include_history' => :'Boolean',
         :'page' => :'FlakyTestsSearchPageOptions',
         :'sort' => :'FlakyTestsSearchSort'
       }
@@ -74,6 +81,10 @@ def initialize(attributes = {})
         self.filter = attributes[:'filter']
       end
 
+      if attributes.key?(:'include_history')
+        self.include_history = attributes[:'include_history']
+      end
+
       if attributes.key?(:'page')
         self.page = attributes[:'page']
       end
@@ -110,6 +121,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           filter == o.filter &&
+          include_history == o.include_history &&
           page == o.page &&
           sort == o.sort &&
           additional_properties == o.additional_properties
@@ -119,7 +131,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [filter, page, sort, additional_properties].hash
+      [filter, include_history, page, sort, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/microsoft_sentinel_destination.rb b/lib/datadog_api_client/v2/models/microsoft_sentinel_destination.rb
index 4948de659f0..e3a352437e3 100644
--- a/lib/datadog_api_client/v2/models/microsoft_sentinel_destination.rb
+++ b/lib/datadog_api_client/v2/models/microsoft_sentinel_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class MicrosoftSentinelDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Azure AD client ID used for authentication.
     attr_reader :client_id
 
@@ -50,6 +53,7 @@ class MicrosoftSentinelDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'client_id' => :'client_id',
         :'dcr_immutable_id' => :'dcr_immutable_id',
         :'id' => :'id',
@@ -64,6 +68,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'client_id' => :'String',
         :'dcr_immutable_id' => :'String',
         :'id' => :'String',
@@ -92,6 +97,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'client_id')
         self.client_id = attributes[:'client_id']
       end
@@ -233,6 +242,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           client_id == o.client_id &&
           dcr_immutable_id == o.dcr_immutable_id &&
           id == o.id &&
@@ -247,7 +257,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [client_id, dcr_immutable_id, id, inputs, table, tenant_id, type, additional_properties].hash
+      [buffer, client_id, dcr_immutable_id, id, inputs, table, tenant_id, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_amazon_open_search_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_amazon_open_search_destination.rb
index 44f1c6db5b6..3b517345a7f 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_amazon_open_search_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_amazon_open_search_destination.rb
@@ -27,6 +27,9 @@ class ObservabilityPipelineAmazonOpenSearchDestination
     # The `strategy` field determines whether basic or AWS-based authentication is used.
     attr_reader :auth
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The index to write logs to.
     attr_accessor :bulk_index
 
@@ -46,6 +49,7 @@ class ObservabilityPipelineAmazonOpenSearchDestination
     def self.attribute_map
       {
         :'auth' => :'auth',
+        :'buffer' => :'buffer',
         :'bulk_index' => :'bulk_index',
         :'id' => :'id',
         :'inputs' => :'inputs',
@@ -58,6 +62,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'auth' => :'ObservabilityPipelineAmazonOpenSearchDestinationAuth',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'bulk_index' => :'String',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
@@ -87,6 +92,10 @@ def initialize(attributes = {})
         self.auth = attributes[:'auth']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'bulk_index')
         self.bulk_index = attributes[:'bulk_index']
       end
@@ -184,6 +193,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           auth == o.auth &&
+          buffer == o.buffer &&
           bulk_index == o.bulk_index &&
           id == o.id &&
           inputs == o.inputs &&
@@ -195,7 +205,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [auth, bulk_index, id, inputs, type, additional_properties].hash
+      [auth, buffer, bulk_index, id, inputs, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_amazon_s3_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_amazon_s3_destination.rb
index aec7f0bbcbf..10e95955f83 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_amazon_s3_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_amazon_s3_destination.rb
@@ -30,6 +30,9 @@ class ObservabilityPipelineAmazonS3Destination
     # S3 bucket name.
     attr_reader :bucket
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Unique identifier for the destination component.
     attr_reader :id
 
@@ -59,6 +62,7 @@ def self.attribute_map
       {
         :'auth' => :'auth',
         :'bucket' => :'bucket',
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'key_prefix' => :'key_prefix',
@@ -75,6 +79,7 @@ def self.openapi_types
       {
         :'auth' => :'ObservabilityPipelineAwsAuth',
         :'bucket' => :'String',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'key_prefix' => :'String',
@@ -111,6 +116,10 @@ def initialize(attributes = {})
         self.bucket = attributes[:'bucket']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -243,6 +252,7 @@ def ==(o)
       self.class == o.class &&
           auth == o.auth &&
           bucket == o.bucket &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           key_prefix == o.key_prefix &&
@@ -257,7 +267,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [auth, bucket, id, inputs, key_prefix, region, storage_class, tls, type, additional_properties].hash
+      [auth, bucket, buffer, id, inputs, key_prefix, region, storage_class, tls, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_amazon_security_lake_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_amazon_security_lake_destination.rb
index 6bc480ae997..59b5386ca03 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_amazon_security_lake_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_amazon_security_lake_destination.rb
@@ -30,6 +30,9 @@ class ObservabilityPipelineAmazonSecurityLakeDestination
     # Name of the Amazon S3 bucket in Security Lake (3-63 characters).
     attr_reader :bucket
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Custom source name for the logs in Security Lake.
     attr_reader :custom_source_name
 
@@ -56,6 +59,7 @@ def self.attribute_map
       {
         :'auth' => :'auth',
         :'bucket' => :'bucket',
+        :'buffer' => :'buffer',
         :'custom_source_name' => :'custom_source_name',
         :'id' => :'id',
         :'inputs' => :'inputs',
@@ -71,6 +75,7 @@ def self.openapi_types
       {
         :'auth' => :'ObservabilityPipelineAwsAuth',
         :'bucket' => :'String',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'custom_source_name' => :'String',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
@@ -106,6 +111,10 @@ def initialize(attributes = {})
         self.bucket = attributes[:'bucket']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'custom_source_name')
         self.custom_source_name = attributes[:'custom_source_name']
       end
@@ -234,6 +243,7 @@ def ==(o)
       self.class == o.class &&
           auth == o.auth &&
           bucket == o.bucket &&
+          buffer == o.buffer &&
           custom_source_name == o.custom_source_name &&
           id == o.id &&
           inputs == o.inputs &&
@@ -247,7 +257,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [auth, bucket, custom_source_name, id, inputs, region, tls, type, additional_properties].hash
+      [auth, bucket, buffer, custom_source_name, id, inputs, region, tls, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options.rb b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options.rb
new file mode 100644
index 00000000000..ef7445c56a0
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options.rb
@@ -0,0 +1,64 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Configuration for buffer settings on destination components.
+  module ObservabilityPipelineBufferOptions
+    class << self
+      include BaseOneOfModel
+      include BaseOneOfModelNoDiscriminator
+
+      # List of class defined in oneOf (OpenAPI v3)
+      def openapi_one_of
+        [
+          :'ObservabilityPipelineDiskBufferOptions',
+          :'ObservabilityPipelineMemoryBufferOptions',
+          :'ObservabilityPipelineMemoryBufferSizeOptions'
+        ]
+      end
+      # Builds the object
+      # @param data [Mixed] Data to be matched against the list of oneOf items
+      # @return [Object] Returns the model or the data itself
+      def build(data)
+        # Go through the list of oneOf items and attempt to identify the appropriate one.
+        # Note:
+        # - We do not attempt to check whether exactly one item matches.
+        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
+        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
+        # - TODO: scalar values are de facto behaving as if they were nullable.
+        # - TODO: logging when debugging is set.
+        openapi_one_of.each do |klass|
+          begin
+            next if klass == :AnyType # "nullable: true"
+            typed_data = find_and_cast_into_type(klass, data)
+            next if typed_data.respond_to?(:_unparsed) && typed_data._unparsed
+            return typed_data if typed_data
+          rescue # rescue all errors so we keep iterating even if the current item lookup raises
+          end
+        end
+
+        if openapi_one_of.include?(:AnyType)
+          data
+        else
+          self._unparsed = true
+          DatadogAPIClient::UnparsedObject.new(data)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_disk_type.rb b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_disk_type.rb
new file mode 100644
index 00000000000..efe88cd7ce7
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_disk_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The type of the buffer that will be configured, a disk buffer.
+  class ObservabilityPipelineBufferOptionsDiskType
+    include BaseEnumModel
+
+    DISK = "disk".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_memory_type.rb b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_memory_type.rb
new file mode 100644
index 00000000000..e11826e973f
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_memory_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The type of the buffer that will be configured, a memory buffer.
+  class ObservabilityPipelineBufferOptionsMemoryType
+    include BaseEnumModel
+
+    MEMORY = "memory".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_when_full.rb b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_when_full.rb
new file mode 100644
index 00000000000..38d6af94c8b
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_buffer_options_when_full.rb
@@ -0,0 +1,27 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Behavior when the buffer is full (block and stop accepting new events, or drop new events)
+  class ObservabilityPipelineBufferOptionsWhenFull
+    include BaseEnumModel
+
+    BLOCK = "block".freeze
+    DROP_NEWEST = "drop_newest".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_crowd_strike_next_gen_siem_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_crowd_strike_next_gen_siem_destination.rb
index 3a24137f6c7..04bba5d3a09 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_crowd_strike_next_gen_siem_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_crowd_strike_next_gen_siem_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineCrowdStrikeNextGenSiemDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Compression configuration for log events.
     attr_accessor :compression
 
@@ -47,6 +50,7 @@ class ObservabilityPipelineCrowdStrikeNextGenSiemDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'compression' => :'compression',
         :'encoding' => :'encoding',
         :'id' => :'id',
@@ -60,6 +64,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'compression' => :'ObservabilityPipelineCrowdStrikeNextGenSiemDestinationCompression',
         :'encoding' => :'ObservabilityPipelineCrowdStrikeNextGenSiemDestinationEncoding',
         :'id' => :'String',
@@ -87,6 +92,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'compression')
         self.compression = attributes[:'compression']
       end
@@ -191,6 +200,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           compression == o.compression &&
           encoding == o.encoding &&
           id == o.id &&
@@ -204,7 +214,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [compression, encoding, id, inputs, tls, type, additional_properties].hash
+      [buffer, compression, encoding, id, inputs, tls, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_datadog_logs_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_datadog_logs_destination.rb
index 090ec2243bf..0a9cd1e9d70 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_datadog_logs_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_datadog_logs_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineDatadogLogsDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The unique identifier for this component.
     attr_reader :id
 
@@ -41,6 +44,7 @@ class ObservabilityPipelineDatadogLogsDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'routes' => :'routes',
@@ -52,6 +56,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'routes' => :'Array<ObservabilityPipelineDatadogLogsDestinationRoute>',
@@ -77,6 +82,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -175,6 +184,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           routes == o.routes &&
@@ -186,7 +196,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [id, inputs, routes, type, additional_properties].hash
+      [buffer, id, inputs, routes, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_disk_buffer_options.rb b/lib/datadog_api_client/v2/models/observability_pipeline_disk_buffer_options.rb
new file mode 100644
index 00000000000..44be529f2c8
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_disk_buffer_options.rb
@@ -0,0 +1,125 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Options for configuring a disk buffer.
+  class ObservabilityPipelineDiskBufferOptions
+    include BaseGenericModel
+
+    # Maximum size of the disk buffer.
+    attr_accessor :max_size
+
+    # The type of the buffer that will be configured, a disk buffer.
+    attr_accessor :type
+
+    # Behavior when the buffer is full (block and stop accepting new events, or drop new events)
+    attr_accessor :when_full
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'max_size' => :'max_size',
+        :'type' => :'type',
+        :'when_full' => :'when_full'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'max_size' => :'Integer',
+        :'type' => :'ObservabilityPipelineBufferOptionsDiskType',
+        :'when_full' => :'ObservabilityPipelineBufferOptionsWhenFull'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ObservabilityPipelineDiskBufferOptions` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'max_size')
+        self.max_size = attributes[:'max_size']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+
+      if attributes.key?(:'when_full')
+        self.when_full = attributes[:'when_full']
+      end
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          max_size == o.max_size &&
+          type == o.type &&
+          when_full == o.when_full &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [max_size, type, when_full, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_elasticsearch_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_elasticsearch_destination.rb
index d3e3475ce72..c60d54c5623 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_elasticsearch_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_elasticsearch_destination.rb
@@ -26,6 +26,9 @@ class ObservabilityPipelineElasticsearchDestination
     # The Elasticsearch API version to use. Set to `auto` to auto-detect.
     attr_accessor :api_version
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The index to write logs to in Elasticsearch.
     attr_accessor :bulk_index
 
@@ -48,6 +51,7 @@ class ObservabilityPipelineElasticsearchDestination
     def self.attribute_map
       {
         :'api_version' => :'api_version',
+        :'buffer' => :'buffer',
         :'bulk_index' => :'bulk_index',
         :'data_stream' => :'data_stream',
         :'id' => :'id',
@@ -61,6 +65,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'api_version' => :'ObservabilityPipelineElasticsearchDestinationApiVersion',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'bulk_index' => :'String',
         :'data_stream' => :'ObservabilityPipelineElasticsearchDestinationDataStream',
         :'id' => :'String',
@@ -91,6 +96,10 @@ def initialize(attributes = {})
         self.api_version = attributes[:'api_version']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'bulk_index')
         self.bulk_index = attributes[:'bulk_index']
       end
@@ -181,6 +190,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           api_version == o.api_version &&
+          buffer == o.buffer &&
           bulk_index == o.bulk_index &&
           data_stream == o.data_stream &&
           id == o.id &&
@@ -193,7 +203,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [api_version, bulk_index, data_stream, id, inputs, type, additional_properties].hash
+      [api_version, buffer, bulk_index, data_stream, id, inputs, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_google_chronicle_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_google_chronicle_destination.rb
index 93eed57d636..6535b32ee31 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_google_chronicle_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_google_chronicle_destination.rb
@@ -26,6 +26,9 @@ class ObservabilityPipelineGoogleChronicleDestination
     # GCP credentials used to authenticate with Google Cloud Storage.
     attr_accessor :auth
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The Google Chronicle customer ID.
     attr_reader :customer_id
 
@@ -51,6 +54,7 @@ class ObservabilityPipelineGoogleChronicleDestination
     def self.attribute_map
       {
         :'auth' => :'auth',
+        :'buffer' => :'buffer',
         :'customer_id' => :'customer_id',
         :'encoding' => :'encoding',
         :'id' => :'id',
@@ -65,6 +69,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'auth' => :'ObservabilityPipelineGcpAuth',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'customer_id' => :'String',
         :'encoding' => :'ObservabilityPipelineGoogleChronicleDestinationEncoding',
         :'id' => :'String',
@@ -96,6 +101,10 @@ def initialize(attributes = {})
         self.auth = attributes[:'auth']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'customer_id')
         self.customer_id = attributes[:'customer_id']
       end
@@ -201,6 +210,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           auth == o.auth &&
+          buffer == o.buffer &&
           customer_id == o.customer_id &&
           encoding == o.encoding &&
           id == o.id &&
@@ -214,7 +224,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [auth, customer_id, encoding, id, inputs, log_type, type, additional_properties].hash
+      [auth, buffer, customer_id, encoding, id, inputs, log_type, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_google_cloud_storage_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_google_cloud_storage_destination.rb
index e1572e3804a..9379bc1ecb3 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_google_cloud_storage_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_google_cloud_storage_destination.rb
@@ -33,6 +33,9 @@ class ObservabilityPipelineGoogleCloudStorageDestination
     # Name of the GCS bucket.
     attr_reader :bucket
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Unique identifier for the destination component.
     attr_reader :id
 
@@ -60,6 +63,7 @@ def self.attribute_map
         :'acl' => :'acl',
         :'auth' => :'auth',
         :'bucket' => :'bucket',
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'key_prefix' => :'key_prefix',
@@ -76,6 +80,7 @@ def self.openapi_types
         :'acl' => :'ObservabilityPipelineGoogleCloudStorageDestinationAcl',
         :'auth' => :'ObservabilityPipelineGcpAuth',
         :'bucket' => :'String',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'key_prefix' => :'String',
@@ -115,6 +120,10 @@ def initialize(attributes = {})
         self.bucket = attributes[:'bucket']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -235,6 +244,7 @@ def ==(o)
           acl == o.acl &&
           auth == o.auth &&
           bucket == o.bucket &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           key_prefix == o.key_prefix &&
@@ -248,7 +258,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [acl, auth, bucket, id, inputs, key_prefix, metadata, storage_class, type, additional_properties].hash
+      [acl, auth, bucket, buffer, id, inputs, key_prefix, metadata, storage_class, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_google_pub_sub_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_google_pub_sub_destination.rb
index f85845c5aea..329b0c19b4b 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_google_pub_sub_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_google_pub_sub_destination.rb
@@ -26,6 +26,9 @@ class ObservabilityPipelineGooglePubSubDestination
     # GCP credentials used to authenticate with Google Cloud Storage.
     attr_accessor :auth
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Encoding format for log events.
     attr_reader :encoding
 
@@ -54,6 +57,7 @@ class ObservabilityPipelineGooglePubSubDestination
     def self.attribute_map
       {
         :'auth' => :'auth',
+        :'buffer' => :'buffer',
         :'encoding' => :'encoding',
         :'id' => :'id',
         :'inputs' => :'inputs',
@@ -69,6 +73,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'auth' => :'ObservabilityPipelineGcpAuth',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'encoding' => :'ObservabilityPipelineGooglePubSubDestinationEncoding',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
@@ -101,6 +106,10 @@ def initialize(attributes = {})
         self.auth = attributes[:'auth']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'encoding')
         self.encoding = attributes[:'encoding']
       end
@@ -232,6 +241,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           auth == o.auth &&
+          buffer == o.buffer &&
           encoding == o.encoding &&
           id == o.id &&
           inputs == o.inputs &&
@@ -246,7 +256,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [auth, encoding, id, inputs, project, tls, topic, type, additional_properties].hash
+      [auth, buffer, encoding, id, inputs, project, tls, topic, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_memory_buffer_options.rb b/lib/datadog_api_client/v2/models/observability_pipeline_memory_buffer_options.rb
new file mode 100644
index 00000000000..eb67ff1e90d
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_memory_buffer_options.rb
@@ -0,0 +1,115 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Options for configuring a memory buffer by byte size.
+  class ObservabilityPipelineMemoryBufferOptions
+    include BaseGenericModel
+
+    # Maximum size of the memory buffer.
+    attr_accessor :max_size
+
+    # The type of the buffer that will be configured, a memory buffer.
+    attr_accessor :type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'max_size' => :'max_size',
+        :'type' => :'type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'max_size' => :'Integer',
+        :'type' => :'ObservabilityPipelineBufferOptionsMemoryType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ObservabilityPipelineMemoryBufferOptions` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'max_size')
+        self.max_size = attributes[:'max_size']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          max_size == o.max_size &&
+          type == o.type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [max_size, type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_memory_buffer_size_options.rb b/lib/datadog_api_client/v2/models/observability_pipeline_memory_buffer_size_options.rb
new file mode 100644
index 00000000000..04f5e0b68aa
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_memory_buffer_size_options.rb
@@ -0,0 +1,115 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Options for configuring a memory buffer by queue length.
+  class ObservabilityPipelineMemoryBufferSizeOptions
+    include BaseGenericModel
+
+    # Maximum events for the memory buffer.
+    attr_accessor :max_events
+
+    # The type of the buffer that will be configured, a memory buffer.
+    attr_accessor :type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'max_events' => :'max_events',
+        :'type' => :'type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'max_events' => :'Integer',
+        :'type' => :'ObservabilityPipelineBufferOptionsMemoryType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::ObservabilityPipelineMemoryBufferSizeOptions` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'max_events')
+        self.max_events = attributes[:'max_events']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          max_events == o.max_events &&
+          type == o.type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [max_events, type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_new_relic_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_new_relic_destination.rb
index 79118217199..3bbcfb490b4 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_new_relic_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_new_relic_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineNewRelicDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The unique identifier for this component.
     attr_reader :id
 
@@ -41,6 +44,7 @@ class ObservabilityPipelineNewRelicDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'region' => :'region',
@@ -52,6 +56,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'region' => :'ObservabilityPipelineNewRelicDestinationRegion',
@@ -77,6 +82,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -173,6 +182,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           region == o.region &&
@@ -184,7 +194,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [id, inputs, region, type, additional_properties].hash
+      [buffer, id, inputs, region, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_open_search_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_open_search_destination.rb
index 54b256eb85f..72e2798c1cb 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_open_search_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_open_search_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineOpenSearchDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The index to write logs to.
     attr_accessor :bulk_index
 
@@ -44,6 +47,7 @@ class ObservabilityPipelineOpenSearchDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'bulk_index' => :'bulk_index',
         :'data_stream' => :'data_stream',
         :'id' => :'id',
@@ -56,6 +60,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'bulk_index' => :'String',
         :'data_stream' => :'ObservabilityPipelineOpenSearchDestinationDataStream',
         :'id' => :'String',
@@ -82,6 +87,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'bulk_index')
         self.bulk_index = attributes[:'bulk_index']
       end
@@ -171,6 +180,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           bulk_index == o.bulk_index &&
           data_stream == o.data_stream &&
           id == o.id &&
@@ -183,7 +193,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [bulk_index, data_stream, id, inputs, type, additional_properties].hash
+      [buffer, bulk_index, data_stream, id, inputs, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_rsyslog_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_rsyslog_destination.rb
index c3151af7153..5a1c16dc797 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_rsyslog_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_rsyslog_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineRsyslogDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The unique identifier for this component.
     attr_reader :id
 
@@ -44,6 +47,7 @@ class ObservabilityPipelineRsyslogDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'keepalive' => :'keepalive',
@@ -56,6 +60,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'keepalive' => :'Integer',
@@ -82,6 +87,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -182,6 +191,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           keepalive == o.keepalive &&
@@ -194,7 +204,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [id, inputs, keepalive, tls, type, additional_properties].hash
+      [buffer, id, inputs, keepalive, tls, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_sentinel_one_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_sentinel_one_destination.rb
index 4b3548624a7..afd36fa79c2 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_sentinel_one_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_sentinel_one_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineSentinelOneDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The unique identifier for this component.
     attr_reader :id
 
@@ -41,6 +44,7 @@ class ObservabilityPipelineSentinelOneDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'region' => :'region',
@@ -52,6 +56,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'region' => :'ObservabilityPipelineSentinelOneDestinationRegion',
@@ -77,6 +82,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -173,6 +182,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           region == o.region &&
@@ -184,7 +194,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [id, inputs, region, type, additional_properties].hash
+      [buffer, id, inputs, region, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_socket_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_socket_destination.rb
index 5a8c561616c..44861a7907a 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_socket_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_socket_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineSocketDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Encoding format for log events.
     attr_reader :encoding
 
@@ -50,6 +53,7 @@ class ObservabilityPipelineSocketDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'encoding' => :'encoding',
         :'framing' => :'framing',
         :'id' => :'id',
@@ -64,6 +68,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'encoding' => :'ObservabilityPipelineSocketDestinationEncoding',
         :'framing' => :'ObservabilityPipelineSocketDestinationFraming',
         :'id' => :'String',
@@ -92,6 +97,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'encoding')
         self.encoding = attributes[:'encoding']
       end
@@ -222,6 +231,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           encoding == o.encoding &&
           framing == o.framing &&
           id == o.id &&
@@ -236,7 +246,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [encoding, framing, id, inputs, mode, tls, type, additional_properties].hash
+      [buffer, encoding, framing, id, inputs, mode, tls, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_splunk_hec_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_splunk_hec_destination.rb
index 707c0ff5e12..7c504d81e51 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_splunk_hec_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_splunk_hec_destination.rb
@@ -27,6 +27,9 @@ class ObservabilityPipelineSplunkHecDestination
     # If `false`, Splunk assigns the time the event was received.
     attr_accessor :auto_extract_timestamp
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # Encoding format for log events.
     attr_accessor :encoding
 
@@ -52,6 +55,7 @@ class ObservabilityPipelineSplunkHecDestination
     def self.attribute_map
       {
         :'auto_extract_timestamp' => :'auto_extract_timestamp',
+        :'buffer' => :'buffer',
         :'encoding' => :'encoding',
         :'id' => :'id',
         :'index' => :'index',
@@ -66,6 +70,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'auto_extract_timestamp' => :'Boolean',
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'encoding' => :'ObservabilityPipelineSplunkHecDestinationEncoding',
         :'id' => :'String',
         :'index' => :'String',
@@ -97,6 +102,10 @@ def initialize(attributes = {})
         self.auto_extract_timestamp = attributes[:'auto_extract_timestamp']
       end
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'encoding')
         self.encoding = attributes[:'encoding']
       end
@@ -191,6 +200,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           auto_extract_timestamp == o.auto_extract_timestamp &&
+          buffer == o.buffer &&
           encoding == o.encoding &&
           id == o.id &&
           index == o.index &&
@@ -204,7 +214,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [auto_extract_timestamp, encoding, id, index, inputs, sourcetype, type, additional_properties].hash
+      [auto_extract_timestamp, buffer, encoding, id, index, inputs, sourcetype, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_sumo_logic_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_sumo_logic_destination.rb
index 7a3c31742c5..f6346f09295 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_sumo_logic_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_sumo_logic_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineSumoLogicDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The output encoding format.
     attr_accessor :encoding
 
@@ -53,6 +56,7 @@ class ObservabilityPipelineSumoLogicDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'encoding' => :'encoding',
         :'header_custom_fields' => :'header_custom_fields',
         :'header_host_name' => :'header_host_name',
@@ -68,6 +72,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'encoding' => :'ObservabilityPipelineSumoLogicDestinationEncoding',
         :'header_custom_fields' => :'Array<ObservabilityPipelineSumoLogicDestinationHeaderCustomFieldsItem>',
         :'header_host_name' => :'String',
@@ -97,6 +102,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'encoding')
         self.encoding = attributes[:'encoding']
       end
@@ -200,6 +209,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           encoding == o.encoding &&
           header_custom_fields == o.header_custom_fields &&
           header_host_name == o.header_host_name &&
@@ -215,7 +225,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [encoding, header_custom_fields, header_host_name, header_source_category, header_source_name, id, inputs, type, additional_properties].hash
+      [buffer, encoding, header_custom_fields, header_host_name, header_source_category, header_source_name, id, inputs, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/observability_pipeline_syslog_ng_destination.rb b/lib/datadog_api_client/v2/models/observability_pipeline_syslog_ng_destination.rb
index 132ffd70a89..a816fbcbca7 100644
--- a/lib/datadog_api_client/v2/models/observability_pipeline_syslog_ng_destination.rb
+++ b/lib/datadog_api_client/v2/models/observability_pipeline_syslog_ng_destination.rb
@@ -23,6 +23,9 @@ module DatadogAPIClient::V2
   class ObservabilityPipelineSyslogNgDestination
     include BaseGenericModel
 
+    # Configuration for buffer settings on destination components.
+    attr_accessor :buffer
+
     # The unique identifier for this component.
     attr_reader :id
 
@@ -44,6 +47,7 @@ class ObservabilityPipelineSyslogNgDestination
     # @!visibility private
     def self.attribute_map
       {
+        :'buffer' => :'buffer',
         :'id' => :'id',
         :'inputs' => :'inputs',
         :'keepalive' => :'keepalive',
@@ -56,6 +60,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
+        :'buffer' => :'ObservabilityPipelineBufferOptions',
         :'id' => :'String',
         :'inputs' => :'Array<String>',
         :'keepalive' => :'Integer',
@@ -82,6 +87,10 @@ def initialize(attributes = {})
         end
       }
 
+      if attributes.key?(:'buffer')
+        self.buffer = attributes[:'buffer']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -182,6 +191,7 @@ def to_hash
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          buffer == o.buffer &&
           id == o.id &&
           inputs == o.inputs &&
           keepalive == o.keepalive &&
@@ -194,7 +204,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [id, inputs, keepalive, tls, type, additional_properties].hash
+      [buffer, id, inputs, keepalive, tls, type, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_attributes_request.rb b/lib/datadog_api_client/v2/models/postmortem_template_attributes_request.rb
new file mode 100644
index 00000000000..ec997c7c2cb
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_attributes_request.rb
@@ -0,0 +1,123 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplateAttributesRequest
+    include BaseGenericModel
+
+    # The name of the template
+    attr_reader :name
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'name' => :'name'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'name' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplateAttributesRequest` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @name.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param name [Object] Object to be assigned
+    # @!visibility private
+    def name=(name)
+      if name.nil?
+        fail ArgumentError, 'invalid value for "name", name cannot be nil.'
+      end
+      @name = name
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          name == o.name &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [name, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_attributes_response.rb b/lib/datadog_api_client/v2/models/postmortem_template_attributes_response.rb
new file mode 100644
index 00000000000..74e680e9929
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_attributes_response.rb
@@ -0,0 +1,165 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplateAttributesResponse
+    include BaseGenericModel
+
+    # When the template was created
+    attr_reader :created_at
+
+    # When the template was last modified
+    attr_reader :modified_at
+
+    # The name of the template
+    attr_reader :name
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'created_at' => :'createdAt',
+        :'modified_at' => :'modifiedAt',
+        :'name' => :'name'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time',
+        :'name' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplateAttributesResponse` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
+
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @created_at.nil?
+      return false if @modified_at.nil?
+      return false if @name.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param created_at [Object] Object to be assigned
+    # @!visibility private
+    def created_at=(created_at)
+      if created_at.nil?
+        fail ArgumentError, 'invalid value for "created_at", created_at cannot be nil.'
+      end
+      @created_at = created_at
+    end
+
+    # Custom attribute writer method with validation
+    # @param modified_at [Object] Object to be assigned
+    # @!visibility private
+    def modified_at=(modified_at)
+      if modified_at.nil?
+        fail ArgumentError, 'invalid value for "modified_at", modified_at cannot be nil.'
+      end
+      @modified_at = modified_at
+    end
+
+    # Custom attribute writer method with validation
+    # @param name [Object] Object to be assigned
+    # @!visibility private
+    def name=(name)
+      if name.nil?
+        fail ArgumentError, 'invalid value for "name", name cannot be nil.'
+      end
+      @name = name
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at &&
+          name == o.name &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [created_at, modified_at, name, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_data_request.rb b/lib/datadog_api_client/v2/models/postmortem_template_data_request.rb
new file mode 100644
index 00000000000..f8dc577f9ea
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_data_request.rb
@@ -0,0 +1,144 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplateDataRequest
+    include BaseGenericModel
+
+    #
+    attr_reader :attributes
+
+    # Postmortem template resource type
+    attr_reader :type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'attributes' => :'attributes',
+        :'type' => :'type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'attributes' => :'PostmortemTemplateAttributesRequest',
+        :'type' => :'PostmortemTemplateType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplateDataRequest` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'attributes')
+        self.attributes = attributes[:'attributes']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @attributes.nil?
+      return false if @type.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param attributes [Object] Object to be assigned
+    # @!visibility private
+    def attributes=(attributes)
+      if attributes.nil?
+        fail ArgumentError, 'invalid value for "attributes", attributes cannot be nil.'
+      end
+      @attributes = attributes
+    end
+
+    # Custom attribute writer method with validation
+    # @param type [Object] Object to be assigned
+    # @!visibility private
+    def type=(type)
+      if type.nil?
+        fail ArgumentError, 'invalid value for "type", type cannot be nil.'
+      end
+      @type = type
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          attributes == o.attributes &&
+          type == o.type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [attributes, type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_data_response.rb b/lib/datadog_api_client/v2/models/postmortem_template_data_response.rb
new file mode 100644
index 00000000000..6de6ca5018e
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_data_response.rb
@@ -0,0 +1,165 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplateDataResponse
+    include BaseGenericModel
+
+    #
+    attr_reader :attributes
+
+    # The ID of the template
+    attr_reader :id
+
+    # Postmortem template resource type
+    attr_reader :type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'attributes' => :'attributes',
+        :'id' => :'id',
+        :'type' => :'type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'attributes' => :'PostmortemTemplateAttributesResponse',
+        :'id' => :'String',
+        :'type' => :'PostmortemTemplateType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplateDataResponse` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'attributes')
+        self.attributes = attributes[:'attributes']
+      end
+
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @attributes.nil?
+      return false if @id.nil?
+      return false if @type.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param attributes [Object] Object to be assigned
+    # @!visibility private
+    def attributes=(attributes)
+      if attributes.nil?
+        fail ArgumentError, 'invalid value for "attributes", attributes cannot be nil.'
+      end
+      @attributes = attributes
+    end
+
+    # Custom attribute writer method with validation
+    # @param id [Object] Object to be assigned
+    # @!visibility private
+    def id=(id)
+      if id.nil?
+        fail ArgumentError, 'invalid value for "id", id cannot be nil.'
+      end
+      @id = id
+    end
+
+    # Custom attribute writer method with validation
+    # @param type [Object] Object to be assigned
+    # @!visibility private
+    def type=(type)
+      if type.nil?
+        fail ArgumentError, 'invalid value for "type", type cannot be nil.'
+      end
+      @type = type
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          attributes == o.attributes &&
+          id == o.id &&
+          type == o.type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [attributes, id, type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_request.rb b/lib/datadog_api_client/v2/models/postmortem_template_request.rb
new file mode 100644
index 00000000000..48eba54504c
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_request.rb
@@ -0,0 +1,123 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplateRequest
+    include BaseGenericModel
+
+    #
+    attr_reader :data
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'data' => :'data'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'data' => :'PostmortemTemplateDataRequest'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplateRequest` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'data')
+        self.data = attributes[:'data']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @data.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param data [Object] Object to be assigned
+    # @!visibility private
+    def data=(data)
+      if data.nil?
+        fail ArgumentError, 'invalid value for "data", data cannot be nil.'
+      end
+      @data = data
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          data == o.data &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [data, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_response.rb b/lib/datadog_api_client/v2/models/postmortem_template_response.rb
new file mode 100644
index 00000000000..7d693adbcc9
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_response.rb
@@ -0,0 +1,123 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplateResponse
+    include BaseGenericModel
+
+    #
+    attr_reader :data
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'data' => :'data'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'data' => :'PostmortemTemplateDataResponse'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplateResponse` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'data')
+        self.data = attributes[:'data']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @data.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param data [Object] Object to be assigned
+    # @!visibility private
+    def data=(data)
+      if data.nil?
+        fail ArgumentError, 'invalid value for "data", data cannot be nil.'
+      end
+      @data = data
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          data == o.data &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [data, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_template_type.rb b/lib/datadog_api_client/v2/models/postmortem_template_type.rb
new file mode 100644
index 00000000000..97518204d33
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_template_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Postmortem template resource type
+  class PostmortemTemplateType
+    include BaseEnumModel
+
+    POSTMORTEM_TEMPLATE = "postmortem_template".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/postmortem_templates_response.rb b/lib/datadog_api_client/v2/models/postmortem_templates_response.rb
new file mode 100644
index 00000000000..85b06874066
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/postmortem_templates_response.rb
@@ -0,0 +1,125 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # 
+  class PostmortemTemplatesResponse
+    include BaseGenericModel
+
+    #
+    attr_reader :data
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'data' => :'data'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'data' => :'Array<PostmortemTemplateDataResponse>'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::PostmortemTemplatesResponse` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'data')
+        if (value = attributes[:'data']).is_a?(Array)
+          self.data = value
+        end
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @data.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param data [Object] Object to be assigned
+    # @!visibility private
+    def data=(data)
+      if data.nil?
+        fail ArgumentError, 'invalid value for "data", data cannot be nil.'
+      end
+      @data = data
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          data == o.data &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [data, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb b/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb
index 306f15b5954..bba4a2f88f0 100644
--- a/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb
+++ b/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb
@@ -49,6 +49,10 @@ class SensitiveDataScannerRuleAttributes
     # Integer from 1 (high) to 5 (low) indicating rule issue severity.
     attr_reader :priority
 
+    # Object describing the suppressions for a rule. There are three types of suppressions, `starts_with`, `ends_with`, and `exact_match`.
+    # Suppressed matches are not obfuscated, counted in metrics, or displayed in the Findings page.
+    attr_accessor :suppressions
+
     # List of tags.
     attr_accessor :tags
 
@@ -69,6 +73,7 @@ def self.attribute_map
         :'namespaces' => :'namespaces',
         :'pattern' => :'pattern',
         :'priority' => :'priority',
+        :'suppressions' => :'suppressions',
         :'tags' => :'tags',
         :'text_replacement' => :'text_replacement'
       }
@@ -86,6 +91,7 @@ def self.openapi_types
         :'namespaces' => :'Array<String>',
         :'pattern' => :'String',
         :'priority' => :'Integer',
+        :'suppressions' => :'SensitiveDataScannerSuppressions',
         :'tags' => :'Array<String>',
         :'text_replacement' => :'SensitiveDataScannerTextReplacement'
       }
@@ -145,6 +151,10 @@ def initialize(attributes = {})
         self.priority = attributes[:'priority']
       end
 
+      if attributes.key?(:'suppressions')
+        self.suppressions = attributes[:'suppressions']
+      end
+
       if attributes.key?(:'tags')
         if (value = attributes[:'tags']).is_a?(Array)
           self.tags = value
@@ -212,6 +222,7 @@ def ==(o)
           namespaces == o.namespaces &&
           pattern == o.pattern &&
           priority == o.priority &&
+          suppressions == o.suppressions &&
           tags == o.tags &&
           text_replacement == o.text_replacement &&
           additional_properties == o.additional_properties
@@ -221,7 +232,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [description, excluded_namespaces, included_keyword_configuration, is_enabled, name, namespaces, pattern, priority, tags, text_replacement, additional_properties].hash
+      [description, excluded_namespaces, included_keyword_configuration, is_enabled, name, namespaces, pattern, priority, suppressions, tags, text_replacement, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/sensitive_data_scanner_suppressions.rb b/lib/datadog_api_client/v2/models/sensitive_data_scanner_suppressions.rb
new file mode 100644
index 00000000000..8c21f58d777
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/sensitive_data_scanner_suppressions.rb
@@ -0,0 +1,132 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Object describing the suppressions for a rule. There are three types of suppressions, `starts_with`, `ends_with`, and `exact_match`.
+  # Suppressed matches are not obfuscated, counted in metrics, or displayed in the Findings page.
+  class SensitiveDataScannerSuppressions
+    include BaseGenericModel
+
+    # List of strings to use for suppression of matches ending with these strings.
+    attr_accessor :ends_with
+
+    # List of strings to use for suppression of matches exactly matching these strings.
+    attr_accessor :exact_match
+
+    # List of strings to use for suppression of matches starting with these strings.
+    attr_accessor :starts_with
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'ends_with' => :'ends_with',
+        :'exact_match' => :'exact_match',
+        :'starts_with' => :'starts_with'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'ends_with' => :'Array<String>',
+        :'exact_match' => :'Array<String>',
+        :'starts_with' => :'Array<String>'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::SensitiveDataScannerSuppressions` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'ends_with')
+        if (value = attributes[:'ends_with']).is_a?(Array)
+          self.ends_with = value
+        end
+      end
+
+      if attributes.key?(:'exact_match')
+        if (value = attributes[:'exact_match']).is_a?(Array)
+          self.exact_match = value
+        end
+      end
+
+      if attributes.key?(:'starts_with')
+        if (value = attributes[:'starts_with']).is_a?(Array)
+          self.starts_with = value
+        end
+      end
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          ends_with == o.ends_with &&
+          exact_match == o.exact_match &&
+          starts_with == o.starts_with &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [ends_with, exact_match, starts_with, additional_properties].hash
+    end
+  end
+end