Add universal service monitoring to usage metering API

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-03 12:03:45.132850",
-            "spec_repo_commit": "1cb4b144"
+            "regenerated": "2023-04-04 17:50:52.788705",
+            "spec_repo_commit": "9a7b22d0"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-03 12:03:45.145226",
-            "spec_repo_commit": "1cb4b144"
+            "regenerated": "2023-04-04 17:50:52.800936",
+            "spec_repo_commit": "9a7b22d0"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3683,6 +3683,7 @@ components:
       - profiled_host_usage
       - snmp_usage
       - estimated_rum_sessions_usage
+      - universal_service_monitoring_usage
       type: string
       x-enum-varnames:
       - API_USAGE
@@ -3715,6 +3716,7 @@ components:
       - PROFILED_HOST_USAGE
       - SNMP_USAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
+      - UNIVERSAL_SERVICE_MONITORING_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.
@@ -7171,6 +7173,8 @@ components:
       - snmp_percentage
       - estimated_rum_sessions_usage
       - estimated_rum_sessions_percentage
+      - universal_service_monitoring_usage
+      - universal_service_monitoring_percentage
       - '*'
       type: string
       x-enum-varnames:
@@ -7234,6 +7238,8 @@ components:
       - SNMP_PERCENTAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
       - ESTIMATED_RUM_SESSIONS_PERCENTAGE
+      - UNIVERSAL_SERVICE_MONITORING_USAGE
+      - UNIVERSAL_SERVICE_MONITORING_PERCENTAGE
       - ALL
     MonthlyUsageAttributionValues:
       description: Fields in Usage Summary by tag(s).
@@ -7483,6 +7489,14 @@ components:
           description: The network device usage by tag(s).
           format: double
           type: number
+        universal_service_monitoring_percentage:
+          description: The percentage of universal service monitoring usage by tag(s).
+          format: double
+          type: number
+        universal_service_monitoring_usage:
+          description: The universal service monitoring usage by tag(s).
+          format: double
+          type: number
       type: object
     NoteWidgetDefinition:
       description: The notes and links widget is similar to free text widget, but
@@ -17087,6 +17101,11 @@ components:
             in the current date for all organizations.
           format: int64
           type: integer
+        universal_service_monitoring_host_top99p:
+          description: Shows the 99th percentile of all universal service management
+            hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
         vsphere_host_top99p:
           description: Shows the 99th percentile of all vSphere hosts over all hours
             in the current date for all organizations.
@@ -17481,6 +17500,11 @@ components:
             in the current date for the given org.
           format: int64
           type: integer
+        universal_service_monitoring_host_top99p:
+          description: Shows the 99th percentile of all Universal Service Monitoring
+            hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
         vsphere_host_top99p:
           description: Shows the 99th percentile of all vSphere hosts over all hours
             in the current date for the given org.
@@ -17916,6 +17940,11 @@ components:
             in the current months for all organizations.
           format: int64
           type: integer
+        universal_service_monitoring_host_top99p_sum:
+          description: Shows the 99th percentile of all Universal Service Monitoring
+            hosts over all hours in the current months for all organizations.
+          format: int64
+          type: integer
         usage:
           description: An array of objects regarding hourly usage.
           items:

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"].
+    :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"].
     :type value: str
     """
 
@@ -51,6 +51,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
         "profiled_host_usage",
         "snmp_usage",
         "estimated_rum_sessions_usage",
+        "universal_service_monitoring_usage",
     }
     API_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     APM_FARGATE_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
@@ -82,6 +83,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
     PROFILED_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     SNMP_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
+    UNIVERSAL_SERVICE_MONITORING_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
 
     @cached_property
     def openapi_types(_):
@@ -134,3 +136,6 @@ def openapi_types(_):
 HourlyUsageAttributionUsageType.ESTIMATED_RUM_SESSIONS_USAGE = HourlyUsageAttributionUsageType(
     "estimated_rum_sessions_usage"
 )
+HourlyUsageAttributionUsageType.UNIVERSAL_SERVICE_MONITORING_USAGE = HourlyUsageAttributionUsageType(
+    "universal_service_monitoring_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", "*"].
+    :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", "*"].
     :type value: str
     """
 
@@ -81,6 +81,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
         "snmp_percentage",
         "estimated_rum_sessions_usage",
         "estimated_rum_sessions_percentage",
+        "universal_service_monitoring_usage",
+        "universal_service_monitoring_percentage",
         "*",
     }
     API_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -143,6 +145,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
     SNMP_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     ESTIMATED_RUM_SESSIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
+    UNIVERSAL_SERVICE_MONITORING_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
+    UNIVERSAL_SERVICE_MONITORING_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     ALL: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
 
     @cached_property
@@ -294,4 +298,10 @@ def openapi_types(_):
 MonthlyUsageAttributionSupportedMetrics.ESTIMATED_RUM_SESSIONS_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
     "estimated_rum_sessions_percentage"
 )
+MonthlyUsageAttributionSupportedMetrics.UNIVERSAL_SERVICE_MONITORING_USAGE = MonthlyUsageAttributionSupportedMetrics(
+    "universal_service_monitoring_usage"
+)
+MonthlyUsageAttributionSupportedMetrics.UNIVERSAL_SERVICE_MONITORING_PERCENTAGE = (
+    MonthlyUsageAttributionSupportedMetrics("universal_service_monitoring_percentage")
+)
 MonthlyUsageAttributionSupportedMetrics.ALL = MonthlyUsageAttributionSupportedMetrics("*")

src/datadog_api_client/v1/model/monthly_usage_attribution_values.py

@@ -77,6 +77,8 @@ def openapi_types(_):
             "profiled_host_usage": (float,),
             "snmp_percentage": (float,),
             "snmp_usage": (float,),
+            "universal_service_monitoring_percentage": (float,),
+            "universal_service_monitoring_usage": (float,),
         }
 
     attribute_map = {
@@ -140,6 +142,8 @@ def openapi_types(_):
         "profiled_host_usage": "profiled_host_usage",
         "snmp_percentage": "snmp_percentage",
         "snmp_usage": "snmp_usage",
+        "universal_service_monitoring_percentage": "universal_service_monitoring_percentage",
+        "universal_service_monitoring_usage": "universal_service_monitoring_usage",
     }
 
     def __init__(
@@ -204,6 +208,8 @@ def __init__(
         profiled_host_usage: Union[float, UnsetType] = unset,
         snmp_percentage: Union[float, UnsetType] = unset,
         snmp_usage: Union[float, UnsetType] = unset,
+        universal_service_monitoring_percentage: Union[float, UnsetType] = unset,
+        universal_service_monitoring_usage: Union[float, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -388,6 +394,12 @@ def __init__(
 
         :param snmp_usage: The network device usage by tag(s).
         :type snmp_usage: float, optional
+
+        :param universal_service_monitoring_percentage: The percentage of universal service monitoring usage by tag(s).
+        :type universal_service_monitoring_percentage: float, optional
+
+        :param universal_service_monitoring_usage: The universal service monitoring usage by tag(s).
+        :type universal_service_monitoring_usage: float, optional
         """
         if api_percentage is not unset:
             kwargs["api_percentage"] = api_percentage
@@ -509,4 +521,8 @@ def __init__(
             kwargs["snmp_percentage"] = snmp_percentage
         if snmp_usage is not unset:
             kwargs["snmp_usage"] = snmp_usage
+        if universal_service_monitoring_percentage is not unset:
+            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
         super().__init__(kwargs)

src/datadog_api_client/v1/model/usage_summary_date.py

@@ -100,6 +100,7 @@ def openapi_types(_):
             "synthetics_parallel_testing_max_slots_hwm": (int,),
             "trace_search_indexed_events_count_sum": (int,),
             "twol_ingested_events_bytes_sum": (int,),
+            "universal_service_monitoring_host_top99p": (int,),
             "vsphere_host_top99p": (int,),
         }
 
@@ -180,6 +181,7 @@ def openapi_types(_):
         "synthetics_parallel_testing_max_slots_hwm": "synthetics_parallel_testing_max_slots_hwm",
         "trace_search_indexed_events_count_sum": "trace_search_indexed_events_count_sum",
         "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",
     }
 
@@ -261,6 +263,7 @@ def __init__(
         synthetics_parallel_testing_max_slots_hwm: Union[int, UnsetType] = unset,
         trace_search_indexed_events_count_sum: Union[int, UnsetType] = unset,
         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,
         **kwargs,
     ):
@@ -495,6 +498,9 @@ def __init__(
         :param twol_ingested_events_bytes_sum: Shows the sum of all ingested APM span bytes over all hours in the current date for all organizations.
         :type twol_ingested_events_bytes_sum: int, optional
 
+        :param universal_service_monitoring_host_top99p: Shows the 99th percentile of all universal service management hosts over all hours in the current date for the given org.
+        :type universal_service_monitoring_host_top99p: int, optional
+
         :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
         """
@@ -650,6 +656,8 @@ def __init__(
             kwargs["trace_search_indexed_events_count_sum"] = trace_search_indexed_events_count_sum
         if twol_ingested_events_bytes_sum is not unset:
             kwargs["twol_ingested_events_bytes_sum"] = twol_ingested_events_bytes_sum
+        if universal_service_monitoring_host_top99p is not unset:
+            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
         super().__init__(kwargs)

src/datadog_api_client/v1/model/usage_summary_date_org.py

@@ -95,6 +95,7 @@ def openapi_types(_):
             "synthetics_parallel_testing_max_slots_hwm": (int,),
             "trace_search_indexed_events_count_sum": (int,),
             "twol_ingested_events_bytes_sum": (int,),
+            "universal_service_monitoring_host_top99p": (int,),
             "vsphere_host_top99p": (int,),
         }
 
@@ -177,6 +178,7 @@ def openapi_types(_):
         "synthetics_parallel_testing_max_slots_hwm": "synthetics_parallel_testing_max_slots_hwm",
         "trace_search_indexed_events_count_sum": "trace_search_indexed_events_count_sum",
         "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",
     }
 
@@ -260,6 +262,7 @@ def __init__(
         synthetics_parallel_testing_max_slots_hwm: Union[int, UnsetType] = unset,
         trace_search_indexed_events_count_sum: Union[int, UnsetType] = unset,
         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,
         **kwargs,
     ):
@@ -500,6 +503,9 @@ def __init__(
         :param twol_ingested_events_bytes_sum: Shows the sum of all ingested APM span bytes over all hours in the current date for the given org.
         :type twol_ingested_events_bytes_sum: int, optional
 
+        :param universal_service_monitoring_host_top99p: Shows the 99th percentile of all Universal Service Monitoring hosts over all hours in the current date for the given org.
+        :type universal_service_monitoring_host_top99p: int, optional
+
         :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
         """
@@ -659,6 +665,8 @@ def __init__(
             kwargs["trace_search_indexed_events_count_sum"] = trace_search_indexed_events_count_sum
         if twol_ingested_events_bytes_sum is not unset:
             kwargs["twol_ingested_events_bytes_sum"] = twol_ingested_events_bytes_sum
+        if universal_service_monitoring_host_top99p is not unset:
+            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
         super().__init__(kwargs)