Publish the new ingested timeseries metrics for usage attribution (#1365)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-03-24 15:23:44.382927",
-            "spec_repo_commit": "cdf4007e"
+            "regenerated": "2023-03-24 16:41:58.517780",
+            "spec_repo_commit": "9bdb5ee6"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-03-24 15:23:44.399386",
-            "spec_repo_commit": "cdf4007e"
+            "regenerated": "2023-03-24 16:41:58.529517",
+            "spec_repo_commit": "9bdb5ee6"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3655,6 +3655,7 @@ components:
       - container_usage
       - cspm_containers_usage
       - cspm_hosts_usage
+      - custom_ingested_timeseries_usage
       - custom_timeseries_usage
       - cws_containers_usage
       - cws_hosts_usage
@@ -3686,6 +3687,7 @@ components:
       - CONTAINER_USAGE
       - CSPM_CONTAINERS_USAGE
       - CSPM_HOSTS_USAGE
+      - CUSTOM_INGESTED_TIMESERIES_USAGE
       - CUSTOM_TIMESERIES_USAGE
       - CWS_CONTAINERS_USAGE
       - CWS_HOSTS_USAGE
@@ -7123,6 +7125,8 @@ components:
       - 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
@@ -7184,6 +7188,8 @@ components:
       - 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
@@ -7308,12 +7314,20 @@ components:
           description: The CSPM host usage by tag(s).
           format: double
           type: number
+        custom_ingested_timeseries_percentage:
+          description: The percentage of ingested custom metrics usage by tag(s).
+          format: double
+          type: number
+        custom_ingested_timeseries_usage:
+          description: The ingested custom metrics usage by tag(s).
+          format: double
+          type: number
         custom_timeseries_percentage:
-          description: The percentage of custom metrics usage by tag(s).
+          description: The percentage of indexed custom metrics usage by tag(s).
           format: double
           type: number
         custom_timeseries_usage:
-          description: The custom metrics usage by tag(s).
+          description: The indexed custom metrics usage by tag(s).
           format: double
           type: number
         cws_containers_percentage:

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_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"].
     :type value: str
     """
 
@@ -31,6 +31,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
         "container_usage",
         "cspm_containers_usage",
         "cspm_hosts_usage",
+        "custom_ingested_timeseries_usage",
         "custom_timeseries_usage",
         "cws_containers_usage",
         "cws_hosts_usage",
@@ -61,6 +62,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
     CONTAINER_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     CSPM_CONTAINERS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     CSPM_HOSTS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
+    CUSTOM_INGESTED_TIMESERIES_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     CUSTOM_TIMESERIES_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     CWS_CONTAINERS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
     CWS_HOSTS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
@@ -100,6 +102,9 @@ def openapi_types(_):
 HourlyUsageAttributionUsageType.CONTAINER_USAGE = HourlyUsageAttributionUsageType("container_usage")
 HourlyUsageAttributionUsageType.CSPM_CONTAINERS_USAGE = HourlyUsageAttributionUsageType("cspm_containers_usage")
 HourlyUsageAttributionUsageType.CSPM_HOSTS_USAGE = HourlyUsageAttributionUsageType("cspm_hosts_usage")
+HourlyUsageAttributionUsageType.CUSTOM_INGESTED_TIMESERIES_USAGE = HourlyUsageAttributionUsageType(
+    "custom_ingested_timeseries_usage"
+)
 HourlyUsageAttributionUsageType.CUSTOM_TIMESERIES_USAGE = HourlyUsageAttributionUsageType("custom_timeseries_usage")
 HourlyUsageAttributionUsageType.CWS_CONTAINERS_USAGE = HourlyUsageAttributionUsageType("cws_containers_usage")
 HourlyUsageAttributionUsageType.CWS_HOSTS_USAGE = HourlyUsageAttributionUsageType("cws_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", "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", "*"].
     :type value: str
     """
 
@@ -43,6 +43,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
         "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",
@@ -103,6 +105,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
     CSPM_HOSTS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     CUSTOM_TIMESERIES_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     CUSTOM_TIMESERIES_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
+    CUSTOM_INGESTED_TIMESERIES_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
+    CUSTOM_INGESTED_TIMESERIES_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     CWS_CONTAINERS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     CWS_CONTAINERS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
     CWS_HOSTS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -196,6 +200,12 @@ def openapi_types(_):
 MonthlyUsageAttributionSupportedMetrics.CUSTOM_TIMESERIES_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
     "custom_timeseries_percentage"
 )
+MonthlyUsageAttributionSupportedMetrics.CUSTOM_INGESTED_TIMESERIES_USAGE = MonthlyUsageAttributionSupportedMetrics(
+    "custom_ingested_timeseries_usage"
+)
+MonthlyUsageAttributionSupportedMetrics.CUSTOM_INGESTED_TIMESERIES_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
+    "custom_ingested_timeseries_percentage"
+)
 MonthlyUsageAttributionSupportedMetrics.CWS_CONTAINERS_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
     "cws_containers_percentage"
 )

src/datadog_api_client/v1/model/monthly_usage_attribution_values.py

@@ -37,6 +37,8 @@ def openapi_types(_):
             "cspm_containers_usage": (float,),
             "cspm_hosts_percentage": (float,),
             "cspm_hosts_usage": (float,),
+            "custom_ingested_timeseries_percentage": (float,),
+            "custom_ingested_timeseries_usage": (float,),
             "custom_timeseries_percentage": (float,),
             "custom_timeseries_usage": (float,),
             "cws_containers_percentage": (float,),
@@ -98,6 +100,8 @@ def openapi_types(_):
         "cspm_containers_usage": "cspm_containers_usage",
         "cspm_hosts_percentage": "cspm_hosts_percentage",
         "cspm_hosts_usage": "cspm_hosts_usage",
+        "custom_ingested_timeseries_percentage": "custom_ingested_timeseries_percentage",
+        "custom_ingested_timeseries_usage": "custom_ingested_timeseries_usage",
         "custom_timeseries_percentage": "custom_timeseries_percentage",
         "custom_timeseries_usage": "custom_timeseries_usage",
         "cws_containers_percentage": "cws_containers_percentage",
@@ -160,6 +164,8 @@ def __init__(
         cspm_containers_usage: Union[float, UnsetType] = unset,
         cspm_hosts_percentage: Union[float, UnsetType] = unset,
         cspm_hosts_usage: Union[float, UnsetType] = unset,
+        custom_ingested_timeseries_percentage: Union[float, UnsetType] = unset,
+        custom_ingested_timeseries_usage: Union[float, UnsetType] = unset,
         custom_timeseries_percentage: Union[float, UnsetType] = unset,
         custom_timeseries_usage: Union[float, UnsetType] = unset,
         cws_containers_percentage: Union[float, UnsetType] = unset,
@@ -263,10 +269,16 @@ def __init__(
         :param cspm_hosts_usage: The CSPM host usage by tag(s).
         :type cspm_hosts_usage: float, optional
 
-        :param custom_timeseries_percentage: The percentage of custom metrics usage by tag(s).
+        :param custom_ingested_timeseries_percentage: The percentage of ingested custom metrics usage by tag(s).
+        :type custom_ingested_timeseries_percentage: float, optional
+
+        :param custom_ingested_timeseries_usage: The ingested custom metrics usage by tag(s).
+        :type custom_ingested_timeseries_usage: float, optional
+
+        :param custom_timeseries_percentage: The percentage of indexed custom metrics usage by tag(s).
         :type custom_timeseries_percentage: float, optional
 
-        :param custom_timeseries_usage: The custom metrics usage by tag(s).
+        :param custom_timeseries_usage: The indexed custom metrics usage by tag(s).
         :type custom_timeseries_usage: float, optional
 
         :param cws_containers_percentage: The percentage of Cloud Workload Security container usage by tag(s).
@@ -417,6 +429,10 @@ def __init__(
             kwargs["cspm_hosts_percentage"] = cspm_hosts_percentage
         if cspm_hosts_usage is not unset:
             kwargs["cspm_hosts_usage"] = cspm_hosts_usage
+        if custom_ingested_timeseries_percentage is not unset:
+            kwargs["custom_ingested_timeseries_percentage"] = custom_ingested_timeseries_percentage
+        if custom_ingested_timeseries_usage is not unset:
+            kwargs["custom_ingested_timeseries_usage"] = custom_ingested_timeseries_usage
         if custom_timeseries_percentage is not unset:
             kwargs["custom_timeseries_percentage"] = custom_timeseries_percentage
         if custom_timeseries_usage is not unset: