Add Application Vulnerability Management to usage metering API (#1461)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-05-12 13:13:08.052638",
-            "spec_repo_commit": "9eca3996"
+            "regenerated": "2023-05-17 14:44:49.208852",
+            "spec_repo_commit": "f8bfb8c1"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-05-12 13:13:08.068754",
-            "spec_repo_commit": "9eca3996"
+            "regenerated": "2023-05-17 14:44:49.255286",
+            "spec_repo_commit": "f8bfb8c1"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3764,6 +3764,7 @@ components:
       - snmp_usage
       - estimated_rum_sessions_usage
       - universal_service_monitoring_usage
+      - vuln_management_hosts_usage
       type: string
       x-enum-varnames:
       - API_USAGE
@@ -3797,6 +3798,7 @@ components:
       - SNMP_USAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
       - UNIVERSAL_SERVICE_MONITORING_USAGE
+      - VULN_MANAGEMENT_HOSTS_USAGE
     IFrameWidgetDefinition:
       description: The iframe widget allows you to embed a portion of any other web
         page on your dashboard. Only available on FREE layout dashboards.
@@ -7260,6 +7262,8 @@ components:
       - estimated_rum_sessions_percentage
       - universal_service_monitoring_usage
       - universal_service_monitoring_percentage
+      - vuln_management_hosts_usage
+      - vuln_management_hosts_percentage
       - '*'
       type: string
       x-enum-varnames:
@@ -7325,6 +7329,8 @@ components:
       - ESTIMATED_RUM_SESSIONS_PERCENTAGE
       - UNIVERSAL_SERVICE_MONITORING_USAGE
       - UNIVERSAL_SERVICE_MONITORING_PERCENTAGE
+      - VULN_MANAGEMENT_HOSTS_USAGE
+      - VULN_MANAGEMENT_HOSTS_PERCENTAGE
       - ALL
     MonthlyUsageAttributionValues:
       description: Fields in Usage Summary by tag(s).
@@ -7582,6 +7588,15 @@ components:
           description: The universal service monitoring usage by tag(s).
           format: double
           type: number
+        vuln_management_hosts_percentage:
+          description: The percentage of Application Vulnerability Management usage
+            by tag(s).
+          format: double
+          type: number
+        vuln_management_hosts_usage:
+          description: The Application Vulnerability Management usage by tag(s).
+          format: double
+          type: number
       type: object
     NoteWidgetDefinition:
       description: The notes and links widget is similar to free text widget, but
@@ -17615,6 +17630,11 @@ components:
             in the current date for all organizations.
           format: int64
           type: integer
+        vuln_management_host_count_top99p:
+          description: Shows the 99th percentile of all Application Vulnerability
+            Management hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
       type: object
     UsageSummaryDateOrg:
       description: Global hourly report of all data billed by Datadog for a given
@@ -18020,6 +18040,11 @@ components:
             in the current date for the given org.
           format: int64
           type: integer
+        vuln_management_host_count_top99p:
+          description: Shows the 99th percentile of all Application Vulnerability
+            Management hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
       type: object
     UsageSummaryResponse:
       description: Response summarizing all usage aggregated across the months in
@@ -18472,6 +18497,11 @@ components:
             in the current months for all organizations.
           format: int64
           type: integer
+        vuln_management_host_count_top99p_sum:
+          description: Shows the 99th percentile of all Application Vulnerability
+            Management hosts over all hours in the current months for all organizations.
+          format: int64
+          type: integer
       type: object
     UsageSyntheticsAPIHour:
       description: Number of Synthetics API tests run for each hour for a given organization.

src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py

@@ -16,7 +16,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
     """
     Supported products for hourly usage attribution requests.
 
-    :param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "container_excl_agent_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_ingested_timeseries_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_hosts_usage", "dbm_hosts_usage", "dbm_queries_usage", "estimated_indexed_logs_usage", "estimated_ingested_logs_usage", "estimated_indexed_spans_usage", "estimated_ingested_spans_usage", "fargate_usage", "functions_usage", "infra_host_usage", "invocations_usage", "npm_host_usage", "profiled_container_usage", "profiled_fargate_usage", "profiled_host_usage", "snmp_usage", "estimated_rum_sessions_usage", "universal_service_monitoring_usage"].
+    :param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "container_excl_agent_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_ingested_timeseries_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_hosts_usage", "dbm_hosts_usage", "dbm_queries_usage", "estimated_indexed_logs_usage", "estimated_ingested_logs_usage", "estimated_indexed_spans_usage", "estimated_ingested_spans_usage", "fargate_usage", "functions_usage", "infra_host_usage", "invocations_usage", "npm_host_usage", "profiled_container_usage", "profiled_fargate_usage", "profiled_host_usage", "snmp_usage", "estimated_rum_sessions_usage", "universal_service_monitoring_usage", "vuln_management_hosts_usage"].
     :type value: str
     """
 
@@ -52,6 +52,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
         "snmp_usage",
         "estimated_rum_sessions_usage",
         "universal_service_monitoring_usage",
+        "vuln_management_hosts_usage",
     }
     API_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     APM_FARGATE_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
@@ -84,6 +85,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
     SNMP_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     UNIVERSAL_SERVICE_MONITORING_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
+    VULN_MANAGEMENT_HOSTS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
 
     @cached_property
     def openapi_types(_):
@@ -139,3 +141,6 @@ def openapi_types(_):
 HourlyUsageAttributionUsageType.UNIVERSAL_SERVICE_MONITORING_USAGE = HourlyUsageAttributionUsageType(
     "universal_service_monitoring_usage"
 )
+HourlyUsageAttributionUsageType.VULN_MANAGEMENT_HOSTS_USAGE = HourlyUsageAttributionUsageType(
+    "vuln_management_hosts_usage"
+)

src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py

@@ -16,7 +16,7 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
     """
     Supported metrics for monthly usage attribution requests.
 
-    :param value: Must be one of ["api_usage", "api_percentage", "apm_fargate_usage", "apm_fargate_percentage", "appsec_fargate_usage", "appsec_fargate_percentage", "apm_host_usage", "apm_host_percentage", "appsec_usage", "appsec_percentage", "browser_usage", "browser_percentage", "container_excl_agent_usage", "container_excl_agent_percentage", "container_usage", "container_percentage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_timeseries_usage", "custom_timeseries_percentage", "custom_ingested_timeseries_usage", "custom_ingested_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_ingested_logs_usage", "estimated_ingested_logs_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "fargate_usage", "fargate_percentage", "functions_usage", "functions_percentage", "infra_host_usage", "infra_host_percentage", "invocations_usage", "invocations_percentage", "npm_host_usage", "npm_host_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_fargate_usage", "profiled_fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "snmp_usage", "snmp_percentage", "estimated_rum_sessions_usage", "estimated_rum_sessions_percentage", "universal_service_monitoring_usage", "universal_service_monitoring_percentage", "*"].
+    :param value: Must be one of ["api_usage", "api_percentage", "apm_fargate_usage", "apm_fargate_percentage", "appsec_fargate_usage", "appsec_fargate_percentage", "apm_host_usage", "apm_host_percentage", "appsec_usage", "appsec_percentage", "browser_usage", "browser_percentage", "container_excl_agent_usage", "container_excl_agent_percentage", "container_usage", "container_percentage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_timeseries_usage", "custom_timeseries_percentage", "custom_ingested_timeseries_usage", "custom_ingested_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_ingested_logs_usage", "estimated_ingested_logs_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "fargate_usage", "fargate_percentage", "functions_usage", "functions_percentage", "infra_host_usage", "infra_host_percentage", "invocations_usage", "invocations_percentage", "npm_host_usage", "npm_host_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_fargate_usage", "profiled_fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "snmp_usage", "snmp_percentage", "estimated_rum_sessions_usage", "estimated_rum_sessions_percentage", "universal_service_monitoring_usage", "universal_service_monitoring_percentage", "vuln_management_hosts_usage", "vuln_management_hosts_percentage", "*"].
     :type value: str
     """
 
@@ -83,6 +83,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
         "estimated_rum_sessions_percentage",
         "universal_service_monitoring_usage",
         "universal_service_monitoring_percentage",
+        "vuln_management_hosts_usage",
+        "vuln_management_hosts_percentage",
         "*",
     }
     API_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -147,6 +149,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
     ESTIMATED_RUM_SESSIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     UNIVERSAL_SERVICE_MONITORING_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     UNIVERSAL_SERVICE_MONITORING_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
+    VULN_MANAGEMENT_HOSTS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
+    VULN_MANAGEMENT_HOSTS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     ALL: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
 
     @cached_property
@@ -304,4 +308,10 @@ def openapi_types(_):
 MonthlyUsageAttributionSupportedMetrics.UNIVERSAL_SERVICE_MONITORING_PERCENTAGE = (
     MonthlyUsageAttributionSupportedMetrics("universal_service_monitoring_percentage")
 )
+MonthlyUsageAttributionSupportedMetrics.VULN_MANAGEMENT_HOSTS_USAGE = MonthlyUsageAttributionSupportedMetrics(
+    "vuln_management_hosts_usage"
+)
+MonthlyUsageAttributionSupportedMetrics.VULN_MANAGEMENT_HOSTS_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
+    "vuln_management_hosts_percentage"
+)
 MonthlyUsageAttributionSupportedMetrics.ALL = MonthlyUsageAttributionSupportedMetrics("*")

src/datadog_api_client/v1/model/monthly_usage_attribution_values.py

@@ -79,6 +79,8 @@ def openapi_types(_):
             "snmp_usage": (float,),
             "universal_service_monitoring_percentage": (float,),
             "universal_service_monitoring_usage": (float,),
+            "vuln_management_hosts_percentage": (float,),
+            "vuln_management_hosts_usage": (float,),
         }
 
     attribute_map = {
@@ -144,6 +146,8 @@ def openapi_types(_):
         "snmp_usage": "snmp_usage",
         "universal_service_monitoring_percentage": "universal_service_monitoring_percentage",
         "universal_service_monitoring_usage": "universal_service_monitoring_usage",
+        "vuln_management_hosts_percentage": "vuln_management_hosts_percentage",
+        "vuln_management_hosts_usage": "vuln_management_hosts_usage",
     }
 
     def __init__(
@@ -210,6 +214,8 @@ def __init__(
         snmp_usage: Union[float, UnsetType] = unset,
         universal_service_monitoring_percentage: Union[float, UnsetType] = unset,
         universal_service_monitoring_usage: Union[float, UnsetType] = unset,
+        vuln_management_hosts_percentage: Union[float, UnsetType] = unset,
+        vuln_management_hosts_usage: Union[float, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -400,6 +406,12 @@ def __init__(
 
         :param universal_service_monitoring_usage: The universal service monitoring usage by tag(s).
         :type universal_service_monitoring_usage: float, optional
+
+        :param vuln_management_hosts_percentage: The percentage of Application Vulnerability Management usage by tag(s).
+        :type vuln_management_hosts_percentage: float, optional
+
+        :param vuln_management_hosts_usage: The Application Vulnerability Management usage by tag(s).
+        :type vuln_management_hosts_usage: float, optional
         """
         if api_percentage is not unset:
             kwargs["api_percentage"] = api_percentage
@@ -525,4 +537,8 @@ def __init__(
             kwargs["universal_service_monitoring_percentage"] = universal_service_monitoring_percentage
         if universal_service_monitoring_usage is not unset:
             kwargs["universal_service_monitoring_usage"] = universal_service_monitoring_usage
+        if vuln_management_hosts_percentage is not unset:
+            kwargs["vuln_management_hosts_percentage"] = vuln_management_hosts_percentage
+        if vuln_management_hosts_usage is not unset:
+            kwargs["vuln_management_hosts_usage"] = vuln_management_hosts_usage
         super().__init__(kwargs)

src/datadog_api_client/v1/model/usage_summary_date.py

@@ -103,6 +103,7 @@ def openapi_types(_):
             "twol_ingested_events_bytes_sum": (int,),
             "universal_service_monitoring_host_top99p": (int,),
             "vsphere_host_top99p": (int,),
+            "vuln_management_host_count_top99p": (int,),
         }
 
     attribute_map = {
@@ -185,6 +186,7 @@ def openapi_types(_):
         "twol_ingested_events_bytes_sum": "twol_ingested_events_bytes_sum",
         "universal_service_monitoring_host_top99p": "universal_service_monitoring_host_top99p",
         "vsphere_host_top99p": "vsphere_host_top99p",
+        "vuln_management_host_count_top99p": "vuln_management_host_count_top99p",
     }
 
     def __init__(
@@ -268,6 +270,7 @@ def __init__(
         twol_ingested_events_bytes_sum: Union[int, UnsetType] = unset,
         universal_service_monitoring_host_top99p: Union[int, UnsetType] = unset,
         vsphere_host_top99p: Union[int, UnsetType] = unset,
+        vuln_management_host_count_top99p: Union[int, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -509,6 +512,9 @@ def __init__(
 
         :param vsphere_host_top99p: Shows the 99th percentile of all vSphere hosts over all hours in the current date for all organizations.
         :type vsphere_host_top99p: int, optional
+
+        :param vuln_management_host_count_top99p: Shows the 99th percentile of all Application Vulnerability Management hosts over all hours in the current date for the given org.
+        :type vuln_management_host_count_top99p: int, optional
         """
         if agent_host_top99p is not unset:
             kwargs["agent_host_top99p"] = agent_host_top99p
@@ -668,4 +674,6 @@ def __init__(
             kwargs["universal_service_monitoring_host_top99p"] = universal_service_monitoring_host_top99p
         if vsphere_host_top99p is not unset:
             kwargs["vsphere_host_top99p"] = vsphere_host_top99p
+        if vuln_management_host_count_top99p is not unset:
+            kwargs["vuln_management_host_count_top99p"] = vuln_management_host_count_top99p
         super().__init__(kwargs)

src/datadog_api_client/v1/model/usage_summary_date_org.py

@@ -98,6 +98,7 @@ def openapi_types(_):
             "twol_ingested_events_bytes_sum": (int,),
             "universal_service_monitoring_host_top99p": (int,),
             "vsphere_host_top99p": (int,),
+            "vuln_management_host_count_top99p": (int,),
         }
 
     attribute_map = {
@@ -182,6 +183,7 @@ def openapi_types(_):
         "twol_ingested_events_bytes_sum": "twol_ingested_events_bytes_sum",
         "universal_service_monitoring_host_top99p": "universal_service_monitoring_host_top99p",
         "vsphere_host_top99p": "vsphere_host_top99p",
+        "vuln_management_host_count_top99p": "vuln_management_host_count_top99p",
     }
 
     def __init__(
@@ -267,6 +269,7 @@ def __init__(
         twol_ingested_events_bytes_sum: Union[int, UnsetType] = unset,
         universal_service_monitoring_host_top99p: Union[int, UnsetType] = unset,
         vsphere_host_top99p: Union[int, UnsetType] = unset,
+        vuln_management_host_count_top99p: Union[int, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -514,6 +517,9 @@ def __init__(
 
         :param vsphere_host_top99p: Shows the 99th percentile of all vSphere hosts over all hours in the current date for the given org.
         :type vsphere_host_top99p: int, optional
+
+        :param vuln_management_host_count_top99p: Shows the 99th percentile of all Application Vulnerability Management hosts over all hours in the current date for the given org.
+        :type vuln_management_host_count_top99p: int, optional
         """
         if agent_host_top99p is not unset:
             kwargs["agent_host_top99p"] = agent_host_top99p
@@ -677,4 +683,6 @@ def __init__(
             kwargs["universal_service_monitoring_host_top99p"] = universal_service_monitoring_host_top99p
         if vsphere_host_top99p is not unset:
             kwargs["vsphere_host_top99p"] = vsphere_host_top99p
+        if vuln_management_host_count_top99p is not unset:
+            kwargs["vuln_management_host_count_top99p"] = vuln_management_host_count_top99p
         super().__init__(kwargs)