Add usage metering fields for AWS and Azure cloud cost management (#1524)

Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>

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

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-06-13 15:21:28.416210",
-            "spec_repo_commit": "a19e81fb"
+            "regenerated": "2023-06-13 18:21:46.823025",
+            "spec_repo_commit": "28c27b69"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-06-13 15:21:28.432206",
-            "spec_repo_commit": "a19e81fb"
+            "regenerated": "2023-06-13 18:21:46.835511",
+            "spec_repo_commit": "28c27b69"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -17488,9 +17488,19 @@ components:
             over all hours in the current month for all organizations.
           format: int64
           type: integer
+        cloud_cost_management_aws_host_count_avg:
+          description: Host count average of Cloud Cost Management for AWS for the
+            given date and given organization.
+          format: int64
+          type: integer
+        cloud_cost_management_azure_host_count_avg:
+          description: Host count average of Cloud Cost Management for Azure for the
+            given date and given organization.
+          format: int64
+          type: integer
         cloud_cost_management_host_count_avg:
-          description: Host count average of Cloud Cost Management for the given date
-            and given organization.
+          description: Host count average of Cloud Cost Management for all cloud providers
+            for the given date and given organization.
           format: int64
           type: integer
         container_avg:
@@ -17900,9 +17910,19 @@ components:
             over all hours in the current date for the given org.
           format: int64
           type: integer
+        cloud_cost_management_aws_host_count_avg:
+          description: Host count average of Cloud Cost Management for AWS for the
+            given date and given org.
+          format: int64
+          type: integer
+        cloud_cost_management_azure_host_count_avg:
+          description: Host count average of Cloud Cost Management for Azure for the
+            given date and given org.
+          format: int64
+          type: integer
         cloud_cost_management_host_count_avg:
-          description: Host count average of Cloud Cost Management for the given date
-            and given org.
+          description: Host count average of Cloud Cost Management for all cloud providers
+            for the given date and given org.
           format: int64
           type: integer
         container_avg:
@@ -18321,8 +18341,19 @@ components:
             over all hours in the current months for all organizations.
           format: int64
           type: integer
+        cloud_cost_management_aws_host_count_avg_sum:
+          description: Sum of the host count average for Cloud Cost Management for
+            AWS.
+          format: int64
+          type: integer
+        cloud_cost_management_azure_host_count_avg_sum:
+          description: Sum of the host count average for Cloud Cost Management for
+            Azure.
+          format: int64
+          type: integer
         cloud_cost_management_host_count_avg_sum:
-          description: Sum of the host count average for Cloud Cost Management.
+          description: Sum of the host count average for Cloud Cost Management for
+            all cloud providers.
           format: int64
           type: integer
         container_avg_sum:

src/datadog_api_client/v1/model/usage_summary_date.py

@@ -44,6 +44,8 @@ def openapi_types(_):
             "ci_test_indexed_spans_sum": (int,),
             "ci_visibility_pipeline_committers_hwm": (int,),
             "ci_visibility_test_committers_hwm": (int,),
+            "cloud_cost_management_aws_host_count_avg": (int,),
+            "cloud_cost_management_azure_host_count_avg": (int,),
             "cloud_cost_management_host_count_avg": (int,),
             "container_avg": (int,),
             "container_excl_agent_avg": (int,),
@@ -128,6 +130,8 @@ def openapi_types(_):
         "ci_test_indexed_spans_sum": "ci_test_indexed_spans_sum",
         "ci_visibility_pipeline_committers_hwm": "ci_visibility_pipeline_committers_hwm",
         "ci_visibility_test_committers_hwm": "ci_visibility_test_committers_hwm",
+        "cloud_cost_management_aws_host_count_avg": "cloud_cost_management_aws_host_count_avg",
+        "cloud_cost_management_azure_host_count_avg": "cloud_cost_management_azure_host_count_avg",
         "cloud_cost_management_host_count_avg": "cloud_cost_management_host_count_avg",
         "container_avg": "container_avg",
         "container_excl_agent_avg": "container_excl_agent_avg",
@@ -213,6 +217,8 @@ def __init__(
         ci_test_indexed_spans_sum: Union[int, UnsetType] = unset,
         ci_visibility_pipeline_committers_hwm: Union[int, UnsetType] = unset,
         ci_visibility_test_committers_hwm: Union[int, UnsetType] = unset,
+        cloud_cost_management_aws_host_count_avg: Union[int, UnsetType] = unset,
+        cloud_cost_management_azure_host_count_avg: Union[int, UnsetType] = unset,
         cloud_cost_management_host_count_avg: Union[int, UnsetType] = unset,
         container_avg: Union[int, UnsetType] = unset,
         container_excl_agent_avg: Union[int, UnsetType] = unset,
@@ -339,7 +345,13 @@ def __init__(
         :param ci_visibility_test_committers_hwm: Shows the high-water mark of all CI visibility test committers over all hours in the current month for all organizations.
         :type ci_visibility_test_committers_hwm: int, optional
 
-        :param cloud_cost_management_host_count_avg: Host count average of Cloud Cost Management for the given date and given organization.
+        :param cloud_cost_management_aws_host_count_avg: Host count average of Cloud Cost Management for AWS for the given date and given organization.
+        :type cloud_cost_management_aws_host_count_avg: int, optional
+
+        :param cloud_cost_management_azure_host_count_avg: Host count average of Cloud Cost Management for Azure for the given date and given organization.
+        :type cloud_cost_management_azure_host_count_avg: int, optional
+
+        :param cloud_cost_management_host_count_avg: Host count average of Cloud Cost Management for all cloud providers for the given date and given organization.
         :type cloud_cost_management_host_count_avg: int, optional
 
         :param container_avg: Shows the average of all distinct containers over all hours in the current date for all organizations.
@@ -562,6 +574,10 @@ def __init__(
             kwargs["ci_visibility_pipeline_committers_hwm"] = ci_visibility_pipeline_committers_hwm
         if ci_visibility_test_committers_hwm is not unset:
             kwargs["ci_visibility_test_committers_hwm"] = ci_visibility_test_committers_hwm
+        if cloud_cost_management_aws_host_count_avg is not unset:
+            kwargs["cloud_cost_management_aws_host_count_avg"] = cloud_cost_management_aws_host_count_avg
+        if cloud_cost_management_azure_host_count_avg is not unset:
+            kwargs["cloud_cost_management_azure_host_count_avg"] = cloud_cost_management_azure_host_count_avg
         if cloud_cost_management_host_count_avg is not unset:
             kwargs["cloud_cost_management_host_count_avg"] = cloud_cost_management_host_count_avg
         if container_avg is not unset:

src/datadog_api_client/v1/model/usage_summary_date_org.py

@@ -37,6 +37,8 @@ def openapi_types(_):
             "ci_test_indexed_spans_sum": (int,),
             "ci_visibility_pipeline_committers_hwm": (int,),
             "ci_visibility_test_committers_hwm": (int,),
+            "cloud_cost_management_aws_host_count_avg": (int,),
+            "cloud_cost_management_azure_host_count_avg": (int,),
             "cloud_cost_management_host_count_avg": (int,),
             "container_avg": (int,),
             "container_excl_agent_avg": (int,),
@@ -123,6 +125,8 @@ def openapi_types(_):
         "ci_test_indexed_spans_sum": "ci_test_indexed_spans_sum",
         "ci_visibility_pipeline_committers_hwm": "ci_visibility_pipeline_committers_hwm",
         "ci_visibility_test_committers_hwm": "ci_visibility_test_committers_hwm",
+        "cloud_cost_management_aws_host_count_avg": "cloud_cost_management_aws_host_count_avg",
+        "cloud_cost_management_azure_host_count_avg": "cloud_cost_management_azure_host_count_avg",
         "cloud_cost_management_host_count_avg": "cloud_cost_management_host_count_avg",
         "container_avg": "container_avg",
         "container_excl_agent_avg": "container_excl_agent_avg",
@@ -210,6 +214,8 @@ def __init__(
         ci_test_indexed_spans_sum: Union[int, UnsetType] = unset,
         ci_visibility_pipeline_committers_hwm: Union[int, UnsetType] = unset,
         ci_visibility_test_committers_hwm: Union[int, UnsetType] = unset,
+        cloud_cost_management_aws_host_count_avg: Union[int, UnsetType] = unset,
+        cloud_cost_management_azure_host_count_avg: Union[int, UnsetType] = unset,
         cloud_cost_management_host_count_avg: Union[int, UnsetType] = unset,
         container_avg: Union[int, UnsetType] = unset,
         container_excl_agent_avg: Union[int, UnsetType] = unset,
@@ -338,7 +344,13 @@ def __init__(
         :param ci_visibility_test_committers_hwm: Shows the high-water mark of all CI visibility test committers over all hours in the current date for the given org.
         :type ci_visibility_test_committers_hwm: int, optional
 
-        :param cloud_cost_management_host_count_avg: Host count average of Cloud Cost Management for the given date and given org.
+        :param cloud_cost_management_aws_host_count_avg: Host count average of Cloud Cost Management for AWS for the given date and given org.
+        :type cloud_cost_management_aws_host_count_avg: int, optional
+
+        :param cloud_cost_management_azure_host_count_avg: Host count average of Cloud Cost Management for Azure for the given date and given org.
+        :type cloud_cost_management_azure_host_count_avg: int, optional
+
+        :param cloud_cost_management_host_count_avg: Host count average of Cloud Cost Management for all cloud providers for the given date and given org.
         :type cloud_cost_management_host_count_avg: int, optional
 
         :param container_avg: Shows the average of all distinct containers over all hours in the current date for the given org.
@@ -567,6 +579,10 @@ def __init__(
             kwargs["ci_visibility_pipeline_committers_hwm"] = ci_visibility_pipeline_committers_hwm
         if ci_visibility_test_committers_hwm is not unset:
             kwargs["ci_visibility_test_committers_hwm"] = ci_visibility_test_committers_hwm
+        if cloud_cost_management_aws_host_count_avg is not unset:
+            kwargs["cloud_cost_management_aws_host_count_avg"] = cloud_cost_management_aws_host_count_avg
+        if cloud_cost_management_azure_host_count_avg is not unset:
+            kwargs["cloud_cost_management_azure_host_count_avg"] = cloud_cost_management_azure_host_count_avg
         if cloud_cost_management_host_count_avg is not unset:
             kwargs["cloud_cost_management_host_count_avg"] = cloud_cost_management_host_count_avg
         if container_avg is not unset:

src/datadog_api_client/v1/model/usage_summary_response.py

@@ -47,6 +47,8 @@ def openapi_types(_):
             "ci_test_indexed_spans_agg_sum": (int,),
             "ci_visibility_pipeline_committers_hwm_sum": (int,),
             "ci_visibility_test_committers_hwm_sum": (int,),
+            "cloud_cost_management_aws_host_count_avg_sum": (int,),
+            "cloud_cost_management_azure_host_count_avg_sum": (int,),
             "cloud_cost_management_host_count_avg_sum": (int,),
             "container_avg_sum": (int,),
             "container_excl_agent_avg_sum": (int,),
@@ -140,6 +142,8 @@ def openapi_types(_):
         "ci_test_indexed_spans_agg_sum": "ci_test_indexed_spans_agg_sum",
         "ci_visibility_pipeline_committers_hwm_sum": "ci_visibility_pipeline_committers_hwm_sum",
         "ci_visibility_test_committers_hwm_sum": "ci_visibility_test_committers_hwm_sum",
+        "cloud_cost_management_aws_host_count_avg_sum": "cloud_cost_management_aws_host_count_avg_sum",
+        "cloud_cost_management_azure_host_count_avg_sum": "cloud_cost_management_azure_host_count_avg_sum",
         "cloud_cost_management_host_count_avg_sum": "cloud_cost_management_host_count_avg_sum",
         "container_avg_sum": "container_avg_sum",
         "container_excl_agent_avg_sum": "container_excl_agent_avg_sum",
@@ -234,6 +238,8 @@ def __init__(
         ci_test_indexed_spans_agg_sum: Union[int, UnsetType] = unset,
         ci_visibility_pipeline_committers_hwm_sum: Union[int, UnsetType] = unset,
         ci_visibility_test_committers_hwm_sum: Union[int, UnsetType] = unset,
+        cloud_cost_management_aws_host_count_avg_sum: Union[int, UnsetType] = unset,
+        cloud_cost_management_azure_host_count_avg_sum: Union[int, UnsetType] = unset,
         cloud_cost_management_host_count_avg_sum: Union[int, UnsetType] = unset,
         container_avg_sum: Union[int, UnsetType] = unset,
         container_excl_agent_avg_sum: Union[int, UnsetType] = unset,
@@ -371,7 +377,13 @@ def __init__(
         :param ci_visibility_test_committers_hwm_sum: Shows the high-water mark of all CI visibility test committers over all hours in the current months for all organizations.
         :type ci_visibility_test_committers_hwm_sum: int, optional
 
-        :param cloud_cost_management_host_count_avg_sum: Sum of the host count average for Cloud Cost Management.
+        :param cloud_cost_management_aws_host_count_avg_sum: Sum of the host count average for Cloud Cost Management for AWS.
+        :type cloud_cost_management_aws_host_count_avg_sum: int, optional
+
+        :param cloud_cost_management_azure_host_count_avg_sum: Sum of the host count average for Cloud Cost Management for Azure.
+        :type cloud_cost_management_azure_host_count_avg_sum: int, optional
+
+        :param cloud_cost_management_host_count_avg_sum: Sum of the host count average for Cloud Cost Management for all cloud providers.
         :type cloud_cost_management_host_count_avg_sum: int, optional
 
         :param container_avg_sum: Shows the average of all distinct containers over all hours in the current months for all organizations.
@@ -620,6 +632,10 @@ def __init__(
             kwargs["ci_visibility_pipeline_committers_hwm_sum"] = ci_visibility_pipeline_committers_hwm_sum
         if ci_visibility_test_committers_hwm_sum is not unset:
             kwargs["ci_visibility_test_committers_hwm_sum"] = ci_visibility_test_committers_hwm_sum
+        if cloud_cost_management_aws_host_count_avg_sum is not unset:
+            kwargs["cloud_cost_management_aws_host_count_avg_sum"] = cloud_cost_management_aws_host_count_avg_sum
+        if cloud_cost_management_azure_host_count_avg_sum is not unset:
+            kwargs["cloud_cost_management_azure_host_count_avg_sum"] = cloud_cost_management_azure_host_count_avg_sum
         if cloud_cost_management_host_count_avg_sum is not unset:
             kwargs["cloud_cost_management_host_count_avg_sum"] = cloud_cost_management_host_count_avg_sum
         if container_avg_sum is not unset: