From dc21874ad9de895caae2316a2f543dbee07c9635 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 11 Nov 2026 14:48:49 +0000 Subject: [PATCH] Regenerate client from commit e3adbfd of spec repo --- .generator/schemas/v2/openapi.yaml | 79 ++++++++++++++++++- .../model/tenancy_config_data_attributes.py | 56 ++++++++++++- ...y_config_data_attributes_grace_resource.py | 45 +++++++++++ ...ancy_config_data_attributes_logs_config.py | 10 ++- ...y_config_data_attributes_metrics_config.py | 10 ++- ...y_config_data_attributes_regions_config.py | 25 +++--- src/datadog_api_client/v2/models/__init__.py | 4 + 7 files changed, 211 insertions(+), 18 deletions(-) create mode 100644 src/datadog_api_client/v2/model/tenancy_config_data_attributes_grace_resource.py diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index f0e8d45c0f..5f2825cd49 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -146152,6 +146152,12 @@ components: TenancyConfigDataAttributes: description: Attributes of an OCI tenancy integration configuration, including authentication details, region settings, and collection options. properties: + account_tags: + description: List of Datadog tags applied to data collected from the tenancy. + items: + description: A Datadog tag in key:value format (for example, env:prod). + type: string + type: array billing_plan_id: description: The identifier of the billing plan associated with the OCI tenancy. format: int32 @@ -146167,9 +146173,23 @@ components: dd_compartment_id: description: The OCID of the OCI compartment used by the Datadog integration stack. type: string + dd_iac_version: + description: The version of the Datadog infrastructure-as-code stack applied to the tenancy (for example, 1.2.0). + type: string dd_stack_id: description: The OCID of the OCI Resource Manager stack used by the Datadog integration. type: string + defined_tags: + description: List of OCI defined tags applied to the Datadog-managed connector hubs. + items: + description: An OCI defined tag in `Namespace.key:value` format (for example, `Operations.CostCenter:42`). + type: string + type: array + events_collection_enabled: + description: Whether resource change events collection from OCI is enabled for the tenancy. + type: boolean + grace_resource: + $ref: "#/components/schemas/TenancyConfigDataAttributesGraceResource" home_region: description: The home region of the OCI tenancy (for example, us-ashburn-1). type: string @@ -146185,6 +146205,9 @@ components: resource_collection_enabled: description: Whether resource collection from OCI is enabled for the tenancy. type: boolean + service_quota_collection_enabled: + description: Whether service quota collection from OCI is enabled for the tenancy. + type: boolean tenancy_name: description: The human-readable name of the OCI tenancy. type: string @@ -146192,6 +146215,16 @@ components: description: The OCID of the OCI user used by the Datadog integration for authentication. type: string type: object + TenancyConfigDataAttributesGraceResource: + description: Access control details for the tenancy configuration, used to determine whether the requesting user can edit it. + properties: + resource_id: + description: The identifier of the access control resource for the tenancy configuration. + type: string + user_can_edit: + description: Whether the requesting user has permission to edit the tenancy configuration. + type: boolean + type: object TenancyConfigDataAttributesLogsConfig: description: Log collection configuration for an OCI tenancy, indicating which compartments and services have log collection enabled. properties: @@ -146210,6 +146243,15 @@ components: description: An OCI service name for which log collection is enabled (for example, compute). type: string type: array + resource_tag_filters: + additionalProperties: + description: List of resource tag filters for the OCI service. + items: + description: A resource tag filter in key:value format (for example, env:prod). + type: string + type: array + description: Map of OCI service names to the resource tag filters that scope log collection for that service. + type: object type: object TenancyConfigDataAttributesMetricsConfig: description: Metrics collection configuration for an OCI tenancy, indicating which compartments and services are included or excluded. @@ -146229,27 +146271,39 @@ components: description: An OCI service name excluded from metrics collection (for example, compute). type: string type: array + resource_tag_filters: + additionalProperties: + description: List of resource tag filters for the OCI service. + items: + description: A resource tag filter in key:value format (for example, env:prod). + type: string + type: array + description: Map of OCI service names to the resource tag filters that scope metrics collection for that service. + type: object type: object TenancyConfigDataAttributesRegionsConfig: description: Region configuration for an OCI tenancy, indicating which regions are available, enabled, or disabled for data collection. properties: available: - description: List of OCI regions available for data collection in the tenancy. + description: List of OCI regions available for data collection in the tenancy. Returns `null` when no regions are set. items: description: An OCI region identifier (for example, us-ashburn-1). type: string + nullable: true type: array disabled: - description: List of OCI regions explicitly disabled for data collection. + description: List of OCI regions explicitly disabled for data collection. Returns `null` when no regions are set. items: description: An OCI region identifier (for example, us-phoenix-1). type: string + nullable: true type: array enabled: - description: List of OCI regions enabled for data collection. + description: List of OCI regions enabled for data collection. Returns `null` when no regions are set. items: description: An OCI region identifier (for example, us-ashburn-1). type: string + nullable: true type: array type: object TenancyConfigList: @@ -146257,10 +146311,20 @@ components: example: data: - attributes: + account_tags: + - env:prod + billing_plan_id: 2 config_version: 2 cost_collection_enabled: true dd_compartment_id: ocid.compartment.test + dd_iac_version: "1.2.0" dd_stack_id: ocid.stack.test + defined_tags: + - Operations.CostCenter:42 + events_collection_enabled: false + grace_resource: + resource_id: oci-integration-configuration:ocid.tenancy.test + user_can_edit: true home_region: us-ashburn-1 logs_config: compartment_tag_filters: @@ -146268,12 +146332,19 @@ components: enabled: true enabled_services: - compute + resource_tag_filters: + compute: + - env:prod metrics_config: compartment_tag_filters: - compartment.test enabled: true excluded_services: - compute + resource_tag_filters: + compute: + - env:prod + parent_tenancy_name: parent-tenancy regions_config: available: - us-ashburn-1 @@ -146283,6 +146354,8 @@ components: enabled: - us-ashburn-1 resource_collection_enabled: true + service_quota_collection_enabled: false + tenancy_name: test-tenancy user_ocid: ocid.user.test id: ocid.tenancy.test type: oci_tenancy diff --git a/src/datadog_api_client/v2/model/tenancy_config_data_attributes.py b/src/datadog_api_client/v2/model/tenancy_config_data_attributes.py index fbda153a3a..39819e2cb2 100644 --- a/src/datadog_api_client/v2/model/tenancy_config_data_attributes.py +++ b/src/datadog_api_client/v2/model/tenancy_config_data_attributes.py @@ -3,7 +3,7 @@ # Copyright 2019-Present Datadog, Inc. from __future__ import annotations -from typing import Union, TYPE_CHECKING +from typing import List, Union, TYPE_CHECKING from datadog_api_client.model_utils import ( ModelNormal, @@ -14,6 +14,9 @@ if TYPE_CHECKING: + from datadog_api_client.v2.model.tenancy_config_data_attributes_grace_resource import ( + TenancyConfigDataAttributesGraceResource, + ) from datadog_api_client.v2.model.tenancy_config_data_attributes_logs_config import ( TenancyConfigDataAttributesLogsConfig, ) @@ -34,6 +37,9 @@ class TenancyConfigDataAttributes(ModelNormal): @cached_property def openapi_types(_): + from datadog_api_client.v2.model.tenancy_config_data_attributes_grace_resource import ( + TenancyConfigDataAttributesGraceResource, + ) from datadog_api_client.v2.model.tenancy_config_data_attributes_logs_config import ( TenancyConfigDataAttributesLogsConfig, ) @@ -45,50 +51,68 @@ def openapi_types(_): ) return { + "account_tags": ([str],), "billing_plan_id": (int,), "config_version": (int,), "cost_collection_enabled": (bool,), "dd_compartment_id": (str,), + "dd_iac_version": (str,), "dd_stack_id": (str,), + "defined_tags": ([str],), + "events_collection_enabled": (bool,), + "grace_resource": (TenancyConfigDataAttributesGraceResource,), "home_region": (str,), "logs_config": (TenancyConfigDataAttributesLogsConfig,), "metrics_config": (TenancyConfigDataAttributesMetricsConfig,), "parent_tenancy_name": (str,), "regions_config": (TenancyConfigDataAttributesRegionsConfig,), "resource_collection_enabled": (bool,), + "service_quota_collection_enabled": (bool,), "tenancy_name": (str,), "user_ocid": (str,), } attribute_map = { + "account_tags": "account_tags", "billing_plan_id": "billing_plan_id", "config_version": "config_version", "cost_collection_enabled": "cost_collection_enabled", "dd_compartment_id": "dd_compartment_id", + "dd_iac_version": "dd_iac_version", "dd_stack_id": "dd_stack_id", + "defined_tags": "defined_tags", + "events_collection_enabled": "events_collection_enabled", + "grace_resource": "grace_resource", "home_region": "home_region", "logs_config": "logs_config", "metrics_config": "metrics_config", "parent_tenancy_name": "parent_tenancy_name", "regions_config": "regions_config", "resource_collection_enabled": "resource_collection_enabled", + "service_quota_collection_enabled": "service_quota_collection_enabled", "tenancy_name": "tenancy_name", "user_ocid": "user_ocid", } def __init__( self_, + account_tags: Union[List[str], UnsetType] = unset, billing_plan_id: Union[int, UnsetType] = unset, config_version: Union[int, UnsetType] = unset, cost_collection_enabled: Union[bool, UnsetType] = unset, dd_compartment_id: Union[str, UnsetType] = unset, + dd_iac_version: Union[str, UnsetType] = unset, dd_stack_id: Union[str, UnsetType] = unset, + defined_tags: Union[List[str], UnsetType] = unset, + events_collection_enabled: Union[bool, UnsetType] = unset, + grace_resource: Union[TenancyConfigDataAttributesGraceResource, UnsetType] = unset, home_region: Union[str, UnsetType] = unset, logs_config: Union[TenancyConfigDataAttributesLogsConfig, UnsetType] = unset, metrics_config: Union[TenancyConfigDataAttributesMetricsConfig, UnsetType] = unset, parent_tenancy_name: Union[str, UnsetType] = unset, regions_config: Union[TenancyConfigDataAttributesRegionsConfig, UnsetType] = unset, resource_collection_enabled: Union[bool, UnsetType] = unset, + service_quota_collection_enabled: Union[bool, UnsetType] = unset, tenancy_name: Union[str, UnsetType] = unset, user_ocid: Union[str, UnsetType] = unset, **kwargs, @@ -96,6 +120,9 @@ def __init__( """ Attributes of an OCI tenancy integration configuration, including authentication details, region settings, and collection options. + :param account_tags: List of Datadog tags applied to data collected from the tenancy. + :type account_tags: [str], optional + :param billing_plan_id: The identifier of the billing plan associated with the OCI tenancy. :type billing_plan_id: int, optional @@ -108,9 +135,21 @@ def __init__( :param dd_compartment_id: The OCID of the OCI compartment used by the Datadog integration stack. :type dd_compartment_id: str, optional + :param dd_iac_version: The version of the Datadog infrastructure-as-code stack applied to the tenancy (for example, 1.2.0). + :type dd_iac_version: str, optional + :param dd_stack_id: The OCID of the OCI Resource Manager stack used by the Datadog integration. :type dd_stack_id: str, optional + :param defined_tags: List of OCI defined tags applied to the Datadog-managed connector hubs. + :type defined_tags: [str], optional + + :param events_collection_enabled: Whether resource change events collection from OCI is enabled for the tenancy. + :type events_collection_enabled: bool, optional + + :param grace_resource: Access control details for the tenancy configuration, used to determine whether the requesting user can edit it. + :type grace_resource: TenancyConfigDataAttributesGraceResource, optional + :param home_region: The home region of the OCI tenancy (for example, us-ashburn-1). :type home_region: str, optional @@ -129,12 +168,17 @@ def __init__( :param resource_collection_enabled: Whether resource collection from OCI is enabled for the tenancy. :type resource_collection_enabled: bool, optional + :param service_quota_collection_enabled: Whether service quota collection from OCI is enabled for the tenancy. + :type service_quota_collection_enabled: bool, optional + :param tenancy_name: The human-readable name of the OCI tenancy. :type tenancy_name: str, optional :param user_ocid: The OCID of the OCI user used by the Datadog integration for authentication. :type user_ocid: str, optional """ + if account_tags is not unset: + kwargs["account_tags"] = account_tags if billing_plan_id is not unset: kwargs["billing_plan_id"] = billing_plan_id if config_version is not unset: @@ -143,8 +187,16 @@ def __init__( kwargs["cost_collection_enabled"] = cost_collection_enabled if dd_compartment_id is not unset: kwargs["dd_compartment_id"] = dd_compartment_id + if dd_iac_version is not unset: + kwargs["dd_iac_version"] = dd_iac_version if dd_stack_id is not unset: kwargs["dd_stack_id"] = dd_stack_id + if defined_tags is not unset: + kwargs["defined_tags"] = defined_tags + if events_collection_enabled is not unset: + kwargs["events_collection_enabled"] = events_collection_enabled + if grace_resource is not unset: + kwargs["grace_resource"] = grace_resource if home_region is not unset: kwargs["home_region"] = home_region if logs_config is not unset: @@ -157,6 +209,8 @@ def __init__( kwargs["regions_config"] = regions_config if resource_collection_enabled is not unset: kwargs["resource_collection_enabled"] = resource_collection_enabled + if service_quota_collection_enabled is not unset: + kwargs["service_quota_collection_enabled"] = service_quota_collection_enabled if tenancy_name is not unset: kwargs["tenancy_name"] = tenancy_name if user_ocid is not unset: diff --git a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_grace_resource.py b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_grace_resource.py new file mode 100644 index 0000000000..e024ba2cb8 --- /dev/null +++ b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_grace_resource.py @@ -0,0 +1,45 @@ +# 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 + +from datadog_api_client.model_utils import ( + ModelNormal, + cached_property, + unset, + UnsetType, +) + + +class TenancyConfigDataAttributesGraceResource(ModelNormal): + @cached_property + def openapi_types(_): + return { + "resource_id": (str,), + "user_can_edit": (bool,), + } + + attribute_map = { + "resource_id": "resource_id", + "user_can_edit": "user_can_edit", + } + + def __init__( + self_, resource_id: Union[str, UnsetType] = unset, user_can_edit: Union[bool, UnsetType] = unset, **kwargs + ): + """ + Access control details for the tenancy configuration, used to determine whether the requesting user can edit it. + + :param resource_id: The identifier of the access control resource for the tenancy configuration. + :type resource_id: str, optional + + :param user_can_edit: Whether the requesting user has permission to edit the tenancy configuration. + :type user_can_edit: bool, optional + """ + if resource_id is not unset: + kwargs["resource_id"] = resource_id + if user_can_edit is not unset: + kwargs["user_can_edit"] = user_can_edit + super().__init__(kwargs) diff --git a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_logs_config.py b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_logs_config.py index c856a1f490..312e468680 100644 --- a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_logs_config.py +++ b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_logs_config.py @@ -3,7 +3,7 @@ # Copyright 2019-Present Datadog, Inc. from __future__ import annotations -from typing import List, Union +from typing import Dict, List, Union from datadog_api_client.model_utils import ( ModelNormal, @@ -20,12 +20,14 @@ def openapi_types(_): "compartment_tag_filters": ([str],), "enabled": (bool,), "enabled_services": ([str],), + "resource_tag_filters": ({str: ([str],)},), } attribute_map = { "compartment_tag_filters": "compartment_tag_filters", "enabled": "enabled", "enabled_services": "enabled_services", + "resource_tag_filters": "resource_tag_filters", } def __init__( @@ -33,6 +35,7 @@ def __init__( compartment_tag_filters: Union[List[str], UnsetType] = unset, enabled: Union[bool, UnsetType] = unset, enabled_services: Union[List[str], UnsetType] = unset, + resource_tag_filters: Union[Dict[str, List[str]], UnsetType] = unset, **kwargs, ): """ @@ -46,6 +49,9 @@ def __init__( :param enabled_services: List of OCI service names for which log collection is enabled. :type enabled_services: [str], optional + + :param resource_tag_filters: Map of OCI service names to the resource tag filters that scope log collection for that service. + :type resource_tag_filters: {str: ([str],)}, optional """ if compartment_tag_filters is not unset: kwargs["compartment_tag_filters"] = compartment_tag_filters @@ -53,4 +59,6 @@ def __init__( kwargs["enabled"] = enabled if enabled_services is not unset: kwargs["enabled_services"] = enabled_services + if resource_tag_filters is not unset: + kwargs["resource_tag_filters"] = resource_tag_filters super().__init__(kwargs) diff --git a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_metrics_config.py b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_metrics_config.py index 2a7be73730..ac32ed98fd 100644 --- a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_metrics_config.py +++ b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_metrics_config.py @@ -3,7 +3,7 @@ # Copyright 2019-Present Datadog, Inc. from __future__ import annotations -from typing import List, Union +from typing import Dict, List, Union from datadog_api_client.model_utils import ( ModelNormal, @@ -20,12 +20,14 @@ def openapi_types(_): "compartment_tag_filters": ([str],), "enabled": (bool,), "excluded_services": ([str],), + "resource_tag_filters": ({str: ([str],)},), } attribute_map = { "compartment_tag_filters": "compartment_tag_filters", "enabled": "enabled", "excluded_services": "excluded_services", + "resource_tag_filters": "resource_tag_filters", } def __init__( @@ -33,6 +35,7 @@ def __init__( compartment_tag_filters: Union[List[str], UnsetType] = unset, enabled: Union[bool, UnsetType] = unset, excluded_services: Union[List[str], UnsetType] = unset, + resource_tag_filters: Union[Dict[str, List[str]], UnsetType] = unset, **kwargs, ): """ @@ -46,6 +49,9 @@ def __init__( :param excluded_services: List of OCI service names excluded from metrics collection. :type excluded_services: [str], optional + + :param resource_tag_filters: Map of OCI service names to the resource tag filters that scope metrics collection for that service. + :type resource_tag_filters: {str: ([str],)}, optional """ if compartment_tag_filters is not unset: kwargs["compartment_tag_filters"] = compartment_tag_filters @@ -53,4 +59,6 @@ def __init__( kwargs["enabled"] = enabled if excluded_services is not unset: kwargs["excluded_services"] = excluded_services + if resource_tag_filters is not unset: + kwargs["resource_tag_filters"] = resource_tag_filters super().__init__(kwargs) diff --git a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_regions_config.py b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_regions_config.py index 730f22d168..151666a1a6 100644 --- a/src/datadog_api_client/v2/model/tenancy_config_data_attributes_regions_config.py +++ b/src/datadog_api_client/v2/model/tenancy_config_data_attributes_regions_config.py @@ -8,6 +8,7 @@ from datadog_api_client.model_utils import ( ModelNormal, cached_property, + none_type, unset, UnsetType, ) @@ -17,9 +18,9 @@ class TenancyConfigDataAttributesRegionsConfig(ModelNormal): @cached_property def openapi_types(_): return { - "available": ([str],), - "disabled": ([str],), - "enabled": ([str],), + "available": ([str], none_type), + "disabled": ([str], none_type), + "enabled": ([str], none_type), } attribute_map = { @@ -30,22 +31,22 @@ def openapi_types(_): def __init__( self_, - available: Union[List[str], UnsetType] = unset, - disabled: Union[List[str], UnsetType] = unset, - enabled: Union[List[str], UnsetType] = unset, + available: Union[List[str], none_type, UnsetType] = unset, + disabled: Union[List[str], none_type, UnsetType] = unset, + enabled: Union[List[str], none_type, UnsetType] = unset, **kwargs, ): """ Region configuration for an OCI tenancy, indicating which regions are available, enabled, or disabled for data collection. - :param available: List of OCI regions available for data collection in the tenancy. - :type available: [str], optional + :param available: List of OCI regions available for data collection in the tenancy. Returns ``null`` when no regions are set. + :type available: [str], none_type, optional - :param disabled: List of OCI regions explicitly disabled for data collection. - :type disabled: [str], optional + :param disabled: List of OCI regions explicitly disabled for data collection. Returns ``null`` when no regions are set. + :type disabled: [str], none_type, optional - :param enabled: List of OCI regions enabled for data collection. - :type enabled: [str], optional + :param enabled: List of OCI regions enabled for data collection. Returns ``null`` when no regions are set. + :type enabled: [str], none_type, optional """ if available is not unset: kwargs["available"] = available diff --git a/src/datadog_api_client/v2/models/__init__.py b/src/datadog_api_client/v2/models/__init__.py index 96db396e60..e3b9496c01 100644 --- a/src/datadog_api_client/v2/models/__init__.py +++ b/src/datadog_api_client/v2/models/__init__.py @@ -13005,6 +13005,9 @@ from datadog_api_client.v2.model.tenancy_config import TenancyConfig from datadog_api_client.v2.model.tenancy_config_data import TenancyConfigData from datadog_api_client.v2.model.tenancy_config_data_attributes import TenancyConfigDataAttributes +from datadog_api_client.v2.model.tenancy_config_data_attributes_grace_resource import ( + TenancyConfigDataAttributesGraceResource, +) from datadog_api_client.v2.model.tenancy_config_data_attributes_logs_config import TenancyConfigDataAttributesLogsConfig from datadog_api_client.v2.model.tenancy_config_data_attributes_metrics_config import ( TenancyConfigDataAttributesMetricsConfig, @@ -22579,6 +22582,7 @@ "TenancyConfig", "TenancyConfigData", "TenancyConfigDataAttributes", + "TenancyConfigDataAttributesGraceResource", "TenancyConfigDataAttributesLogsConfig", "TenancyConfigDataAttributesMetricsConfig", "TenancyConfigDataAttributesRegionsConfig",