Merge branch 'master' into datadog-api-spec/generated/2493

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2023-11-17 14:38:56.578081",
-            "spec_repo_commit": "739ef84a"
+            "regenerated": "2023-11-17 20:28:38.988410",
+            "spec_repo_commit": "7fb616ae"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2023-11-17 14:38:56.593623",
-            "spec_repo_commit": "739ef84a"
+            "regenerated": "2023-11-17 20:28:39.002128",
+            "spec_repo_commit": "7fb616ae"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -19226,6 +19226,16 @@ components:
             Pro hosts over all hours in the current date for the given org.
           format: int64
           type: integer
+        custom_historical_ts_avg:
+          description: Shows the average number of distinct historical custom metrics
+            over all hours in the current date for the given org.
+          format: int64
+          type: integer
+        custom_live_ts_avg:
+          description: Shows the average number of distinct live custom metrics over
+            all hours in the current date for the given org.
+          format: int64
+          type: integer
         custom_ts_avg:
           description: Shows the average number of distinct custom metrics over all
             hours in the current date for the given org.
@@ -19757,6 +19767,16 @@ components:
             Pro hosts over all hours in the current months for all organizations.
           format: int64
           type: integer
+        custom_historical_ts_sum:
+          description: Shows the average number of distinct historical custom metrics
+            over all hours in the current months for all organizations.
+          format: int64
+          type: integer
+        custom_live_ts_sum:
+          description: Shows the average number of distinct live custom metrics over
+            all hours in the current months for all organizations.
+          format: int64
+          type: integer
         custom_ts_sum:
           description: Shows the average number of distinct custom metrics over all
             hours in the current months for all organizations.

.generator/schemas/v2/openapi.yaml

@@ -689,6 +689,26 @@ components:
           items:
             $ref: '#/components/schemas/APIKeyResponseIncludedItem'
           type: array
+        meta:
+          $ref: '#/components/schemas/APIKeysResponseMeta'
+      type: object
+    APIKeysResponseMeta:
+      description: Additional information related to api keys response.
+      properties:
+        max_allowed:
+          description: Max allowed number of API keys.
+          format: int64
+          type: integer
+        page:
+          $ref: '#/components/schemas/APIKeysResponseMetaPage'
+      type: object
+    APIKeysResponseMetaPage:
+      description: Additional information related to the API keys response.
+      properties:
+        total_filtered_count:
+          description: Total filtered application key count.
+          format: int64
+          type: integer
       type: object
     APIKeysSort:
       default: name
@@ -833,6 +853,24 @@ components:
       oneOf:
       - $ref: '#/components/schemas/User'
       - $ref: '#/components/schemas/Role'
+    ApplicationKeyResponseMeta:
+      description: Additional information related to the application key response.
+      properties:
+        max_allowed_per_user:
+          description: Max allowed number of application keys per user.
+          format: int64
+          type: integer
+        page:
+          $ref: '#/components/schemas/ApplicationKeyResponseMetaPage'
+      type: object
+    ApplicationKeyResponseMetaPage:
+      description: Additional information related to the application key response.
+      properties:
+        total_filtered_count:
+          description: Total filtered application key count.
+          format: int64
+          type: integer
+      type: object
     ApplicationKeyUpdateAttributes:
       description: Attributes used to update an application Key.
       properties:
@@ -3004,6 +3042,11 @@ components:
           description: The SECL expression of the Agent rule.
           example: exec.file.name == \"sh\"
           type: string
+        filters:
+          description: The platforms the Agent rule is supported on.
+          items:
+            type: string
+          type: array
         name:
           description: The name of the Agent rule.
           example: my_agent_rule
@@ -8667,6 +8710,8 @@ components:
           items:
             $ref: '#/components/schemas/ApplicationKeyResponseIncludedItem'
           type: array
+        meta:
+          $ref: '#/components/schemas/ApplicationKeyResponseMeta'
       type: object
     ListDowntimesResponse:
       description: Response for retrieving all downtimes.
@@ -12039,7 +12084,7 @@ components:
       description: Powerpack relationship object.
       properties:
         author:
-          $ref: '#/components/schemas/Creator'
+          $ref: '#/components/schemas/RelationshipToUser'
       type: object
     PowerpackResponse:
       description: Response object which includes a single powerpack configuration.
@@ -12111,6 +12156,7 @@ components:
         last_offset:
           description: The last offset.
           format: int64
+          nullable: true
           type: integer
         limit:
           description: Pagination limit.

docs/datadog_api_client.v2.model.rst

@@ -106,6 +106,20 @@ api\_keys\_response
    :members:
    :show-inheritance:
 
+api\_keys\_response\_meta
+-------------------------
+
+.. automodule:: datadog_api_client.v2.model.api_keys_response_meta
+   :members:
+   :show-inheritance:
+
+api\_keys\_response\_meta\_page
+-------------------------------
+
+.. automodule:: datadog_api_client.v2.model.api_keys_response_meta_page
+   :members:
+   :show-inheritance:
+
 api\_keys\_sort
 ---------------
 
@@ -169,6 +183,20 @@ application\_key\_response\_included\_item
    :members:
    :show-inheritance:
 
+application\_key\_response\_meta
+--------------------------------
+
+.. automodule:: datadog_api_client.v2.model.application_key_response_meta
+   :members:
+   :show-inheritance:
+
+application\_key\_response\_meta\_page
+--------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.application_key_response_meta_page
+   :members:
+   :show-inheritance:
+
 application\_key\_update\_attributes
 ------------------------------------
 

src/datadog_api_client/v1/model/usage_summary_date_org.py

@@ -62,6 +62,8 @@ def openapi_types(_):
             "cspm_container_hwm": (int,),
             "cspm_gcp_host_top99p": (int,),
             "cspm_host_top99p": (int,),
+            "custom_historical_ts_avg": (int,),
+            "custom_live_ts_avg": (int,),
             "custom_ts_avg": (int,),
             "cws_container_count_avg": (int,),
             "cws_host_top99p": (int,),
@@ -169,6 +171,8 @@ def openapi_types(_):
         "cspm_container_hwm": "cspm_container_hwm",
         "cspm_gcp_host_top99p": "cspm_gcp_host_top99p",
         "cspm_host_top99p": "cspm_host_top99p",
+        "custom_historical_ts_avg": "custom_historical_ts_avg",
+        "custom_live_ts_avg": "custom_live_ts_avg",
         "custom_ts_avg": "custom_ts_avg",
         "cws_container_count_avg": "cws_container_count_avg",
         "cws_host_top99p": "cws_host_top99p",
@@ -277,6 +281,8 @@ def __init__(
         cspm_container_hwm: Union[int, UnsetType] = unset,
         cspm_gcp_host_top99p: Union[int, UnsetType] = unset,
         cspm_host_top99p: Union[int, UnsetType] = unset,
+        custom_historical_ts_avg: Union[int, UnsetType] = unset,
+        custom_live_ts_avg: Union[int, UnsetType] = unset,
         custom_ts_avg: Union[int, UnsetType] = unset,
         cws_container_count_avg: Union[int, UnsetType] = unset,
         cws_host_top99p: Union[int, UnsetType] = unset,
@@ -476,6 +482,12 @@ def __init__(
         :param cspm_host_top99p: Shows the 99th percentile of all Cloud Security Management Pro hosts over all hours in the current date for the given org.
         :type cspm_host_top99p: int, optional
 
+        :param custom_historical_ts_avg: Shows the average number of distinct historical custom metrics over all hours in the current date for the given org.
+        :type custom_historical_ts_avg: int, optional
+
+        :param custom_live_ts_avg: Shows the average number of distinct live custom metrics over all hours in the current date for the given org.
+        :type custom_live_ts_avg: int, optional
+
         :param custom_ts_avg: Shows the average number of distinct custom metrics over all hours in the current date for the given org.
         :type custom_ts_avg: int, optional
 
@@ -745,6 +757,10 @@ def __init__(
             kwargs["cspm_gcp_host_top99p"] = cspm_gcp_host_top99p
         if cspm_host_top99p is not unset:
             kwargs["cspm_host_top99p"] = cspm_host_top99p
+        if custom_historical_ts_avg is not unset:
+            kwargs["custom_historical_ts_avg"] = custom_historical_ts_avg
+        if custom_live_ts_avg is not unset:
+            kwargs["custom_live_ts_avg"] = custom_live_ts_avg
         if custom_ts_avg is not unset:
             kwargs["custom_ts_avg"] = custom_ts_avg
         if cws_container_count_avg is not unset:

src/datadog_api_client/v1/model/usage_summary_response.py

@@ -72,6 +72,8 @@ def openapi_types(_):
             "cspm_container_hwm_sum": (int,),
             "cspm_gcp_host_top99p_sum": (int,),
             "cspm_host_top99p_sum": (int,),
+            "custom_historical_ts_sum": (int,),
+            "custom_live_ts_sum": (int,),
             "custom_ts_sum": (int,),
             "cws_containers_avg_sum": (int,),
             "cws_host_top99p_sum": (int,),
@@ -186,6 +188,8 @@ def openapi_types(_):
         "cspm_container_hwm_sum": "cspm_container_hwm_sum",
         "cspm_gcp_host_top99p_sum": "cspm_gcp_host_top99p_sum",
         "cspm_host_top99p_sum": "cspm_host_top99p_sum",
+        "custom_historical_ts_sum": "custom_historical_ts_sum",
+        "custom_live_ts_sum": "custom_live_ts_sum",
         "custom_ts_sum": "custom_ts_sum",
         "cws_containers_avg_sum": "cws_containers_avg_sum",
         "cws_host_top99p_sum": "cws_host_top99p_sum",
@@ -301,6 +305,8 @@ def __init__(
         cspm_container_hwm_sum: Union[int, UnsetType] = unset,
         cspm_gcp_host_top99p_sum: Union[int, UnsetType] = unset,
         cspm_host_top99p_sum: Union[int, UnsetType] = unset,
+        custom_historical_ts_sum: Union[int, UnsetType] = unset,
+        custom_live_ts_sum: Union[int, UnsetType] = unset,
         custom_ts_sum: Union[int, UnsetType] = unset,
         cws_containers_avg_sum: Union[int, UnsetType] = unset,
         cws_host_top99p_sum: Union[int, UnsetType] = unset,
@@ -509,6 +515,12 @@ def __init__(
         :param cspm_host_top99p_sum: Shows the 99th percentile of all Cloud Security Management Pro hosts over all hours in the current months for all organizations.
         :type cspm_host_top99p_sum: int, optional
 
+        :param custom_historical_ts_sum: Shows the average number of distinct historical custom metrics over all hours in the current months for all organizations.
+        :type custom_historical_ts_sum: int, optional
+
+        :param custom_live_ts_sum: Shows the average number of distinct live custom metrics over all hours in the current months for all organizations.
+        :type custom_live_ts_sum: int, optional
+
         :param custom_ts_sum: Shows the average number of distinct custom metrics over all hours in the current months for all organizations.
         :type custom_ts_sum: int, optional
 
@@ -800,6 +812,10 @@ def __init__(
             kwargs["cspm_gcp_host_top99p_sum"] = cspm_gcp_host_top99p_sum
         if cspm_host_top99p_sum is not unset:
             kwargs["cspm_host_top99p_sum"] = cspm_host_top99p_sum
+        if custom_historical_ts_sum is not unset:
+            kwargs["custom_historical_ts_sum"] = custom_historical_ts_sum
+        if custom_live_ts_sum is not unset:
+            kwargs["custom_live_ts_sum"] = custom_live_ts_sum
         if custom_ts_sum is not unset:
             kwargs["custom_ts_sum"] = custom_ts_sum
         if cws_containers_avg_sum is not unset:

src/datadog_api_client/v2/model/api_keys_response.py

@@ -16,6 +16,7 @@
 if TYPE_CHECKING:
     from datadog_api_client.v2.model.partial_api_key import PartialAPIKey
     from datadog_api_client.v2.model.api_key_response_included_item import APIKeyResponseIncludedItem
+    from datadog_api_client.v2.model.api_keys_response_meta import APIKeysResponseMeta
     from datadog_api_client.v2.model.user import User
 
 
@@ -24,21 +25,25 @@ class APIKeysResponse(ModelNormal):
     def openapi_types(_):
         from datadog_api_client.v2.model.partial_api_key import PartialAPIKey
         from datadog_api_client.v2.model.api_key_response_included_item import APIKeyResponseIncludedItem
+        from datadog_api_client.v2.model.api_keys_response_meta import APIKeysResponseMeta
 
         return {
             "data": ([PartialAPIKey],),
             "included": ([APIKeyResponseIncludedItem],),
+            "meta": (APIKeysResponseMeta,),
         }
 
     attribute_map = {
         "data": "data",
         "included": "included",
+        "meta": "meta",
     }
 
     def __init__(
         self_,
         data: Union[List[PartialAPIKey], UnsetType] = unset,
         included: Union[List[Union[APIKeyResponseIncludedItem, User]], UnsetType] = unset,
+        meta: Union[APIKeysResponseMeta, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -49,9 +54,14 @@ def __init__(
 
         :param included: Array of objects related to the API key.
         :type included: [APIKeyResponseIncludedItem], optional
+
+        :param meta: Additional information related to api keys response.
+        :type meta: APIKeysResponseMeta, optional
         """
         if data is not unset:
             kwargs["data"] = data
         if included is not unset:
             kwargs["included"] = included
+        if meta is not unset:
+            kwargs["meta"] = meta
         super().__init__(kwargs)

src/datadog_api_client/v2/model/api_keys_response_meta.py

@@ -0,0 +1,54 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2019-Present Datadog, Inc.
+from __future__ import annotations
+
+from typing import Union, TYPE_CHECKING
+
+from datadog_api_client.model_utils import (
+    ModelNormal,
+    cached_property,
+    unset,
+    UnsetType,
+)
+
+
+if TYPE_CHECKING:
+    from datadog_api_client.v2.model.api_keys_response_meta_page import APIKeysResponseMetaPage
+
+
+class APIKeysResponseMeta(ModelNormal):
+    @cached_property
+    def openapi_types(_):
+        from datadog_api_client.v2.model.api_keys_response_meta_page import APIKeysResponseMetaPage
+
+        return {
+            "max_allowed": (int,),
+            "page": (APIKeysResponseMetaPage,),
+        }
+
+    attribute_map = {
+        "max_allowed": "max_allowed",
+        "page": "page",
+    }
+
+    def __init__(
+        self_,
+        max_allowed: Union[int, UnsetType] = unset,
+        page: Union[APIKeysResponseMetaPage, UnsetType] = unset,
+        **kwargs,
+    ):
+        """
+        Additional information related to api keys response.
+
+        :param max_allowed: Max allowed number of API keys.
+        :type max_allowed: int, optional
+
+        :param page: Additional information related to the API keys response.
+        :type page: APIKeysResponseMetaPage, optional
+        """
+        if max_allowed is not unset:
+            kwargs["max_allowed"] = max_allowed
+        if page is not unset:
+            kwargs["page"] = page
+        super().__init__(kwargs)