diff --git a/.apigentools-info b/.apigentools-info
index b3ca2a229af..a21f325a7ab 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.2",
-            "regenerated": "2022-07-01 08:41:01.145047",
-            "spec_repo_commit": "be2f0c5e"
+            "regenerated": "2022-07-01 20:48:55.794425",
+            "spec_repo_commit": "713cd02c"
         },
         "v2": {
             "apigentools_version": "1.6.2",
-            "regenerated": "2022-07-01 08:41:01.157440",
-            "spec_repo_commit": "be2f0c5e"
+            "regenerated": "2022-07-01 20:48:55.806279",
+            "spec_repo_commit": "713cd02c"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index dc3950d3d86..40dcb44ede7 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -3629,7 +3629,13 @@ components:
       - appsec_usage
       - browser_usage
       - container_usage
+      - cspm_containers_usage
+      - cspm_hosts_usage
       - custom_timeseries_usage
+      - cws_containers_usage
+      - cws_hosts_usage
+      - dbm_hosts_usage
+      - dbm_queries_usage
       - estimated_indexed_logs_usage
       - estimated_indexed_spans_usage
       - fargate_usage
@@ -3648,7 +3654,13 @@ components:
       - APPSEC_USAGE
       - BROWSER_USAGE
       - CONTAINER_USAGE
+      - CSPM_CONTAINERS_USAGE
+      - CSPM_HOSTS_USAGE
       - CUSTOM_TIMESERIES_USAGE
+      - CWS_CONTAINERS_USAGE
+      - CWS_HOSTS_USAGE
+      - DBM_HOSTS_USAGE
+      - DBM_QUERIES_USAGE
       - ESTIMATED_INDEXED_LOGS_USAGE
       - ESTIMATED_INDEXED_SPANS_USAGE
       - FARGATE_USAGE
@@ -6839,8 +6851,20 @@ components:
       - browser_percentage
       - container_usage
       - container_percentage
+      - cspm_containers_percentage
+      - cspm_containers_usage
+      - cspm_hosts_percentage
+      - cspm_hosts_usage
       - custom_timeseries_usage
       - custom_timeseries_percentage
+      - cws_containers_percentage
+      - cws_containers_usage
+      - cws_hosts_percentage
+      - cws_hosts_usage
+      - dbm_hosts_percentage
+      - dbm_hosts_usage
+      - dbm_queries_percentage
+      - dbm_queries_usage
       - estimated_indexed_logs_usage
       - estimated_indexed_logs_percentage
       - estimated_indexed_spans_usage
@@ -6876,8 +6900,20 @@ components:
       - BROWSER_PERCENTAGE
       - CONTAINER_USAGE
       - CONTAINER_PERCENTAGE
+      - CSPM_CONTAINERS_PERCENTAGE
+      - CSPM_CONTAINERS_USAGE
+      - CSPM_HOSTS_PERCENTAGE
+      - CSPM_HOSTS_USAGE
       - CUSTOM_TIMESERIES_USAGE
       - CUSTOM_TIMESERIES_PERCENTAGE
+      - CWS_CONTAINERS_PERCENTAGE
+      - CWS_CONTAINERS_USAGE
+      - CWS_HOSTS_PERCENTAGE
+      - CWS_HOSTS_USAGE
+      - DBM_HOSTS_PERCENTAGE
+      - DBM_HOSTS_USAGE
+      - DBM_QUERIES_PERCENTAGE
+      - DBM_QUERIES_USAGE
       - ESTIMATED_INDEXED_LOGS_USAGE
       - ESTIMATED_INDEXED_LOGS_PERCENTAGE
       - ESTIMATED_INDEXED_SPANS_USAGE
diff --git a/lib/datadog_api_client/v1/api/usage_metering_api.rb b/lib/datadog_api_client/v1/api/usage_metering_api.rb
index 1ebab6fd48a..4e908cab9fa 100644
--- a/lib/datadog_api_client/v1/api/usage_metering_api.rb
+++ b/lib/datadog_api_client/v1/api/usage_metering_api.rb
@@ -164,7 +164,7 @@ def get_hourly_usage_attribution_with_http_info(start_hr, usage_type, opts = {})
         fail ArgumentError, "Missing the required parameter 'usage_type' when calling UsageMeteringAPI.get_hourly_usage_attribution"
       end
       # verify enum value
-      allowable_values = ['api_usage', 'apm_host_usage', 'appsec_usage', 'browser_usage', 'container_usage', 'custom_timeseries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_spans_usage', 'fargate_usage', 'functions_usage', 'indexed_logs_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'profiled_container_usage', 'profiled_host_usage', 'snmp_usage']
+      allowable_values = ['api_usage', 'apm_host_usage', 'appsec_usage', 'browser_usage', 'container_usage', 'cspm_containers_usage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'cws_containers_usage', 'cws_hosts_usage', 'dbm_hosts_usage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_spans_usage', 'fargate_usage', 'functions_usage', 'indexed_logs_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'profiled_container_usage', 'profiled_host_usage', 'snmp_usage']
       if @api_client.config.client_side_validation && !allowable_values.include?(usage_type)
         fail ArgumentError, "invalid value for \"usage_type\", must be one of #{allowable_values}"
       end
@@ -509,7 +509,7 @@ def get_monthly_usage_attribution_with_http_info(start_month, fields, opts = {})
         fail ArgumentError, "Missing the required parameter 'fields' when calling UsageMeteringAPI.get_monthly_usage_attribution"
       end
       # verify enum value
-      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
+      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'cws_containers_percentage', 'cws_containers_usage', 'cws_hosts_percentage', 'cws_hosts_usage', 'dbm_hosts_percentage', 'dbm_hosts_usage', 'dbm_queries_percentage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
       if @api_client.config.client_side_validation && !allowable_values.include?(fields)
         fail ArgumentError, "invalid value for \"fields\", must be one of #{allowable_values}"
       end
@@ -517,7 +517,7 @@ def get_monthly_usage_attribution_with_http_info(start_month, fields, opts = {})
       if @api_client.config.client_side_validation && opts[:'sort_direction'] && !allowable_values.include?(opts[:'sort_direction'])
         fail ArgumentError, "invalid value for \"sort_direction\", must be one of #{allowable_values}"
       end
-      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
+      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'cws_containers_percentage', 'cws_containers_usage', 'cws_hosts_percentage', 'cws_hosts_usage', 'dbm_hosts_percentage', 'dbm_hosts_usage', 'dbm_queries_percentage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
       if @api_client.config.client_side_validation && opts[:'sort_name'] && !allowable_values.include?(opts[:'sort_name'])
         fail ArgumentError, "invalid value for \"sort_name\", must be one of #{allowable_values}"
       end
diff --git a/lib/datadog_api_client/v1/models/hourly_usage_attribution_usage_type.rb b/lib/datadog_api_client/v1/models/hourly_usage_attribution_usage_type.rb
index 3c09dd6a27f..de345f62847 100644
--- a/lib/datadog_api_client/v1/models/hourly_usage_attribution_usage_type.rb
+++ b/lib/datadog_api_client/v1/models/hourly_usage_attribution_usage_type.rb
@@ -26,7 +26,13 @@ class HourlyUsageAttributionUsageType
     APPSEC_USAGE = "appsec_usage".freeze
     BROWSER_USAGE = "browser_usage".freeze
     CONTAINER_USAGE = "container_usage".freeze
+    CSPM_CONTAINERS_USAGE = "cspm_containers_usage".freeze
+    CSPM_HOSTS_USAGE = "cspm_hosts_usage".freeze
     CUSTOM_TIMESERIES_USAGE = "custom_timeseries_usage".freeze
+    CWS_CONTAINERS_USAGE = "cws_containers_usage".freeze
+    CWS_HOSTS_USAGE = "cws_hosts_usage".freeze
+    DBM_HOSTS_USAGE = "dbm_hosts_usage".freeze
+    DBM_QUERIES_USAGE = "dbm_queries_usage".freeze
     ESTIMATED_INDEXED_LOGS_USAGE = "estimated_indexed_logs_usage".freeze
     ESTIMATED_INDEXED_SPANS_USAGE = "estimated_indexed_spans_usage".freeze
     FARGATE_USAGE = "fargate_usage".freeze
diff --git a/lib/datadog_api_client/v1/models/monthly_usage_attribution_supported_metrics.rb b/lib/datadog_api_client/v1/models/monthly_usage_attribution_supported_metrics.rb
index 56b7765aef2..f3093553df4 100644
--- a/lib/datadog_api_client/v1/models/monthly_usage_attribution_supported_metrics.rb
+++ b/lib/datadog_api_client/v1/models/monthly_usage_attribution_supported_metrics.rb
@@ -31,8 +31,20 @@ class MonthlyUsageAttributionSupportedMetrics
     BROWSER_PERCENTAGE = "browser_percentage".freeze
     CONTAINER_USAGE = "container_usage".freeze
     CONTAINER_PERCENTAGE = "container_percentage".freeze
+    CSPM_CONTAINERS_PERCENTAGE = "cspm_containers_percentage".freeze
+    CSPM_CONTAINERS_USAGE = "cspm_containers_usage".freeze
+    CSPM_HOSTS_PERCENTAGE = "cspm_hosts_percentage".freeze
+    CSPM_HOSTS_USAGE = "cspm_hosts_usage".freeze
     CUSTOM_TIMESERIES_USAGE = "custom_timeseries_usage".freeze
     CUSTOM_TIMESERIES_PERCENTAGE = "custom_timeseries_percentage".freeze
+    CWS_CONTAINERS_PERCENTAGE = "cws_containers_percentage".freeze
+    CWS_CONTAINERS_USAGE = "cws_containers_usage".freeze
+    CWS_HOSTS_PERCENTAGE = "cws_hosts_percentage".freeze
+    CWS_HOSTS_USAGE = "cws_hosts_usage".freeze
+    DBM_HOSTS_PERCENTAGE = "dbm_hosts_percentage".freeze
+    DBM_HOSTS_USAGE = "dbm_hosts_usage".freeze
+    DBM_QUERIES_PERCENTAGE = "dbm_queries_percentage".freeze
+    DBM_QUERIES_USAGE = "dbm_queries_usage".freeze
     ESTIMATED_INDEXED_LOGS_USAGE = "estimated_indexed_logs_usage".freeze
     ESTIMATED_INDEXED_LOGS_PERCENTAGE = "estimated_indexed_logs_percentage".freeze
     ESTIMATED_INDEXED_SPANS_USAGE = "estimated_indexed_spans_usage".freeze