diff --git a/.generated-info b/.generated-info
index bd27cd6c5652..6654229eca74 100644
--- a/.generated-info
+++ b/.generated-info
@@ -1,4 +1,4 @@
 {
-  "spec_repo_commit": "befda92",
-  "generated": "2025-08-06 19:11:13.073"
+  "spec_repo_commit": "c5cca50",
+  "generated": "2025-08-07 18:03:13.305"
 }
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 6c6262eb253d..a0599c01eb05 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -1625,6 +1625,8 @@ components:
             example: arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder
             type: string
           type: array
+        log_source_config:
+          $ref: '#/components/schemas/AWSLambdaForwarderConfigLogSourceConfig'
         sources:
           description: 'List of service IDs set to enable automatic log collection.
             Discover the list of available services with the
@@ -1636,6 +1638,44 @@ components:
             type: string
           type: array
       type: object
+    AWSLambdaForwarderConfigLogSourceConfig:
+      description: Log source configuration.
+      properties:
+        tag_filters:
+          description: List of AWS log source tag filters. Defaults to `[]`.
+          items:
+            $ref: '#/components/schemas/AWSLogSourceTagFilter'
+          type: array
+      type: object
+    AWSLogSourceTagFilter:
+      description: 'AWS log source tag filter list. Defaults to `[]`.
+
+        Array of log source to AWS resource tag mappings. Each mapping contains a
+        log source and its associated AWS resource tags (in `key:value` format) used
+        to filter logs submitted to Datadog.
+
+        Tag filters are applied for tags on the AWS resource emitting logs; tags associated
+        with the log storage entity (such as a CloudWatch Log Group or S3 Bucket)
+        are not considered.
+
+        For more information on resource tag filter syntax, [see AWS resource exclusion](https://docs.datadoghq.com/account_management/billing/aws/#aws-resource-exclusion)
+        in the AWS integration billing page.'
+      properties:
+        source:
+          description: The AWS log source to which the tag filters defined in `tags`
+            are applied.
+          example: s3
+          type: string
+        tags:
+          description: The AWS resource tags to filter on for the log source specified
+            by `source`.
+          items:
+            description: Tag in the form `key:value`.
+            example: env:prod
+            type: string
+          nullable: true
+          type: array
+      type: object
     AWSLogsConfig:
       description: AWS Logs Collection config.
       properties:
@@ -57013,9 +57053,6 @@ paths:
       summary: Get all aggregated connections
       tags:
       - Cloud Network Monitoring
-      x-unstable: '**Note**: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).'
   /api/v2/network/dns/aggregate:
     get:
       description: Get all aggregated DNS traffic.
@@ -57076,9 +57113,6 @@ paths:
       summary: Get all aggregated DNS traffic
       tags:
       - Cloud Network Monitoring
-      x-unstable: '**Note**: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).'
   /api/v2/on-call/escalation-policies:
     post:
       description: Create a new On-Call escalation policy
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen b/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen
index 01733f517aa2..b63a9ddbfcf2 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:07:56.996Z
\ No newline at end of file
+2025-08-06T17:41:40.185Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.yml b/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.yml
index 7507538832b8..7c4e90039aa8 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.yml
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:07:56 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:40 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,21 +14,21 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"c2d871fe-ba0c-441d-acc8-d49d28c748f4","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"7f40a01ff2444f4f94442f52223ea7cf"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2024-11-14T20:07:57.608241244Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":true,"collect_cloudwatch_alarms":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"exclude_only":["AWS/SQS","AWS/ElasticMapReduce"]}},"modified_at":"2024-11-14T20:07:57.60824734Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}}}'
+      string: '{"data":{"id":"4ee52a3f-d0e9-487b-bde9-cd1cbc0e4cb0","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"a4e4a6b4c2cf4638a58b1febc6b856e9"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2025-08-06T17:41:41.111886478Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":true,"collect_cloudwatch_alarms":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"exclude_only":["AWS/SQS","AWS/ElasticMapReduce"]}},"modified_at":"2025-08-06T17:41:41.111886478Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:07:56 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:40 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/c2d871fe-ba0c-441d-acc8-d49d28c748f4
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/4ee52a3f-d0e9-487b-bde9-cd1cbc0e4cb0
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen
index 361392da035f..d0e249e860ed 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:07:57.855Z
\ No newline at end of file
+2025-08-06T17:41:41.364Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.yml b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.yml
index b27464c868b5..f4b4a28d8648 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.yml
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:07:57 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:41 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"access_key_id":"AKIAIOSFODNN7EXAMPLE","secret_access_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"access_key_id":"AKIAIOSFODNN7EXAMPLE","secret_access_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,21 +14,21 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"a1a282b9-6e74-4e56-b423-ec55ccbc995d","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"access_key_id":"AKIAIOSFODNN7EXAMPLE"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2024-11-14T20:07:57.96162522Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":true,"collect_cloudwatch_alarms":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"exclude_only":["AWS/SQS","AWS/ElasticMapReduce"]}},"modified_at":"2024-11-14T20:07:57.961631497Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}}}'
+      string: '{"data":{"id":"c80e30d5-b3f9-45b1-85fc-bad652af206b","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"access_key_id":"AKIAIOSFODNN7EXAMPLE"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2025-08-06T17:41:41.445076718Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":true,"collect_cloudwatch_alarms":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"exclude_only":["AWS/SQS","AWS/ElasticMapReduce"]}},"modified_at":"2025-08-06T17:41:41.445076718Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:07:57 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:41 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/a1a282b9-6e74-4e56-b423-ec55ccbc995d
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/c80e30d5-b3f9-45b1-85fc-bad652af206b
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen
index a21e03e9331b..abfd935a03f5 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2024-11-14T20:07:58.234Z
\ No newline at end of file
+2025-08-06T17:41:41.716Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.yml b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.yml
index ae654ac1c6d1..79e4b109dda9 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:07:58 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:41 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws-invalid","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws-invalid","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,7 +14,8 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"errors":[{"title":"Generic Error","detail":"invalid partition: aws-invalid"}]}'
+      string: '{"errors":[{"status":"400","title":"Bad Request","detail":"invalid
+        value","meta":{"aws_partition":"invalid partition: aws-invalid"}}]}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen
index bb6908fda5b3..88b31bc651c7 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen
@@ -1 +1 @@
-2024-11-14T20:07:58.346Z
\ No newline at end of file
+2025-08-06T17:41:41.817Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.yml b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.yml
index 1a51ec9df2f8..28bc6293ccb0 100644
--- a/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.yml
+++ b/cassettes/features/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:07:58 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:41 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,18 +14,18 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"3827b469-bc3a-41be-bdf0-1d0e6ea413a2","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"d2a623a93f7444b29404f25cb5853c05"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:07:59.282635727Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:07:59.282642012Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"9bb08fa5-18b0-49fd-a5d7-b74f930e52b0","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"ef76163b26b04aa2a4d4d6f7be1738f3"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:42.675508202Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:42.675508202Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:07:58 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:41 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -44,14 +44,14 @@ http_interactions:
     status:
       code: 409
       message: Conflict
-- recorded_at: Thu, 14 Nov 2024 20:07:58 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:41 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/3827b469-bc3a-41be-bdf0-1d0e6ea413a2
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/9bb08fa5-18b0-49fd-a5d7-b74f930e52b0
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen
index b01bd4235c63..d150259db16f 100644
--- a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:00.124Z
\ No newline at end of file
+2025-08-06T17:41:44.610Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.yml b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.yml
index 4cb17ed4123c..86bc2cd07a4c 100644
--- a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:00 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:44 GMT
   request:
     body: null
     headers:
diff --git a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen
index 2c11478ca572..81fc42bcd79d 100644
--- a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen
+++ b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:00.216Z
\ No newline at end of file
+2025-08-06T17:41:44.707Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.yml b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.yml
index 7873c6830d40..38f59e51a398 100644
--- a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.yml
+++ b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:00 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:44 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,21 +14,21 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"a87fe3df-a75b-4f57-a965-685282b86ff2","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"2987d548e222435caced781d432c9dcd"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:00.791400241Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:00.791404064Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"f45e01d8-2cc4-45b6-af71-6b3d3bb18dd2","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"9ae7407fac894f8fb2d25bac85a55a89"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:45.592435491Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:45.592435491Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:00 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:44 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/a87fe3df-a75b-4f57-a965-685282b86ff2
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/f45e01d8-2cc4-45b6-af71-6b3d3bb18dd2
   response:
     body:
       encoding: UTF-8
@@ -37,14 +37,14 @@ http_interactions:
     status:
       code: 204
       message: No Content
-- recorded_at: Thu, 14 Nov 2024 20:08:00 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:44 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/a87fe3df-a75b-4f57-a965-685282b86ff2
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/f45e01d8-2cc4-45b6-af71-6b3d3bb18dd2
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen
index e9926dc51345..e6f056c8034f 100644
--- a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen
+++ b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:01.174Z
\ No newline at end of file
+2025-08-06T17:41:46.023Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.yml b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.yml
index 62e163ef51d5..eede37dbce99 100644
--- a/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.yml
+++ b/cassettes/features/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:01 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:46 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,14 +14,14 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"3b040f61-03f8-4c7c-8511-68563f0c4881","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"1db0bd276e134b4fbe07e1cd0525ef50"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:01.731532142Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:01.731536786Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"b995026f-036d-4303-b2b1-fe6003893f2e","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"707dcccdd8424fb999d08d39a108a593"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:46.926789123Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:46.926789123Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:01 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:46 GMT
   request:
     body: null
     headers:
@@ -40,14 +40,14 @@ http_interactions:
     status:
       code: 404
       message: Not Found
-- recorded_at: Thu, 14 Nov 2024 20:08:01 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:46 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/3b040f61-03f8-4c7c-8511-68563f0c4881
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/b995026f-036d-4303-b2b1-fe6003893f2e
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen b/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen
index dcee5089aca2..d42e5e578e8c 100644
--- a/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:02.114Z
\ No newline at end of file
+2025-08-06T17:41:47.356Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.yml b/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.yml
index a64792898c14..09e658c7a02e 100644
--- a/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.yml
+++ b/cassettes/features/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:02 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:47 GMT
   request:
     body: null
     headers:
@@ -10,7 +10,7 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"417e89773bab4d459dc060836ee276be","type":"external_id","attributes":{"external_id":"417e89773bab4d459dc060836ee276be"}}}'
+      string: '{"data":{"id":"b8dba3ff8a224e718da6eecb83f51d25","type":"external_id","attributes":{"external_id":"b8dba3ff8a224e718da6eecb83f51d25"}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen b/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen
index 9e3e97d76d5b..093fb755f715 100644
--- a/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:02.354Z
\ No newline at end of file
+2025-08-06T17:41:47.870Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.yml b/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.yml
index 0d21ac0a7a74..c7e661f4b5b4 100644
--- a/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.yml
+++ b/cassettes/features/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:02 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:47 GMT
   request:
     body: null
     headers:
@@ -10,7 +10,7 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"02482e8953d346d8a50e512dba92bff3","type":"external_id","attributes":{"external_id":"02482e8953d346d8a50e512dba92bff3"}}}'
+      string: '{"data":{"id":"b6ec0b8a9ddf478e98b0134747bab2c5","type":"external_id","attributes":{"external_id":"b6ec0b8a9ddf478e98b0134747bab2c5"}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen
index 4959cce69544..2fe5cc06afd7 100644
--- a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:02.571Z
\ No newline at end of file
+2025-08-06T17:41:49.517Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.yml b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.yml
index b107c2fb5295..537602194ee7 100644
--- a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.yml
+++ b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:02 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:49 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,39 +14,39 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"cb0d64ac-ca8e-4c17-9da4-02d8519b0de6","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"4e38efc3d9104693974dc774562c0063"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:03.23291721Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:03.232922592Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"957a9f7c-72ec-4946-baf4-42f00420f299","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"329146b44caa4f4fa7d0b6478f392c9e"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:50.383382183Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:50.383382183Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:02 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:49 GMT
   request:
     body: null
     headers:
       Accept:
       - application/json
     method: GET
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/cb0d64ac-ca8e-4c17-9da4-02d8519b0de6
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/957a9f7c-72ec-4946-baf4-42f00420f299
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"cb0d64ac-ca8e-4c17-9da4-02d8519b0de6","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"4e38efc3d9104693974dc774562c0063"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:03.232917Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:03.232923Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"957a9f7c-72ec-4946-baf4-42f00420f299","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"329146b44caa4f4fa7d0b6478f392c9e"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:50.383382Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:50.383382Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:02 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:49 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/cb0d64ac-ca8e-4c17-9da4-02d8519b0de6
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/957a9f7c-72ec-4946-baf4-42f00420f299
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen
index d666543c816e..8cf173282684 100644
--- a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:03.612Z
\ No newline at end of file
+2025-08-06T17:41:50.873Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.yml b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.yml
index 9ff441fb2ac1..07415c5d5287 100644
--- a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:03 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:50 GMT
   request:
     body: null
     headers:
diff --git a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen
index f611b8f08ab3..ec896c2d2407 100644
--- a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen
+++ b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:03.716Z
\ No newline at end of file
+2025-08-06T17:41:50.972Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.yml b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.yml
index c5ca2b051b95..df7e1204a8b6 100644
--- a/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.yml
+++ b/cassettes/features/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:03 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:50 GMT
   request:
     body: null
     headers:
diff --git a/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen b/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen
index 6148c770dc1e..677b764e549b 100644
--- a/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:03.839Z
\ No newline at end of file
+2025-08-06T17:41:51.115Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.yml b/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.yml
index 58d6c2db25d4..8c996e28f8c5 100644
--- a/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.yml
+++ b/cassettes/features/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:03 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:51 GMT
   request:
     body: null
     headers:
@@ -10,7 +10,7 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":[{"id":"90487717-edc3-4f3f-bee4-b8d11ef49494","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"7bf95a4064e7426e8498ffb66f8f9dca"},"aws_account_id":"173154855500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-11-14T01:42:36.223632Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-11-14T01:42:36.223638Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"e6daa8c4-58b6-42e1-970e-44e6fa812ce0","type":"account","attributes":{"account_tags":[],"auth_config":{"access_key_id":"AKIA514950102505"},"aws_account_id":"514950102505","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2024-09-06T00:18:12.382448Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:1234567890:function:datadog-forwarder-Forwarder"],"sources":[]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[],"namespace_filters":{"exclude_only":["AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-09-06T00:18:17.536561Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"a0c7f96e-a471-488e-84be-c3336e7ab693","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"859ffc73702c40f589cc3b74c5967e27"},"aws_account_id":"172830950700","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-10-07T13:58:28.577522Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-10-07T13:58:28.577526Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"3a3d5b83-2ad8-41d8-b82e-a3ba972a9783","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"be10a93f33a64b0ea872da2f48348979"},"aws_account_id":"172704974400","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-09-23T00:02:26.306293Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-09-23T00:02:26.306297Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"89a9dae5-cbe3-4fba-b1b2-aae8775ed319","type":"account","attributes":{"account_tags":["filter:one","filtertwo"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"e31ada331546486f9099cd5c01eef257"},"aws_account_id":"001725901256","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-2","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-09-09T17:00:58.823444Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["testTag","test:Tag2"]}],"namespace_filters":{"exclude_only":["AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-10-16T14:55:17.947931Z","resources_config":{"cloud_security_posture_management_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"7e1d660d-1142-45b1-a795-dc3900b6bd17","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"f61b52d768394db6851aed2f887ac6f6"},"aws_account_id":"172830950701","aws_partition":"aws","aws_regions":{"include_only":["me-south-1"]},"created_at":"2024-10-17T15:08:40.917209Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-10-18T20:19:53.960435Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"d52e151c-c608-4e14-9f29-dfeff876bb39","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"c2909403ca9949db82c36adf6e8cdcfa"},"aws_account_id":"172772261200","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-09-30T18:56:55.042771Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-09-30T18:56:55.042775Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"d7d74617-832d-4c4d-a8c3-1e69d509ea52","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"2b1dd9fd35b0440ca4bf98ff70ac2e63"},"aws_account_id":"172772275700","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-09-30T18:59:18.175722Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-09-30T18:59:18.175727Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"7e5acac6-3ac8-4762-8100-479f03ccffc8","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"04548a334583412aa4e6f5548f4e9989"},"aws_account_id":"172532181900","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2024-09-03T00:03:40.248176Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-09-03T00:03:40.24818Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"bcb235b2-b123-4535-9cda-216b8cbc7bbf","type":"account","attributes":{"account_tags":[],"auth_config":{"role_name":"testacc-datadog-integration-role","external_id":"c5e2342b15064065855f8a2d62b7ef1a"},"aws_account_id":"101515698539","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2024-11-13T19:25:47.575229Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[],"namespace_filters":{"exclude_only":["AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-11-13T19:25:47.575234Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"690e414b-037e-41a6-b8b4-80370fa6d258","type":"account","attributes":{"account_tags":[],"auth_config":{"role_name":"testacc-datadog-integration-role","external_id":"8d8512965ed944e89c4c06f7d584f7cd"},"aws_account_id":"995010056565","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2024-11-13T19:25:49.327842Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[],"namespace_filters":{"exclude_only":["AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2024-11-13T19:25:49.327848Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":[]}}}}]}'
+      string: '{"data":[{"id":"78f57c22-7baf-433d-b7aa-5fa13c559a13","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"526ec638f871448ca210d7faa3cbacb5"},"aws_account_id":"175440101400","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T13:36:57.316016Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T13:36:57.316016Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"272d07f7-dd99-4285-82ed-cb352012a9c1","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"82d6ad5d6cf647cca82ea19e06779b61"},"aws_account_id":"175440101500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T13:36:56.938404Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T13:36:58.498196Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"6393ceb8-b607-46a0-b4e8-d43e151c05dd","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"218a5cdfa31e4021b72d1deb6a9fdd8a"},"aws_account_id":"175435781300","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T01:36:55.574106Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T01:36:55.574106Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"7b24df2e-e295-4711-a3aa-b61085567ca6","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"f44fb8ebedd54b548e9f1cab843b82ee"},"aws_account_id":"175435781500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T01:36:57.118481Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T01:36:58.555123Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"49b8113c-910b-49b0-896b-bd4b30e00bd8","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"3d57463ae14c4a76b5e2bfdff19d2ced"},"aws_account_id":"175448737400","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T13:36:16.914586Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T13:36:16.914586Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"36f2cc66-b562-446a-b81a-d43b41e83a3c","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"3b273e1e1b8b4d93acd4839a0c6c3d24"},"aws_account_id":"175448737600","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T13:36:21.131146Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T13:36:22.656032Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"40edb96b-3558-4668-8c34-18fc1a23a226","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"224a55d50f0f4b3792c9e0f30be135dc"},"aws_account_id":"175444417500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T01:36:16.94896Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T01:36:16.94896Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"4761d2b2-ab71-4f92-b6ab-2a274c230153","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"6186b8b5ca0d4b00a48b529fe499093f"},"aws_account_id":"175444417700","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T01:36:20.468056Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T01:36:22.030338Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"7207bad7-db91-422c-ad16-971c514b0f2d","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"4e322bbec436441c8d71026cf2949a90"},"aws_account_id":"175441537400","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T17:36:18.501132Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T17:36:18.501132Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"961bbdea-344b-4425-a4ec-5fcd976589cf","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"ce7d9af873a142779856a180344db385"},"aws_account_id":"175441537600","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T17:36:18.50113Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T17:36:19.998433Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"26dc378d-e1b6-4ab5-aa9e-674d71f6022a","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"05c9edc19c854068a91a4ac7e8f3dca4"},"aws_account_id":"175437221300","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T05:36:55.631391Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T05:36:55.631391Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"7c98648f-edde-4498-a6ca-a2e2de01ad7e","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"97c49aeec1b34450862037954cb89622"},"aws_account_id":"175437221500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T05:36:57.448851Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T05:36:58.895277Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"ea72a9bb-6164-41e8-82af-8393c3a440f4","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"f441b908fae04fa1b02e18023b47b90d"},"aws_account_id":"175445857500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T05:36:18.675872Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T05:36:18.675872Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"b85d4358-3e34-42b4-8646-9d8dd78a335e","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"d4f4dfa9dc8b45d19c5317d08d47e0be"},"aws_account_id":"175445857600","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T05:36:18.846399Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T05:36:20.289508Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"a04b14a5-ae10-4df0-8306-db6ba73f4478","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"6dbdee6283034de9898988fc8dd22bf0"},"aws_account_id":"175450177400","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T17:36:18.633345Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T17:36:18.633345Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"a763f78b-354b-4740-a260-3117b34c0ba0","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"6c7ce0507db145cf922c02fdbf5a62a8"},"aws_account_id":"175450177700","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T17:36:20.976467Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T17:36:22.835871Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"d0e31326-1f96-497f-9b91-be6d84511af9","type":"account","attributes":{"account_tags":[],"auth_config":{"role_name":"test","external_id":"65f9a9d9982647bfa617d244b9c38eca"},"aws_account_id":"123123123123","aws_partition":"aws","aws_regions":{"include_all":true},"created_at":"2025-08-04T20:36:50.114957Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[],"namespace_filters":{"exclude_only":["AWS/SQS","AWS/ElasticMapReduce"]}},"modified_at":"2025-08-04T20:36:50.114957Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"fde9c895-97e8-40cb-b76e-6f2608788699","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"018be2c0a33945b987febcdb89f9a2e4"},"aws_account_id":"175442977500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T21:36:16.909802Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T21:36:16.909802Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"73dbc6a2-b3c2-47c2-a158-095bf6391537","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"67687702687746fa8722cbbc2d94c1c8"},"aws_account_id":"175442977600","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T21:36:18.768054Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T21:36:20.237807Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"f58f260d-d022-437f-9839-41d7555d75b2","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"5e5e9c7181b041bc8a5b6e46450ccad2"},"aws_account_id":"175438661300","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T09:36:57.90539Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T09:36:57.90539Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"2f673b6d-d2f5-431a-8a08-dee3ed9db083","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"a7eb1d7d9dbd4acaa017358c777188d9"},"aws_account_id":"175438661500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-05T09:36:58.936128Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-05T09:37:00.429965Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"b1df002a-cc45-4e8e-b103-6d3eba63dc1f","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"122e2e156ef945c9af43f0e82b57469b"},"aws_account_id":"175434341300","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-04T21:36:55.595896Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-04T21:36:55.595896Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"ca07dc51-7916-46df-861f-4e537d8e25d8","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"1c1f1db807c54a8d97882b4fa22dd814"},"aws_account_id":"175434341500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-04T21:36:57.48844Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-04T21:36:58.936282Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"668caf30-2a7e-4816-aa2f-af8e6575a65b","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"a77ca76425d74014bebf552c3289bafb"},"aws_account_id":"175447297700","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T09:36:19.052574Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T09:36:20.520405Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}},{"id":"80403d93-2809-4a6a-94c2-7e8ab0459d8c","type":"account","attributes":{"account_tags":["$KEY:$VALUE"],"auth_config":{"role_name":"DatadogAWSIntegrationRole","external_id":"0d48676c772f4f4fb750e9ad98edffb7"},"aws_account_id":"175447297500","aws_partition":"aws","aws_regions":{"include_only":["us-east-2","us-west-1","eu-west-1","eu-central-1","ap-southeast-1","ap-southeast-2","ap-northeast-1","ap-northeast-2","ap-northeast-3","sa-east-1","ap-south-1","ca-central-1","eu-west-2","eu-west-3","eu-north-1","af-south-1","ap-east-1","ap-south-2","ap-southeast-3","ap-southeast-4","ap-southeast-5","ca-west-1","eu-central-2","eu-south-1","eu-south-2","il-central-1","me-central-1","me-south-1"]},"created_at":"2025-08-06T09:36:18.476103Z","logs_config":{"lambda_forwarder":{"lambdas":[],"sources":[],"log_source_config":{"tag_filters":[]}}},"metrics_config":{"enabled":false,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["$KEY:$VALUE"]}],"namespace_filters":{"exclude_only":["AWS/AutoScaling","AWS/ElasticMapReduce","AWS/SQS"]}},"modified_at":"2025-08-06T09:36:18.476103Z","resources_config":{"cloud_security_posture_management_collection":true,"extended_collection":true},"traces_config":{"xray_services":{"include_only":[]}}}}]}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen b/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen
index 1c85316113f1..ff7d3ffa18f6 100644
--- a/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:04.012Z
\ No newline at end of file
+2025-08-06T17:41:51.355Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.yml b/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.yml
index 745b1c347eb0..34ad7e35d919 100644
--- a/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.yml
+++ b/cassettes/features/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:04 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:51 GMT
   request:
     body: null
     headers:
@@ -10,8 +10,8 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"namespaces","type":"namespaces","attributes":{"namespaces":["AWS/ApiGateway","AWS/AppRunner","AWS/AppStream","AWS/AppSync","AWS/ApplicationELB","AWS/Athena","AWS/AutoScaling","AWS/Backup","AWS/Bedrock","AWS/Billing","AWS/Budgeting","AWS/CertificateManager","AWS/ELB","AWS/CloudFront","AWS/CloudHSM","AWS/CloudSearch","AWS/Logs","AWS/CodeBuild","AWS/CodeWhisperer","AWS/Cognito","AWS/Config","AWS/Connect","AWS/DMS","AWS/DX","AWS/DocDB","AWS/DynamoDB","AWS/DAX","AWS/EC2","AWS/EC2/API","AWS/EC2/InfrastructurePerformance","AWS/EC2Spot","AWS/ElasticMapReduce","AWS/ElastiCache","AWS/ElasticBeanstalk","AWS/EBS","AWS/ECR","AWS/ECS","AWS/EFS","AWS/ElasticInference","AWS/ElasticTranscoder","AWS/MediaConnect","AWS/MediaConvert","AWS/MediaLive","AWS/MediaPackage","AWS/MediaStore","AWS/MediaTailor","AWS/Events","AWS/FSx","AWS/GameLift","AWS/GlobalAccelerator","Glue","AWS/Inspector","AWS/IoT","AWS/KMS","AWS/Cassandra","AWS/Kinesis","AWS/KinesisAnalytics","AWS/Firehose","AWS/Lambda","AWS/Lex","AWS/AmazonMQ","AWS/ML","AWS/Kafka","AmazonMWAA","AWS/MemoryDB","AWS/NATGateway","AWS/Neptune","AWS/NetworkFirewall","AWS/NetworkELB","AWS/Network
-        Manager","AWS/NetworkMonitor","AWS/ES","AWS/AOSS","AWS/OpsWorks","AWS/Polly","AWS/PrivateLinkEndpoints","AWS/PrivateLinkServices","AWS/RDS","AWS/RDS/Proxy","AWS/Redshift","AWS/Rekognition","AWS/Route53","AWS/Route53Resolver","AWS/S3","AWS/S3/Storage-Lens","AWS/SageMaker","/aws/sagemaker/Endpoints","AWS/Sagemaker/LabelingJobs","AWS/Sagemaker/ModelBuildingPipeline","/aws/sagemaker/ProcessingJobs","/aws/sagemaker/TrainingJobs","/aws/sagemaker/TransformJobs","AWS/SageMaker/Workteam","AWS/ServiceQuotas","AWS/DDoSProtection","AWS/SES","AWS/SNS","AWS/SQS","AWS/SWF","AWS/States","AWS/StorageGateway","AWS/Textract","AWS/TransitGateway","AWS/Translate","AWS/TrustedAdvisor","AWS/Usage","AWS/VPN","WAF","AWS/WAFV2","AWS/WorkSpaces","AWS/X-Ray"]}}}'
+      string: '{"data":{"id":"namespaces","type":"namespaces","attributes":{"namespaces":["AWS/ApiGateway","AWS/AppRunner","AWS/AppStream","AWS/AppSync","AWS/ApplicationELB","AWS/Athena","AWS/AutoScaling","AWS/Backup","AWS/Bedrock","AWS/Billing","AWS/Budgeting","AWS/CertificateManager","AWS/ELB","AWS/CloudFront","AWS/CloudHSM","AWS/CloudSearch","AWS/Logs","AWS/CodeBuild","AWS/CodeWhisperer","AWS/Cognito","AWS/Config","AWS/Connect","AWS/DMS","AWS/DX","AWS/DocDB","AWS/DynamoDB","AWS/DAX","AWS/EC2","AWS/EC2/API","AWS/EC2/InfrastructurePerformance","AWS/EC2Spot","AWS/ElasticMapReduce","AWS/ElastiCache","AWS/ElasticBeanstalk","AWS/EBS","AWS/ECR","AWS/ECS","AWS/EFS","AWS/ElasticInference","AWS/ElasticTranscoder","AWS/MediaConnect","AWS/MediaConvert","AWS/MediaLive","AWS/MediaPackage","AWS/MediaStore","AWS/MediaTailor","AWS/Events","AWS/EventBridge/Pipes","AWS/Scheduler","AWS/FSx","AWS/GameLift","AWS/GlobalAccelerator","Glue","AWS/Inspector","AWS/IoT","AWS/KMS","AWS/Cassandra","AWS/Kinesis","AWS/KinesisAnalytics","AWS/Firehose","AWS/Lambda","AWS/Lex","AWS/AmazonMQ","AWS/ML","AWS/Kafka","AmazonMWAA","AWS/MemoryDB","AWS/NATGateway","AWS/Neptune","AWS/NetworkFirewall","AWS/NetworkELB","AWS/Network
+        Manager","AWS/NetworkMonitor","AWS/ES","AWS/AOSS","AWS/OpsWorks","AWS/PCS","AWS/Polly","AWS/PrivateLinkEndpoints","AWS/PrivateLinkServices","AWS/RDS","AWS/RDS/Proxy","AWS/Redshift","AWS/Rekognition","AWS/Route53","AWS/Route53Resolver","AWS/S3","AWS/S3/Storage-Lens","AWS/SageMaker","/aws/sagemaker/Endpoints","AWS/Sagemaker/LabelingJobs","AWS/Sagemaker/ModelBuildingPipeline","/aws/sagemaker/ProcessingJobs","/aws/sagemaker/TrainingJobs","/aws/sagemaker/TransformJobs","AWS/SageMaker/Workteam","AWS/ServiceQuotas","AWS/DDoSProtection","AWS/SES","AWS/SNS","AWS/SQS","AWS/SWF","AWS/States","AWS/StorageGateway","AWS/Textract","AWS/TransitGateway","AWS/Translate","AWS/TrustedAdvisor","AWS/Usage","AWS/VPN","WAF","AWS/WAFV2","AWS/WorkSpaces","AWS/X-Ray"]}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen b/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen
index 4846f88f761d..8ffc4d345aab 100644
--- a/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:04.107Z
\ No newline at end of file
+2025-08-06T17:41:51.528Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.yml b/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.yml
index 745b1c347eb0..34ad7e35d919 100644
--- a/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.yml
+++ b/cassettes/features/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.yml
@@ -1,5 +1,5 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:04 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:51 GMT
   request:
     body: null
     headers:
@@ -10,8 +10,8 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"namespaces","type":"namespaces","attributes":{"namespaces":["AWS/ApiGateway","AWS/AppRunner","AWS/AppStream","AWS/AppSync","AWS/ApplicationELB","AWS/Athena","AWS/AutoScaling","AWS/Backup","AWS/Bedrock","AWS/Billing","AWS/Budgeting","AWS/CertificateManager","AWS/ELB","AWS/CloudFront","AWS/CloudHSM","AWS/CloudSearch","AWS/Logs","AWS/CodeBuild","AWS/CodeWhisperer","AWS/Cognito","AWS/Config","AWS/Connect","AWS/DMS","AWS/DX","AWS/DocDB","AWS/DynamoDB","AWS/DAX","AWS/EC2","AWS/EC2/API","AWS/EC2/InfrastructurePerformance","AWS/EC2Spot","AWS/ElasticMapReduce","AWS/ElastiCache","AWS/ElasticBeanstalk","AWS/EBS","AWS/ECR","AWS/ECS","AWS/EFS","AWS/ElasticInference","AWS/ElasticTranscoder","AWS/MediaConnect","AWS/MediaConvert","AWS/MediaLive","AWS/MediaPackage","AWS/MediaStore","AWS/MediaTailor","AWS/Events","AWS/FSx","AWS/GameLift","AWS/GlobalAccelerator","Glue","AWS/Inspector","AWS/IoT","AWS/KMS","AWS/Cassandra","AWS/Kinesis","AWS/KinesisAnalytics","AWS/Firehose","AWS/Lambda","AWS/Lex","AWS/AmazonMQ","AWS/ML","AWS/Kafka","AmazonMWAA","AWS/MemoryDB","AWS/NATGateway","AWS/Neptune","AWS/NetworkFirewall","AWS/NetworkELB","AWS/Network
-        Manager","AWS/NetworkMonitor","AWS/ES","AWS/AOSS","AWS/OpsWorks","AWS/Polly","AWS/PrivateLinkEndpoints","AWS/PrivateLinkServices","AWS/RDS","AWS/RDS/Proxy","AWS/Redshift","AWS/Rekognition","AWS/Route53","AWS/Route53Resolver","AWS/S3","AWS/S3/Storage-Lens","AWS/SageMaker","/aws/sagemaker/Endpoints","AWS/Sagemaker/LabelingJobs","AWS/Sagemaker/ModelBuildingPipeline","/aws/sagemaker/ProcessingJobs","/aws/sagemaker/TrainingJobs","/aws/sagemaker/TransformJobs","AWS/SageMaker/Workteam","AWS/ServiceQuotas","AWS/DDoSProtection","AWS/SES","AWS/SNS","AWS/SQS","AWS/SWF","AWS/States","AWS/StorageGateway","AWS/Textract","AWS/TransitGateway","AWS/Translate","AWS/TrustedAdvisor","AWS/Usage","AWS/VPN","WAF","AWS/WAFV2","AWS/WorkSpaces","AWS/X-Ray"]}}}'
+      string: '{"data":{"id":"namespaces","type":"namespaces","attributes":{"namespaces":["AWS/ApiGateway","AWS/AppRunner","AWS/AppStream","AWS/AppSync","AWS/ApplicationELB","AWS/Athena","AWS/AutoScaling","AWS/Backup","AWS/Bedrock","AWS/Billing","AWS/Budgeting","AWS/CertificateManager","AWS/ELB","AWS/CloudFront","AWS/CloudHSM","AWS/CloudSearch","AWS/Logs","AWS/CodeBuild","AWS/CodeWhisperer","AWS/Cognito","AWS/Config","AWS/Connect","AWS/DMS","AWS/DX","AWS/DocDB","AWS/DynamoDB","AWS/DAX","AWS/EC2","AWS/EC2/API","AWS/EC2/InfrastructurePerformance","AWS/EC2Spot","AWS/ElasticMapReduce","AWS/ElastiCache","AWS/ElasticBeanstalk","AWS/EBS","AWS/ECR","AWS/ECS","AWS/EFS","AWS/ElasticInference","AWS/ElasticTranscoder","AWS/MediaConnect","AWS/MediaConvert","AWS/MediaLive","AWS/MediaPackage","AWS/MediaStore","AWS/MediaTailor","AWS/Events","AWS/EventBridge/Pipes","AWS/Scheduler","AWS/FSx","AWS/GameLift","AWS/GlobalAccelerator","Glue","AWS/Inspector","AWS/IoT","AWS/KMS","AWS/Cassandra","AWS/Kinesis","AWS/KinesisAnalytics","AWS/Firehose","AWS/Lambda","AWS/Lex","AWS/AmazonMQ","AWS/ML","AWS/Kafka","AmazonMWAA","AWS/MemoryDB","AWS/NATGateway","AWS/Neptune","AWS/NetworkFirewall","AWS/NetworkELB","AWS/Network
+        Manager","AWS/NetworkMonitor","AWS/ES","AWS/AOSS","AWS/OpsWorks","AWS/PCS","AWS/Polly","AWS/PrivateLinkEndpoints","AWS/PrivateLinkServices","AWS/RDS","AWS/RDS/Proxy","AWS/Redshift","AWS/Rekognition","AWS/Route53","AWS/Route53Resolver","AWS/S3","AWS/S3/Storage-Lens","AWS/SageMaker","/aws/sagemaker/Endpoints","AWS/Sagemaker/LabelingJobs","AWS/Sagemaker/ModelBuildingPipeline","/aws/sagemaker/ProcessingJobs","/aws/sagemaker/TrainingJobs","/aws/sagemaker/TransformJobs","AWS/SageMaker/Workteam","AWS/ServiceQuotas","AWS/DDoSProtection","AWS/SES","AWS/SNS","AWS/SQS","AWS/SWF","AWS/States","AWS/StorageGateway","AWS/Textract","AWS/TransitGateway","AWS/Translate","AWS/TrustedAdvisor","AWS/Usage","AWS/VPN","WAF","AWS/WAFV2","AWS/WorkSpaces","AWS/X-Ray"]}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
diff --git a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen
index e17c97ca735d..770d0364bdcb 100644
--- a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen
+++ b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:04.208Z
\ No newline at end of file
+2025-08-06T17:41:51.622Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.yml b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.yml
index 4900a9318104..1b520902394f 100644
--- a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.yml
+++ b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:04 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:51 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,43 +14,43 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"da257b29-9c21-471f-9f5d-41ccfbedd320","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"532ab1a205b74240a3ca14407209b4a6"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:04.788732465Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:04.788740678Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"ab6528e3-5dab-4375-ae47-4ce93d1216e2","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"36416390710445e7be511e1622ee4149"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:52.510132689Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:52.510132689Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:04 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:51 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/da257b29-9c21-471f-9f5d-41ccfbedd320
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/ab6528e3-5dab-4375-ae47-4ce93d1216e2
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"da257b29-9c21-471f-9f5d-41ccfbedd320","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"532ab1a205b74240a3ca14407209b4a6"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:04.788732Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":true,"collect_cloudwatch_alarms":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:04.980569196Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"ab6528e3-5dab-4375-ae47-4ce93d1216e2","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"36416390710445e7be511e1622ee4149"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:52.510132Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":true,"collect_cloudwatch_alarms":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:52.717094345Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:04 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:51 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/da257b29-9c21-471f-9f5d-41ccfbedd320
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/ab6528e3-5dab-4375-ae47-4ce93d1216e2
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen
index 2eba167cd84a..2ad05fcd48b3 100644
--- a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen
+++ b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:05.214Z
\ No newline at end of file
+2025-08-06T17:41:53.059Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.yml b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.yml
index 48e54c7d1f28..83f8744f9292 100644
--- a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.yml
+++ b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:05 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:53 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":false,"collect_custom_metrics":false,"enabled":true,"namespace_filters":{"include_only":["AWS/EC2"]},"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}},"type":"account"}}'
     headers:
       Accept:
       - application/json
@@ -14,25 +14,25 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"0592afaa-a119-45f1-95ab-236ae090500a","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"c1b6bd9935234ad789a9f144fc028bff"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2024-11-14T20:08:05.881756591Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2024-11-14T20:08:05.881761604Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
+      string: '{"data":{"id":"dff6d3ee-e90a-4df1-b0d7-6f4e1ed35acc","type":"account","attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole","external_id":"f3f5392d608c448ca4910d7adcefa849"},"aws_account_id":"123456789012","aws_partition":"aws","aws_regions":{"include_only":["us-east-1"]},"created_at":"2025-08-06T17:41:54.148895503Z","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]}}},"metrics_config":{"enabled":true,"automute_enabled":true,"collect_custom_metrics":false,"collect_cloudwatch_alarms":false,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}],"namespace_filters":{"include_only":["AWS/EC2"]}},"modified_at":"2025-08-06T17:41:54.148895503Z","resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{"xray_services":{"include_only":["AWS/AppSync"]}}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Thu, 14 Nov 2024 20:08:05 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:53 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"access_key_id":"AKIAIOSFODNN7EXAMPLE","secret_access_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"access_key_id":"AKIAIOSFODNN7EXAMPLE","secret_access_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/0592afaa-a119-45f1-95ab-236ae090500a
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/dff6d3ee-e90a-4df1-b0d7-6f4e1ed35acc
   response:
     body:
       encoding: UTF-8
@@ -44,14 +44,14 @@ http_interactions:
     status:
       code: 400
       message: Bad Request
-- recorded_at: Thu, 14 Nov 2024 20:08:05 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:53 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/0592afaa-a119-45f1-95ab-236ae090500a
+    uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/dff6d3ee-e90a-4df1-b0d7-6f4e1ed35acc
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen
index 6bec363d4f63..8c2f55ecb19d 100644
--- a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen
+++ b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen
@@ -1 +1 @@
-2024-11-14T20:08:06.418Z
\ No newline at end of file
+2025-08-06T17:41:54.735Z
\ No newline at end of file
diff --git a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.yml b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.yml
index 4dbd5d5c4919..02e784a97c0b 100644
--- a/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.yml
+++ b/cassettes/features/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.yml
@@ -1,9 +1,9 @@
 http_interactions:
-- recorded_at: Thu, 14 Nov 2024 20:08:06 GMT
+- recorded_at: Wed, 06 Aug 2025 17:41:54 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
+      string: '{"data":{"attributes":{"account_tags":["key:value"],"auth_config":{"role_name":"DatadogIntegrationRole"},"aws_account_id":"123456789012","aws_partition":"aws","logs_config":{"lambda_forwarder":{"lambdas":["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"],"log_source_config":{"tag_filters":[{"source":"s3","tags":["test:test"]}]},"sources":["s3"]}},"metrics_config":{"automute_enabled":true,"collect_cloudwatch_alarms":true,"collect_custom_metrics":true,"enabled":true,"tag_filters":[{"namespace":"AWS/EC2","tags":["key:value"]}]},"resources_config":{"cloud_security_posture_management_collection":false,"extended_collection":false},"traces_config":{}},"type":"account"}}'
     headers:
       Accept:
       - application/json
diff --git a/examples/v2/aws-integration/CreateAWSAccount.rb b/examples/v2/aws-integration/CreateAWSAccount.rb
index 80147052f0c0..0f20f690e279 100644
--- a/examples/v2/aws-integration/CreateAWSAccount.rb
+++ b/examples/v2/aws-integration/CreateAWSAccount.rb
@@ -23,6 +23,16 @@
           lambdas: [
             "arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder",
           ],
+          log_source_config: DatadogAPIClient::V2::AWSLambdaForwarderConfigLogSourceConfig.new({
+            tag_filters: [
+              DatadogAPIClient::V2::AWSLogSourceTagFilter.new({
+                source: "s3",
+                tags: [
+                  "test:test",
+                ],
+              }),
+            ],
+          }),
           sources: [
             "s3",
           ],
diff --git a/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb b/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb
index bf6e73a7e729..e821a96d0b80 100644
--- a/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb
+++ b/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb
@@ -22,6 +22,16 @@
           lambdas: [
             "arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder",
           ],
+          log_source_config: DatadogAPIClient::V2::AWSLambdaForwarderConfigLogSourceConfig.new({
+            tag_filters: [
+              DatadogAPIClient::V2::AWSLogSourceTagFilter.new({
+                source: "s3",
+                tags: [
+                  "test:test",
+                ],
+              }),
+            ],
+          }),
           sources: [
             "s3",
           ],
diff --git a/examples/v2/aws-integration/UpdateAWSAccount.rb b/examples/v2/aws-integration/UpdateAWSAccount.rb
index 705f1495d1e7..ad6270b1701b 100644
--- a/examples/v2/aws-integration/UpdateAWSAccount.rb
+++ b/examples/v2/aws-integration/UpdateAWSAccount.rb
@@ -25,6 +25,16 @@
           lambdas: [
             "arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder",
           ],
+          log_source_config: DatadogAPIClient::V2::AWSLambdaForwarderConfigLogSourceConfig.new({
+            tag_filters: [
+              DatadogAPIClient::V2::AWSLogSourceTagFilter.new({
+                source: "s3",
+                tags: [
+                  "test:test",
+                ],
+              }),
+            ],
+          }),
           sources: [
             "s3",
           ],
diff --git a/examples/v2/cloud-network-monitoring/GetAggregatedConnections.rb b/examples/v2/cloud-network-monitoring/GetAggregatedConnections.rb
index 3fce66efb23a..0276fa12a7fe 100644
--- a/examples/v2/cloud-network-monitoring/GetAggregatedConnections.rb
+++ b/examples/v2/cloud-network-monitoring/GetAggregatedConnections.rb
@@ -1,8 +1,5 @@
 # Get all aggregated connections returns "OK" response
 
 require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.get_aggregated_connections".to_sym] = true
-end
 api_instance = DatadogAPIClient::V2::CloudNetworkMonitoringAPI.new
 p api_instance.get_aggregated_connections()
diff --git a/examples/v2/cloud-network-monitoring/GetAggregatedConnections_3059356111.rb b/examples/v2/cloud-network-monitoring/GetAggregatedConnections_3059356111.rb
index 3157360f131c..d85dae6a66bb 100644
--- a/examples/v2/cloud-network-monitoring/GetAggregatedConnections_3059356111.rb
+++ b/examples/v2/cloud-network-monitoring/GetAggregatedConnections_3059356111.rb
@@ -1,8 +1,5 @@
 # Get aggregated connections returns "OK" response
 
 require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.get_aggregated_connections".to_sym] = true
-end
 api_instance = DatadogAPIClient::V2::CloudNetworkMonitoringAPI.new
 p api_instance.get_aggregated_connections()
diff --git a/examples/v2/cloud-network-monitoring/GetAggregatedDns.rb b/examples/v2/cloud-network-monitoring/GetAggregatedDns.rb
index d3166eaeb51c..069d32e8fdc3 100644
--- a/examples/v2/cloud-network-monitoring/GetAggregatedDns.rb
+++ b/examples/v2/cloud-network-monitoring/GetAggregatedDns.rb
@@ -1,8 +1,5 @@
 # Get all aggregated DNS traffic returns "OK" response
 
 require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.get_aggregated_dns".to_sym] = true
-end
 api_instance = DatadogAPIClient::V2::CloudNetworkMonitoringAPI.new
 p api_instance.get_aggregated_dns()
diff --git a/features/v2/aws_integration.feature b/features/v2/aws_integration.feature
index 1b501698e9f6..e0f1d4d7267c 100644
--- a/features/v2/aws_integration.feature
+++ b/features/v2/aws_integration.feature
@@ -13,7 +13,7 @@ Feature: AWS Integration
   Scenario: Create an AWS account returns "AWS Account object" response
     Given operation "CreateAWSAccount" enabled
     And new "CreateAWSAccount" request
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
@@ -21,7 +21,7 @@ Feature: AWS Integration
   Scenario: Create an AWS integration returns "AWS Account object" response
     Given operation "CreateAWSAccount" enabled
     And new "CreateAWSAccount" request
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
@@ -29,7 +29,7 @@ Feature: AWS Integration
   Scenario: Create an AWS integration returns "Bad Request" response
     Given operation "CreateAWSAccount" enabled
     And new "CreateAWSAccount" request
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws-invalid", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws-invalid", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -38,7 +38,7 @@ Feature: AWS Integration
     Given operation "CreateAWSAccount" enabled
     And there is a valid "aws_account_v2" in the system
     And new "CreateAWSAccount" request
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 409 Conflict
 
@@ -140,7 +140,7 @@ Feature: AWS Integration
     And there is a valid "aws_account_v2" in the system
     And new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id"
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
@@ -150,7 +150,7 @@ Feature: AWS Integration
     And there is a valid "aws_account_v2" in the system
     And new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id"
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -159,6 +159,6 @@ Feature: AWS Integration
     Given operation "UpdateAWSAccount" enabled
     And new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a"
-    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
+    And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 404 Not Found
diff --git a/features/v2/cloud_network_monitoring.feature b/features/v2/cloud_network_monitoring.feature
index feabf8845d0a..12064508f1ee 100644
--- a/features/v2/cloud_network_monitoring.feature
+++ b/features/v2/cloud_network_monitoring.feature
@@ -14,37 +14,32 @@ Feature: Cloud Network Monitoring
 
   @team:Datadog/networks
   Scenario: Get aggregated connections returns "OK" response
-    Given operation "GetAggregatedConnections" enabled
-    And new "GetAggregatedConnections" request
+    Given new "GetAggregatedConnections" request
     When the request is sent
     Then the response status is 200 OK
 
   @team:Datadog/networks
   Scenario: Get all aggregated DNS traffic returns "Bad Request" response
-    Given operation "GetAggregatedDns" enabled
-    And new "GetAggregatedDns" request
+    Given new "GetAggregatedDns" request
     And request contains "group_by" parameter with value "server_ungrouped,server_service"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @team:Datadog/networks
   Scenario: Get all aggregated DNS traffic returns "OK" response
-    Given operation "GetAggregatedDns" enabled
-    And new "GetAggregatedDns" request
+    Given new "GetAggregatedDns" request
     When the request is sent
     Then the response status is 200 OK
 
   @skip-python @skip-ruby @team:Datadog/networks
   Scenario: Get all aggregated connections returns "Bad Request" response
-    Given operation "GetAggregatedConnections" enabled
-    And new "GetAggregatedConnections" request
+    Given new "GetAggregatedConnections" request
     And request contains "limit" parameter with value 8000
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:Datadog/networks
   Scenario: Get all aggregated connections returns "OK" response
-    Given operation "GetAggregatedConnections" enabled
-    And new "GetAggregatedConnections" request
+    Given new "GetAggregatedConnections" request
     When the request is sent
     Then the response status is 200 OK
diff --git a/features/v2/given.json b/features/v2/given.json
index d1f630f71a85..904a03d75911 100644
--- a/features/v2/given.json
+++ b/features/v2/given.json
@@ -293,7 +293,7 @@
     "parameters": [
       {
         "name": "body",
-        "value": "{\n  \"data\": {\n    \"type\": \"account\",\n    \"attributes\": {\n      \"account_tags\": [\n        \"key:value\"\n      ],\n      \"auth_config\": {\n        \"role_name\": \"DatadogIntegrationRole\"\n      },\n      \"aws_account_id\": \"123456789012\",\n      \"aws_partition\": \"aws\",\n      \"aws_regions\": {\n        \"include_only\": [\n          \"us-east-1\"\n        ]\n      },\n      \"logs_config\": {\n        \"lambda_forwarder\": {\n          \"lambdas\": [\n            \"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder\"\n          ],\n          \"sources\": [\n            \"s3\"\n          ]\n        }\n      },\n      \"metrics_config\": {\n        \"enabled\": true,\n        \"automute_enabled\": true,\n        \"collect_custom_metrics\": false,\n        \"collect_cloudwatch_alarms\": false,\n        \"tag_filters\": [\n          {\n            \"namespace\": \"AWS/EC2\",\n            \"tags\": [\n              \"key:value\"\n            ]\n          }\n        ],\n        \"namespace_filters\": {\n          \"include_only\": [\n            \"AWS/EC2\"\n          ]\n        }\n      },\n      \"resources_config\": {\n        \"cloud_security_posture_management_collection\": false,\n        \"extended_collection\": false\n      },\n      \"traces_config\": {\n        \"xray_services\": {\n          \"include_only\": [\n            \"AWS/AppSync\"\n          ]\n        }\n      }\n    }\n  }\n}"
+        "value": "{\n  \"data\": {\n    \"type\": \"account\",\n    \"attributes\": {\n      \"account_tags\": [\n        \"key:value\"\n      ],\n      \"auth_config\": {\n        \"role_name\": \"DatadogIntegrationRole\"\n      },\n      \"aws_account_id\": \"123456789012\",\n      \"aws_partition\": \"aws\",\n      \"aws_regions\": {\n        \"include_only\": [\n          \"us-east-1\"\n        ]\n      },\n      \"logs_config\": {\n        \"lambda_forwarder\": {\n          \"lambdas\": [\n            \"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder\"\n          ],\n          \"sources\": [\n            \"s3\"\n          ],\n          \"log_source_config\": {\n            \"tag_filters\": [\n              {\n                \"source\": \"s3\",\n                \"tags\": [\"test:test\"]\n              }\n            ]\n          }\n        }\n      },\n      \"metrics_config\": {\n        \"enabled\": true,\n        \"automute_enabled\": true,\n        \"collect_custom_metrics\": false,\n        \"collect_cloudwatch_alarms\": false,\n        \"tag_filters\": [\n          {\n            \"namespace\": \"AWS/EC2\",\n            \"tags\": [\n              \"key:value\"\n            ]\n          }\n        ],\n        \"namespace_filters\": {\n          \"include_only\": [\n            \"AWS/EC2\"\n          ]\n        }\n      },\n      \"resources_config\": {\n        \"cloud_security_posture_management_collection\": false,\n        \"extended_collection\": false\n      },\n      \"traces_config\": {\n        \"xray_services\": {\n          \"include_only\": [\n            \"AWS/AppSync\"\n          ]\n        }\n      }\n    }\n  }\n}"
       }
     ],
     "step": "there is a valid \"aws_account_v2\" in the system",
diff --git a/lib/datadog_api_client/configuration.rb b/lib/datadog_api_client/configuration.rb
index 4249b464ee82..d3af1c434f86 100644
--- a/lib/datadog_api_client/configuration.rb
+++ b/lib/datadog_api_client/configuration.rb
@@ -254,8 +254,6 @@ def initialize
             "v2.update_monitor_user_template": false,
             "v2.validate_existing_monitor_user_template": false,
             "v2.validate_monitor_user_template": false,
-            "v2.get_aggregated_connections": false,
-            "v2.get_aggregated_dns": false,
             "v2.create_pipeline": false,
             "v2.delete_pipeline": false,
             "v2.get_pipeline": false,
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index 2a1217b58845..478952c5558b 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -1166,7 +1166,9 @@ def overrides
           "v2.aws_integration_type" => "AWSIntegrationType",
           "v2.aws_integration_update" => "AWSIntegrationUpdate",
           "v2.aws_lambda_forwarder_config" => "AWSLambdaForwarderConfig",
+          "v2.aws_lambda_forwarder_config_log_source_config" => "AWSLambdaForwarderConfigLogSourceConfig",
           "v2.aws_logs_config" => "AWSLogsConfig",
+          "v2.aws_log_source_tag_filter" => "AWSLogSourceTagFilter",
           "v2.aws_logs_services_response" => "AWSLogsServicesResponse",
           "v2.aws_logs_services_response_attributes" => "AWSLogsServicesResponseAttributes",
           "v2.aws_logs_services_response_data" => "AWSLogsServicesResponseData",
diff --git a/lib/datadog_api_client/v2/api/cloud_network_monitoring_api.rb b/lib/datadog_api_client/v2/api/cloud_network_monitoring_api.rb
index 108e5ef3af54..b1fe4c93ee44 100644
--- a/lib/datadog_api_client/v2/api/cloud_network_monitoring_api.rb
+++ b/lib/datadog_api_client/v2/api/cloud_network_monitoring_api.rb
@@ -43,12 +43,6 @@ def get_aggregated_connections(opts = {})
     # @option opts [Integer] :limit The number of connections to be returned. The maximum value is 7500. The default is 100.
     # @return [Array<(SingleAggregatedConnectionResponseArray, Integer, Hash)>] SingleAggregatedConnectionResponseArray data, response status code and response headers
     def get_aggregated_connections_with_http_info(opts = {})
-      unstable_enabled = @api_client.config.unstable_operations["v2.get_aggregated_connections".to_sym]
-      if unstable_enabled
-        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.get_aggregated_connections")
-      else
-        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.get_aggregated_connections"))
-      end
 
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: CloudNetworkMonitoringAPI.get_aggregated_connections ...'
@@ -125,12 +119,6 @@ def get_aggregated_dns(opts = {})
     # @option opts [Integer] :limit The number of aggregated DNS entries to be returned. The maximum value is 7500. The default is 100.
     # @return [Array<(SingleAggregatedDnsResponseArray, Integer, Hash)>] SingleAggregatedDnsResponseArray data, response status code and response headers
     def get_aggregated_dns_with_http_info(opts = {})
-      unstable_enabled = @api_client.config.unstable_operations["v2.get_aggregated_dns".to_sym]
-      if unstable_enabled
-        @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.get_aggregated_dns")
-      else
-        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.get_aggregated_dns"))
-      end
 
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: CloudNetworkMonitoringAPI.get_aggregated_dns ...'
diff --git a/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config.rb b/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config.rb
index ceb1526dd899..1cdbc3e6fdfc 100644
--- a/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config.rb
+++ b/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config.rb
@@ -25,6 +25,9 @@ class AWSLambdaForwarderConfig
     # List of Datadog Lambda Log Forwarder ARNs in your AWS account. Defaults to `[]`.
     attr_accessor :lambdas
 
+    # Log source configuration.
+    attr_accessor :log_source_config
+
     # List of service IDs set to enable automatic log collection. Discover the list of available services with the
     # [Get list of AWS log ready services](https://docs.datadoghq.com/api/latest/aws-logs-integration/#get-list-of-aws-log-ready-services) endpoint.
     attr_accessor :sources
@@ -36,6 +39,7 @@ class AWSLambdaForwarderConfig
     def self.attribute_map
       {
         :'lambdas' => :'lambdas',
+        :'log_source_config' => :'log_source_config',
         :'sources' => :'sources'
       }
     end
@@ -45,6 +49,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'lambdas' => :'Array<String>',
+        :'log_source_config' => :'AWSLambdaForwarderConfigLogSourceConfig',
         :'sources' => :'Array<String>'
       }
     end
@@ -73,6 +78,10 @@ def initialize(attributes = {})
         end
       end
 
+      if attributes.key?(:'log_source_config')
+        self.log_source_config = attributes[:'log_source_config']
+      end
+
       if attributes.key?(:'sources')
         if (value = attributes[:'sources']).is_a?(Array)
           self.sources = value
@@ -107,6 +116,7 @@ def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           lambdas == o.lambdas &&
+          log_source_config == o.log_source_config &&
           sources == o.sources &&
           additional_properties == o.additional_properties
     end
@@ -115,7 +125,7 @@ def ==(o)
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [lambdas, sources, additional_properties].hash
+      [lambdas, log_source_config, sources, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config_log_source_config.rb b/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config_log_source_config.rb
new file mode 100644
index 000000000000..50b6f1973a46
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/aws_lambda_forwarder_config_log_source_config.rb
@@ -0,0 +1,107 @@
+=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
+  # Log source configuration.
+  class AWSLambdaForwarderConfigLogSourceConfig
+    include BaseGenericModel
+
+    # List of AWS log source tag filters. Defaults to `[]`.
+    attr_accessor :tag_filters
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'tag_filters' => :'tag_filters'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'tag_filters' => :'Array<AWSLogSourceTagFilter>'
+      }
+    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::AWSLambdaForwarderConfigLogSourceConfig` 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?(:'tag_filters')
+        if (value = attributes[:'tag_filters']).is_a?(Array)
+          self.tag_filters = 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 &&
+          tag_filters == o.tag_filters &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [tag_filters, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/aws_log_source_tag_filter.rb b/lib/datadog_api_client/v2/models/aws_log_source_tag_filter.rb
new file mode 100644
index 000000000000..cd10a70d2648
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/aws_log_source_tag_filter.rb
@@ -0,0 +1,128 @@
+=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
+  # AWS log source tag filter list. Defaults to `[]`.
+  # Array of log source to AWS resource tag mappings. Each mapping contains a log source and its associated AWS resource tags (in `key:value` format) used to filter logs submitted to Datadog.
+  # Tag filters are applied for tags on the AWS resource emitting logs; tags associated with the log storage entity (such as a CloudWatch Log Group or S3 Bucket) are not considered.
+  # For more information on resource tag filter syntax, [see AWS resource exclusion](https://docs.datadoghq.com/account_management/billing/aws/#aws-resource-exclusion) in the AWS integration billing page.
+  class AWSLogSourceTagFilter
+    include BaseGenericModel
+
+    # The AWS log source to which the tag filters defined in `tags` are applied.
+    attr_accessor :source
+
+    # The AWS resource tags to filter on for the log source specified by `source`.
+    attr_accessor :tags
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'source' => :'source',
+        :'tags' => :'tags'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'source' => :'String',
+        :'tags' => :'Array<String>'
+      }
+    end
+
+    # List of attributes with nullable: true
+    # @!visibility private
+    def self.openapi_nullable
+      Set.new([
+        :'tags',
+      ])
+    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::AWSLogSourceTagFilter` 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?(:'source')
+        self.source = attributes[:'source']
+      end
+
+      if attributes.key?(:'tags')
+        if (value = attributes[:'tags']).is_a?(Array)
+          self.tags = 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 &&
+          source == o.source &&
+          tags == o.tags &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [source, tags, additional_properties].hash
+    end
+  end
+end