From 48dd6e1612603e0b3b1be2314cdcf4262ad2f69d Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Fri, 22 May 2026 18:45:10 +0000 Subject: [PATCH] Regenerate client from commit 2648f54 of spec repo --- .generator/schemas/v1/openapi.yaml | 76 ++++++++++++++++--- src/datadog_api_client/v1/api/monitors_api.py | 4 - .../hourly_usage_attribution_usage_type.py | 8 +- .../v1/model/monitor_thresholds.py | 16 ---- ...hly_usage_attribution_supported_metrics.py | 22 +++++- .../model/monthly_usage_attribution_values.py | 32 ++++++++ .../v1/model/usage_summary_date.py | 24 ++++++ .../v1/model/usage_summary_date_org.py | 24 ++++++ .../v1/model/usage_summary_response.py | 24 ++++++ tests/v1/features/monitors.feature | 2 +- 10 files changed, 197 insertions(+), 35 deletions(-) diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 25a447b579..47e1e729f9 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -4884,6 +4884,8 @@ components: - sds_scanned_bytes_usage - serverless_apps_usage - serverless_apps_apm_usage + - siem_12mo_retention_usage + - siem_6mo_retention_usage - siem_analyzed_logs_add_on_usage - siem_ingested_bytes_usage - snmp_usage @@ -4973,6 +4975,8 @@ components: - SDS_SCANNED_BYTES_USAGE - SERVERLESS_APPS_USAGE - SERVERLESS_APPS_APM_USAGE + - SIEM_12MO_RETENTION_USAGE + - SIEM_6MO_RETENTION_USAGE - SIEM_ANALYZED_LOGS_ADD_ON_USAGE - SIEM_INGESTED_BYTES_USAGE - SNMP_USAGE @@ -9229,19 +9233,11 @@ components: description: The monitor `CRITICAL` threshold. format: double type: number - critical_query: - description: Query evaluated as a dynamic `CRITICAL` threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview. - example: 'formula("2 * query1").rollup("avg").last("6mo")' - type: string critical_recovery: description: The monitor `CRITICAL` recovery threshold. format: double nullable: true type: number - critical_recovery_query: - description: Query evaluated as a dynamic `CRITICAL` recovery threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview. - example: 'formula("1.5 * query1").rollup("avg").last("3mo")' - type: string ok: description: The monitor `OK` threshold. format: double @@ -9605,6 +9601,10 @@ components: - rum_browser_mobile_sessions_percentage - ingested_spans_bytes_usage - ingested_spans_bytes_percentage + - siem_12mo_retention_usage + - siem_12mo_retention_percentage + - siem_6mo_retention_usage + - siem_6mo_retention_percentage - siem_analyzed_logs_add_on_usage - siem_analyzed_logs_add_on_percentage - siem_ingested_bytes_usage @@ -9774,6 +9774,10 @@ components: - RUM_BROWSER_MOBILE_SESSIONS_PERCENTAGE - INGESTED_SPANS_BYTES_USAGE - INGESTED_SPANS_BYTES_PERCENTAGE + - SIEM_12MO_RETENTION_USAGE + - SIEM_12MO_RETENTION_PERCENTAGE + - SIEM_6MO_RETENTION_USAGE + - SIEM_6MO_RETENTION_PERCENTAGE - SIEM_ANALYZED_LOGS_ADD_ON_USAGE - SIEM_ANALYZED_LOGS_ADD_ON_PERCENTAGE - SIEM_INGESTED_BYTES_USAGE @@ -10403,6 +10407,22 @@ components: description: The total Serverless Apps usage by tag(s). format: double type: number + siem_12mo_retention_percentage: + description: The percentage of Cloud SIEM Indexed Logs (12-month retention) usage by tag(s). + format: double + type: number + siem_12mo_retention_usage: + description: The Cloud SIEM Indexed Logs (12-month retention) usage by tag(s). + format: double + type: number + siem_6mo_retention_percentage: + description: The percentage of Cloud SIEM Indexed Logs (6-month retention) usage by tag(s). + format: double + type: number + siem_6mo_retention_usage: + description: The Cloud SIEM Indexed Logs (6-month retention) usage by tag(s). + format: double + type: number siem_analyzed_logs_add_on_percentage: description: The percentage of log events analyzed by Cloud SIEM usage by tag(s). format: double @@ -22467,6 +22487,10 @@ components: description: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current date for the given org. format: int64 type: integer + cloud_siem_indexed_logs_sum: + description: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current date for the given org. + format: int64 + type: integer code_analysis_sa_committers_hwm: description: Shows the high-water mark of all Static Analysis committers over all hours in the current date for the given org. format: int64 @@ -23231,6 +23255,14 @@ components: description: Shows the average number of Serverless Apps for Azure and Google Cloud for the given date and given org. format: int64 type: integer + siem_12mo_retention_sum: + description: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current date for the given org. + format: int64 + type: integer + siem_6mo_retention_sum: + description: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current date for the given org. + format: int64 + type: integer siem_analyzed_logs_add_on_count_sum: description: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current date for the given org. format: int64 @@ -23480,6 +23512,10 @@ components: description: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current date for the given org. format: int64 type: integer + cloud_siem_indexed_logs_sum: + description: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current date for the given org. + format: int64 + type: integer code_analysis_sa_committers_hwm: description: Shows the high-water mark of all Static Analysis committers over all hours in the current date for the given org. format: int64 @@ -24256,6 +24292,14 @@ components: description: Shows the average number of Serverless Apps for Azure and Google Cloud for the given date and given org. format: int64 type: integer + siem_12mo_retention_sum: + description: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current date for the given org. + format: int64 + type: integer + siem_6mo_retention_sum: + description: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current date for the given org. + format: int64 + type: integer siem_analyzed_logs_add_on_count_sum: description: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current date for the given org. format: int64 @@ -24503,6 +24547,10 @@ components: description: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current month for all organizations. format: int64 type: integer + cloud_siem_indexed_logs_agg_sum: + description: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current month for all organizations. + format: int64 + type: integer code_analysis_sa_committers_hwm_sum: description: Shows the high-water mark of all Static Analysis committers over all hours in the current month for all organizations. format: int64 @@ -25299,6 +25347,14 @@ components: description: Sum of the average number of Serverless Apps for Azure and Google Cloud in the current month for all organizations. format: int64 type: integer + siem_12mo_retention_agg_sum: + description: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current month for all organizations. + format: int64 + type: integer + siem_6mo_retention_agg_sum: + description: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current month for all organizations. + format: int64 + type: integer siem_analyzed_logs_add_on_count_agg_sum: description: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current month for all organizations. format: int64 @@ -33708,10 +33764,6 @@ paths: - `operator`: <, <=, >, >=, ==, or != - `#`: an integer or decimal number used to set the threshold - To use a dynamic threshold on a metric monitor with a formula query, replace `#` with the `threshold` keyword - (for example, `... > threshold`) and provide the threshold as a query via `critical_query` on `options.thresholds`. - This feature is in preview. - If you are using the `_change_` or `_pct_change_` time aggregator, instead use `change_aggr(time_aggr(time_window), timeshift):space_aggr:metric{tags} [by {key}] operator #` with: diff --git a/src/datadog_api_client/v1/api/monitors_api.py b/src/datadog_api_client/v1/api/monitors_api.py index 2c266cd440..13c824ff80 100644 --- a/src/datadog_api_client/v1/api/monitors_api.py +++ b/src/datadog_api_client/v1/api/monitors_api.py @@ -425,10 +425,6 @@ def create_monitor( * ``operator`` : <, <=, >, >=, ==, or != * ``#`` : an integer or decimal number used to set the threshold - To use a dynamic threshold on a metric monitor with a formula query, replace ``#`` with the ``threshold`` keyword - (for example, ``... > threshold`` ) and provide the threshold as a query via ``critical_query`` on ``options.thresholds``. - This feature is in preview. - If you are using the ``_change_`` or ``_pct_change_`` time aggregator, instead use ``change_aggr(time_aggr(time_window), timeshift):space_aggr:metric{tags} [by {key}] operator #`` with: diff --git a/src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py b/src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py index 94d25fba84..533ee0807e 100644 --- a/src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py +++ b/src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py @@ -17,7 +17,7 @@ class HourlyUsageAttributionUsageType(ModelSimple): Supported products for hourly usage attribution requests. Usage types are in the format `_usage`. To obtain the complete list of valid usage types, make a request to the [Get usage attribution types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types). - :param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "apm_usm_usage", "appsec_fargate_usage", "appsec_usage", "asm_serverless_traced_invocations_usage", "asm_serverless_traced_invocations_percentage", "bits_ai_investigations_usage", "browser_usage", "ci_code_coverage_committers_percentage", "ci_code_coverage_committers_usage", "ci_pipeline_indexed_spans_usage", "ci_test_indexed_spans_usage", "ci_visibility_itr_usage", "cloud_siem_usage", "code_security_host_usage", "container_excl_agent_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_event_usage", "custom_ingested_timeseries_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_fargate_task_usage", "cws_hosts_usage", "data_jobs_monitoring_usage", "data_stream_monitoring_usage", "dbm_hosts_usage", "dbm_queries_usage", "error_tracking_usage", "error_tracking_percentage", "estimated_indexed_spans_usage", "estimated_ingested_spans_usage", "fargate_usage", "flex_logs_starter", "flex_stored_logs", "functions_usage", "incident_management_monthly_active_users_usage", "indexed_spans_usage", "infra_host_usage", "infra_host_basic_usage", "ingested_logs_bytes_usage", "ingested_spans_bytes_usage", "invocations_usage", "lambda_traced_invocations_usage", "llm_observability_usage", "llm_spans_usage", "logs_indexed_15day_usage", "logs_indexed_180day_usage", "logs_indexed_1day_usage", "logs_indexed_30day_usage", "logs_indexed_360day_usage", "logs_indexed_3day_usage", "logs_indexed_45day_usage", "logs_indexed_60day_usage", "logs_indexed_7day_usage", "logs_indexed_90day_usage", "logs_indexed_custom_retention_usage", "mobile_app_testing_usage", "ndm_netflow_usage", "npm_host_usage", "network_device_wireless_usage", "obs_pipeline_bytes_usage", "obs_pipelines_vcpu_usage", "online_archive_usage", "product_analytics_session_usage", "profiled_container_usage", "profiled_fargate_usage", "profiled_host_usage", "published_app", "rum_browser_mobile_sessions_usage", "rum_ingested_usage", "rum_investigate_usage", "rum_replay_sessions_usage", "rum_session_replay_add_on_usage", "sca_fargate_usage", "sds_scanned_bytes_usage", "serverless_apps_usage", "serverless_apps_apm_usage", "siem_analyzed_logs_add_on_usage", "siem_ingested_bytes_usage", "snmp_usage", "universal_service_monitoring_usage", "vuln_management_hosts_usage", "workflow_executions_usage"]. + :param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "apm_usm_usage", "appsec_fargate_usage", "appsec_usage", "asm_serverless_traced_invocations_usage", "asm_serverless_traced_invocations_percentage", "bits_ai_investigations_usage", "browser_usage", "ci_code_coverage_committers_percentage", "ci_code_coverage_committers_usage", "ci_pipeline_indexed_spans_usage", "ci_test_indexed_spans_usage", "ci_visibility_itr_usage", "cloud_siem_usage", "code_security_host_usage", "container_excl_agent_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_event_usage", "custom_ingested_timeseries_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_fargate_task_usage", "cws_hosts_usage", "data_jobs_monitoring_usage", "data_stream_monitoring_usage", "dbm_hosts_usage", "dbm_queries_usage", "error_tracking_usage", "error_tracking_percentage", "estimated_indexed_spans_usage", "estimated_ingested_spans_usage", "fargate_usage", "flex_logs_starter", "flex_stored_logs", "functions_usage", "incident_management_monthly_active_users_usage", "indexed_spans_usage", "infra_host_usage", "infra_host_basic_usage", "ingested_logs_bytes_usage", "ingested_spans_bytes_usage", "invocations_usage", "lambda_traced_invocations_usage", "llm_observability_usage", "llm_spans_usage", "logs_indexed_15day_usage", "logs_indexed_180day_usage", "logs_indexed_1day_usage", "logs_indexed_30day_usage", "logs_indexed_360day_usage", "logs_indexed_3day_usage", "logs_indexed_45day_usage", "logs_indexed_60day_usage", "logs_indexed_7day_usage", "logs_indexed_90day_usage", "logs_indexed_custom_retention_usage", "mobile_app_testing_usage", "ndm_netflow_usage", "npm_host_usage", "network_device_wireless_usage", "obs_pipeline_bytes_usage", "obs_pipelines_vcpu_usage", "online_archive_usage", "product_analytics_session_usage", "profiled_container_usage", "profiled_fargate_usage", "profiled_host_usage", "published_app", "rum_browser_mobile_sessions_usage", "rum_ingested_usage", "rum_investigate_usage", "rum_replay_sessions_usage", "rum_session_replay_add_on_usage", "sca_fargate_usage", "sds_scanned_bytes_usage", "serverless_apps_usage", "serverless_apps_apm_usage", "siem_12mo_retention_usage", "siem_6mo_retention_usage", "siem_analyzed_logs_add_on_usage", "siem_ingested_bytes_usage", "snmp_usage", "universal_service_monitoring_usage", "vuln_management_hosts_usage", "workflow_executions_usage"]. :type value: str """ @@ -103,6 +103,8 @@ class HourlyUsageAttributionUsageType(ModelSimple): "sds_scanned_bytes_usage", "serverless_apps_usage", "serverless_apps_apm_usage", + "siem_12mo_retention_usage", + "siem_6mo_retention_usage", "siem_analyzed_logs_add_on_usage", "siem_ingested_bytes_usage", "snmp_usage", @@ -191,6 +193,8 @@ class HourlyUsageAttributionUsageType(ModelSimple): SDS_SCANNED_BYTES_USAGE: ClassVar["HourlyUsageAttributionUsageType"] SERVERLESS_APPS_USAGE: ClassVar["HourlyUsageAttributionUsageType"] SERVERLESS_APPS_APM_USAGE: ClassVar["HourlyUsageAttributionUsageType"] + SIEM_12MO_RETENTION_USAGE: ClassVar["HourlyUsageAttributionUsageType"] + SIEM_6MO_RETENTION_USAGE: ClassVar["HourlyUsageAttributionUsageType"] SIEM_ANALYZED_LOGS_ADD_ON_USAGE: ClassVar["HourlyUsageAttributionUsageType"] SIEM_INGESTED_BYTES_USAGE: ClassVar["HourlyUsageAttributionUsageType"] SNMP_USAGE: ClassVar["HourlyUsageAttributionUsageType"] @@ -326,6 +330,8 @@ def openapi_types(_): HourlyUsageAttributionUsageType.SDS_SCANNED_BYTES_USAGE = HourlyUsageAttributionUsageType("sds_scanned_bytes_usage") HourlyUsageAttributionUsageType.SERVERLESS_APPS_USAGE = HourlyUsageAttributionUsageType("serverless_apps_usage") HourlyUsageAttributionUsageType.SERVERLESS_APPS_APM_USAGE = HourlyUsageAttributionUsageType("serverless_apps_apm_usage") +HourlyUsageAttributionUsageType.SIEM_12MO_RETENTION_USAGE = HourlyUsageAttributionUsageType("siem_12mo_retention_usage") +HourlyUsageAttributionUsageType.SIEM_6MO_RETENTION_USAGE = HourlyUsageAttributionUsageType("siem_6mo_retention_usage") HourlyUsageAttributionUsageType.SIEM_ANALYZED_LOGS_ADD_ON_USAGE = HourlyUsageAttributionUsageType( "siem_analyzed_logs_add_on_usage" ) diff --git a/src/datadog_api_client/v1/model/monitor_thresholds.py b/src/datadog_api_client/v1/model/monitor_thresholds.py index bbc79479ea..c114304c71 100644 --- a/src/datadog_api_client/v1/model/monitor_thresholds.py +++ b/src/datadog_api_client/v1/model/monitor_thresholds.py @@ -19,9 +19,7 @@ class MonitorThresholds(ModelNormal): def openapi_types(_): return { "critical": (float,), - "critical_query": (str,), "critical_recovery": (float, none_type), - "critical_recovery_query": (str,), "ok": (float, none_type), "unknown": (float, none_type), "warning": (float, none_type), @@ -30,9 +28,7 @@ def openapi_types(_): attribute_map = { "critical": "critical", - "critical_query": "critical_query", "critical_recovery": "critical_recovery", - "critical_recovery_query": "critical_recovery_query", "ok": "ok", "unknown": "unknown", "warning": "warning", @@ -42,9 +38,7 @@ def openapi_types(_): def __init__( self_, critical: Union[float, UnsetType] = unset, - critical_query: Union[str, UnsetType] = unset, critical_recovery: Union[float, none_type, UnsetType] = unset, - critical_recovery_query: Union[str, UnsetType] = unset, ok: Union[float, none_type, UnsetType] = unset, unknown: Union[float, none_type, UnsetType] = unset, warning: Union[float, none_type, UnsetType] = unset, @@ -57,15 +51,9 @@ def __init__( :param critical: The monitor ``CRITICAL`` threshold. :type critical: float, optional - :param critical_query: Query evaluated as a dynamic ``CRITICAL`` threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview. - :type critical_query: str, optional - :param critical_recovery: The monitor ``CRITICAL`` recovery threshold. :type critical_recovery: float, none_type, optional - :param critical_recovery_query: Query evaluated as a dynamic ``CRITICAL`` recovery threshold. Only supported on metric monitors with a formula query and options['variables']. Cannot be combined with static thresholds. This field is in preview. - :type critical_recovery_query: str, optional - :param ok: The monitor ``OK`` threshold. :type ok: float, none_type, optional @@ -80,12 +68,8 @@ def __init__( """ if critical is not unset: kwargs["critical"] = critical - if critical_query is not unset: - kwargs["critical_query"] = critical_query if critical_recovery is not unset: kwargs["critical_recovery"] = critical_recovery - if critical_recovery_query is not unset: - kwargs["critical_recovery_query"] = critical_recovery_query if ok is not unset: kwargs["ok"] = ok if unknown is not unset: diff --git a/src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py b/src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py index 9cc61b4f38..2e7b307c2b 100644 --- a/src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py +++ b/src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py @@ -17,7 +17,7 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple): Supported metrics for monthly usage attribution requests. Usage types are in the format `_usage`. To obtain the complete list of valid usage types, make a request to the [Get usage attribution types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types). - :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", "apm_usm_usage", "apm_usm_percentage", "appsec_usage", "appsec_percentage", "asm_serverless_traced_invocations_usage", "asm_serverless_traced_invocations_percentage", "bits_ai_investigations_usage", "bits_ai_investigations_percentage", "browser_usage", "browser_percentage", "ci_visibility_itr_usage", "ci_visibility_itr_percentage", "cloud_siem_usage", "cloud_siem_percentage", "code_security_host_usage", "code_security_host_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_fargate_task_percentage", "cws_fargate_task_usage", "cws_hosts_percentage", "cws_hosts_usage", "data_jobs_monitoring_usage", "data_jobs_monitoring_percentage", "data_stream_monitoring_usage", "data_stream_monitoring_percentage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "error_tracking_usage", "error_tracking_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "fargate_usage", "fargate_percentage", "flex_logs_starter_usage", "flex_logs_starter_percentage", "flex_stored_logs_usage", "flex_stored_logs_percentage", "functions_usage", "functions_percentage", "incident_management_monthly_active_users_usage", "incident_management_monthly_active_users_percentage", "infra_host_usage", "infra_host_percentage", "infra_host_basic_usage", "infra_host_basic_percentage", "invocations_usage", "invocations_percentage", "lambda_traced_invocations_usage", "lambda_traced_invocations_percentage", "llm_observability_usage", "llm_observability_percentage", "llm_spans_usage", "llm_spans_percentage", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_usage", "ndm_netflow_percentage", "network_device_wireless_usage", "network_device_wireless_percentage", "npm_host_usage", "npm_host_percentage", "obs_pipeline_bytes_usage", "obs_pipeline_bytes_percentage", "obs_pipelines_vcpu_usage", "obs_pipelines_vcpu_percentage", "online_archive_usage", "online_archive_percentage", "product_analytics_session_usage", "product_analytics_session_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_fargate_usage", "profiled_fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "published_app_usage", "published_app_percentage", "serverless_apps_usage", "serverless_apps_percentage", "serverless_apps_apm_usage", "serverless_apps_apm_percentage", "snmp_usage", "snmp_percentage", "universal_service_monitoring_usage", "universal_service_monitoring_percentage", "vuln_management_hosts_usage", "vuln_management_hosts_percentage", "sds_scanned_bytes_usage", "sds_scanned_bytes_percentage", "ci_test_indexed_spans_usage", "ci_test_indexed_spans_percentage", "ingested_logs_bytes_usage", "ingested_logs_bytes_percentage", "ci_pipeline_indexed_spans_usage", "ci_pipeline_indexed_spans_percentage", "indexed_spans_usage", "indexed_spans_percentage", "custom_event_usage", "custom_event_percentage", "logs_indexed_custom_retention_usage", "logs_indexed_custom_retention_percentage", "logs_indexed_360day_usage", "logs_indexed_360day_percentage", "logs_indexed_180day_usage", "logs_indexed_180day_percentage", "logs_indexed_90day_usage", "logs_indexed_90day_percentage", "logs_indexed_60day_usage", "logs_indexed_60day_percentage", "logs_indexed_45day_usage", "logs_indexed_45day_percentage", "logs_indexed_30day_usage", "logs_indexed_30day_percentage", "logs_indexed_15day_usage", "logs_indexed_15day_percentage", "logs_indexed_7day_usage", "logs_indexed_7day_percentage", "logs_indexed_3day_usage", "logs_indexed_3day_percentage", "logs_indexed_1day_usage", "logs_indexed_1day_percentage", "rum_ingested_usage", "rum_ingested_percentage", "rum_investigate_usage", "rum_investigate_percentage", "rum_replay_sessions_usage", "rum_replay_sessions_percentage", "rum_session_replay_add_on_usage", "rum_session_replay_add_on_percentage", "rum_browser_mobile_sessions_usage", "rum_browser_mobile_sessions_percentage", "ingested_spans_bytes_usage", "ingested_spans_bytes_percentage", "siem_analyzed_logs_add_on_usage", "siem_analyzed_logs_add_on_percentage", "siem_ingested_bytes_usage", "siem_ingested_bytes_percentage", "workflow_executions_usage", "workflow_executions_percentage", "sca_fargate_usage", "sca_fargate_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", "apm_usm_usage", "apm_usm_percentage", "appsec_usage", "appsec_percentage", "asm_serverless_traced_invocations_usage", "asm_serverless_traced_invocations_percentage", "bits_ai_investigations_usage", "bits_ai_investigations_percentage", "browser_usage", "browser_percentage", "ci_visibility_itr_usage", "ci_visibility_itr_percentage", "cloud_siem_usage", "cloud_siem_percentage", "code_security_host_usage", "code_security_host_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_fargate_task_percentage", "cws_fargate_task_usage", "cws_hosts_percentage", "cws_hosts_usage", "data_jobs_monitoring_usage", "data_jobs_monitoring_percentage", "data_stream_monitoring_usage", "data_stream_monitoring_percentage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "error_tracking_usage", "error_tracking_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "fargate_usage", "fargate_percentage", "flex_logs_starter_usage", "flex_logs_starter_percentage", "flex_stored_logs_usage", "flex_stored_logs_percentage", "functions_usage", "functions_percentage", "incident_management_monthly_active_users_usage", "incident_management_monthly_active_users_percentage", "infra_host_usage", "infra_host_percentage", "infra_host_basic_usage", "infra_host_basic_percentage", "invocations_usage", "invocations_percentage", "lambda_traced_invocations_usage", "lambda_traced_invocations_percentage", "llm_observability_usage", "llm_observability_percentage", "llm_spans_usage", "llm_spans_percentage", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_usage", "ndm_netflow_percentage", "network_device_wireless_usage", "network_device_wireless_percentage", "npm_host_usage", "npm_host_percentage", "obs_pipeline_bytes_usage", "obs_pipeline_bytes_percentage", "obs_pipelines_vcpu_usage", "obs_pipelines_vcpu_percentage", "online_archive_usage", "online_archive_percentage", "product_analytics_session_usage", "product_analytics_session_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_fargate_usage", "profiled_fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "published_app_usage", "published_app_percentage", "serverless_apps_usage", "serverless_apps_percentage", "serverless_apps_apm_usage", "serverless_apps_apm_percentage", "snmp_usage", "snmp_percentage", "universal_service_monitoring_usage", "universal_service_monitoring_percentage", "vuln_management_hosts_usage", "vuln_management_hosts_percentage", "sds_scanned_bytes_usage", "sds_scanned_bytes_percentage", "ci_test_indexed_spans_usage", "ci_test_indexed_spans_percentage", "ingested_logs_bytes_usage", "ingested_logs_bytes_percentage", "ci_pipeline_indexed_spans_usage", "ci_pipeline_indexed_spans_percentage", "indexed_spans_usage", "indexed_spans_percentage", "custom_event_usage", "custom_event_percentage", "logs_indexed_custom_retention_usage", "logs_indexed_custom_retention_percentage", "logs_indexed_360day_usage", "logs_indexed_360day_percentage", "logs_indexed_180day_usage", "logs_indexed_180day_percentage", "logs_indexed_90day_usage", "logs_indexed_90day_percentage", "logs_indexed_60day_usage", "logs_indexed_60day_percentage", "logs_indexed_45day_usage", "logs_indexed_45day_percentage", "logs_indexed_30day_usage", "logs_indexed_30day_percentage", "logs_indexed_15day_usage", "logs_indexed_15day_percentage", "logs_indexed_7day_usage", "logs_indexed_7day_percentage", "logs_indexed_3day_usage", "logs_indexed_3day_percentage", "logs_indexed_1day_usage", "logs_indexed_1day_percentage", "rum_ingested_usage", "rum_ingested_percentage", "rum_investigate_usage", "rum_investigate_percentage", "rum_replay_sessions_usage", "rum_replay_sessions_percentage", "rum_session_replay_add_on_usage", "rum_session_replay_add_on_percentage", "rum_browser_mobile_sessions_usage", "rum_browser_mobile_sessions_percentage", "ingested_spans_bytes_usage", "ingested_spans_bytes_percentage", "siem_12mo_retention_usage", "siem_12mo_retention_percentage", "siem_6mo_retention_usage", "siem_6mo_retention_percentage", "siem_analyzed_logs_add_on_usage", "siem_analyzed_logs_add_on_percentage", "siem_ingested_bytes_usage", "siem_ingested_bytes_percentage", "workflow_executions_usage", "workflow_executions_percentage", "sca_fargate_usage", "sca_fargate_percentage", "*"]. :type value: str """ @@ -180,6 +180,10 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple): "rum_browser_mobile_sessions_percentage", "ingested_spans_bytes_usage", "ingested_spans_bytes_percentage", + "siem_12mo_retention_usage", + "siem_12mo_retention_percentage", + "siem_6mo_retention_usage", + "siem_6mo_retention_percentage", "siem_analyzed_logs_add_on_usage", "siem_analyzed_logs_add_on_percentage", "siem_ingested_bytes_usage", @@ -348,6 +352,10 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple): RUM_BROWSER_MOBILE_SESSIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] INGESTED_SPANS_BYTES_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] INGESTED_SPANS_BYTES_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] + SIEM_12MO_RETENTION_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] + SIEM_12MO_RETENTION_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] + SIEM_6MO_RETENTION_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] + SIEM_6MO_RETENTION_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] SIEM_ANALYZED_LOGS_ADD_ON_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] SIEM_ANALYZED_LOGS_ADD_ON_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] SIEM_INGESTED_BYTES_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"] @@ -793,6 +801,18 @@ def openapi_types(_): MonthlyUsageAttributionSupportedMetrics.INGESTED_SPANS_BYTES_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics( "ingested_spans_bytes_percentage" ) +MonthlyUsageAttributionSupportedMetrics.SIEM_12MO_RETENTION_USAGE = MonthlyUsageAttributionSupportedMetrics( + "siem_12mo_retention_usage" +) +MonthlyUsageAttributionSupportedMetrics.SIEM_12MO_RETENTION_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics( + "siem_12mo_retention_percentage" +) +MonthlyUsageAttributionSupportedMetrics.SIEM_6MO_RETENTION_USAGE = MonthlyUsageAttributionSupportedMetrics( + "siem_6mo_retention_usage" +) +MonthlyUsageAttributionSupportedMetrics.SIEM_6MO_RETENTION_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics( + "siem_6mo_retention_percentage" +) MonthlyUsageAttributionSupportedMetrics.SIEM_ANALYZED_LOGS_ADD_ON_USAGE = MonthlyUsageAttributionSupportedMetrics( "siem_analyzed_logs_add_on_usage" ) diff --git a/src/datadog_api_client/v1/model/monthly_usage_attribution_values.py b/src/datadog_api_client/v1/model/monthly_usage_attribution_values.py index 664841661b..8caba481d0 100644 --- a/src/datadog_api_client/v1/model/monthly_usage_attribution_values.py +++ b/src/datadog_api_client/v1/model/monthly_usage_attribution_values.py @@ -171,6 +171,10 @@ def openapi_types(_): "serverless_apps_apm_usage": (float,), "serverless_apps_percentage": (float,), "serverless_apps_usage": (float,), + "siem_12mo_retention_percentage": (float,), + "siem_12mo_retention_usage": (float,), + "siem_6mo_retention_percentage": (float,), + "siem_6mo_retention_usage": (float,), "siem_analyzed_logs_add_on_percentage": (float,), "siem_analyzed_logs_add_on_usage": (float,), "siem_ingested_bytes_percentage": (float,), @@ -340,6 +344,10 @@ def openapi_types(_): "serverless_apps_apm_usage": "serverless_apps_apm_usage", "serverless_apps_percentage": "serverless_apps_percentage", "serverless_apps_usage": "serverless_apps_usage", + "siem_12mo_retention_percentage": "siem_12mo_retention_percentage", + "siem_12mo_retention_usage": "siem_12mo_retention_usage", + "siem_6mo_retention_percentage": "siem_6mo_retention_percentage", + "siem_6mo_retention_usage": "siem_6mo_retention_usage", "siem_analyzed_logs_add_on_percentage": "siem_analyzed_logs_add_on_percentage", "siem_analyzed_logs_add_on_usage": "siem_analyzed_logs_add_on_usage", "siem_ingested_bytes_percentage": "siem_ingested_bytes_percentage", @@ -510,6 +518,10 @@ def __init__( serverless_apps_apm_usage: Union[float, UnsetType] = unset, serverless_apps_percentage: Union[float, UnsetType] = unset, serverless_apps_usage: Union[float, UnsetType] = unset, + siem_12mo_retention_percentage: Union[float, UnsetType] = unset, + siem_12mo_retention_usage: Union[float, UnsetType] = unset, + siem_6mo_retention_percentage: Union[float, UnsetType] = unset, + siem_6mo_retention_usage: Union[float, UnsetType] = unset, siem_analyzed_logs_add_on_percentage: Union[float, UnsetType] = unset, siem_analyzed_logs_add_on_usage: Union[float, UnsetType] = unset, siem_ingested_bytes_percentage: Union[float, UnsetType] = unset, @@ -989,6 +1001,18 @@ def __init__( :param serverless_apps_usage: The total Serverless Apps usage by tag(s). :type serverless_apps_usage: float, optional + :param siem_12mo_retention_percentage: The percentage of Cloud SIEM Indexed Logs (12-month retention) usage by tag(s). + :type siem_12mo_retention_percentage: float, optional + + :param siem_12mo_retention_usage: The Cloud SIEM Indexed Logs (12-month retention) usage by tag(s). + :type siem_12mo_retention_usage: float, optional + + :param siem_6mo_retention_percentage: The percentage of Cloud SIEM Indexed Logs (6-month retention) usage by tag(s). + :type siem_6mo_retention_percentage: float, optional + + :param siem_6mo_retention_usage: The Cloud SIEM Indexed Logs (6-month retention) usage by tag(s). + :type siem_6mo_retention_usage: float, optional + :param siem_analyzed_logs_add_on_percentage: The percentage of log events analyzed by Cloud SIEM usage by tag(s). :type siem_analyzed_logs_add_on_percentage: float, optional @@ -1335,6 +1359,14 @@ def __init__( kwargs["serverless_apps_percentage"] = serverless_apps_percentage if serverless_apps_usage is not unset: kwargs["serverless_apps_usage"] = serverless_apps_usage + if siem_12mo_retention_percentage is not unset: + kwargs["siem_12mo_retention_percentage"] = siem_12mo_retention_percentage + if siem_12mo_retention_usage is not unset: + kwargs["siem_12mo_retention_usage"] = siem_12mo_retention_usage + if siem_6mo_retention_percentage is not unset: + kwargs["siem_6mo_retention_percentage"] = siem_6mo_retention_percentage + if siem_6mo_retention_usage is not unset: + kwargs["siem_6mo_retention_usage"] = siem_6mo_retention_usage if siem_analyzed_logs_add_on_percentage is not unset: kwargs["siem_analyzed_logs_add_on_percentage"] = siem_analyzed_logs_add_on_percentage if siem_analyzed_logs_add_on_usage is not unset: diff --git a/src/datadog_api_client/v1/model/usage_summary_date.py b/src/datadog_api_client/v1/model/usage_summary_date.py index 55f4e6eb5b..6518167eea 100644 --- a/src/datadog_api_client/v1/model/usage_summary_date.py +++ b/src/datadog_api_client/v1/model/usage_summary_date.py @@ -72,6 +72,7 @@ def openapi_types(_): "cloud_cost_management_host_count_avg": (int,), "cloud_cost_management_oci_host_count_avg": (int,), "cloud_siem_events_sum": (int,), + "cloud_siem_indexed_logs_sum": (int,), "code_analysis_sa_committers_hwm": (int,), "code_analysis_sca_committers_hwm": (int,), "code_security_host_top99p": (int,), @@ -260,6 +261,8 @@ def openapi_types(_): "serverless_apps_google_count_avg": (int,), "serverless_apps_infra_gcp_gke_autopilot_pods_avg": (int,), "serverless_apps_total_count_avg": (int,), + "siem_12mo_retention_sum": (int,), + "siem_6mo_retention_sum": (int,), "siem_analyzed_logs_add_on_count_sum": (int,), "synthetics_browser_check_calls_count_sum": (int,), "synthetics_check_calls_count_sum": (int,), @@ -322,6 +325,7 @@ def openapi_types(_): "cloud_cost_management_host_count_avg": "cloud_cost_management_host_count_avg", "cloud_cost_management_oci_host_count_avg": "cloud_cost_management_oci_host_count_avg", "cloud_siem_events_sum": "cloud_siem_events_sum", + "cloud_siem_indexed_logs_sum": "cloud_siem_indexed_logs_sum", "code_analysis_sa_committers_hwm": "code_analysis_sa_committers_hwm", "code_analysis_sca_committers_hwm": "code_analysis_sca_committers_hwm", "code_security_host_top99p": "code_security_host_top99p", @@ -510,6 +514,8 @@ def openapi_types(_): "serverless_apps_google_count_avg": "serverless_apps_google_count_avg", "serverless_apps_infra_gcp_gke_autopilot_pods_avg": "serverless_apps_infra_gcp_gke_autopilot_pods_avg", "serverless_apps_total_count_avg": "serverless_apps_total_count_avg", + "siem_12mo_retention_sum": "siem_12mo_retention_sum", + "siem_6mo_retention_sum": "siem_6mo_retention_sum", "siem_analyzed_logs_add_on_count_sum": "siem_analyzed_logs_add_on_count_sum", "synthetics_browser_check_calls_count_sum": "synthetics_browser_check_calls_count_sum", "synthetics_check_calls_count_sum": "synthetics_check_calls_count_sum", @@ -573,6 +579,7 @@ def __init__( cloud_cost_management_host_count_avg: Union[int, UnsetType] = unset, cloud_cost_management_oci_host_count_avg: Union[int, UnsetType] = unset, cloud_siem_events_sum: Union[int, UnsetType] = unset, + cloud_siem_indexed_logs_sum: Union[int, UnsetType] = unset, code_analysis_sa_committers_hwm: Union[int, UnsetType] = unset, code_analysis_sca_committers_hwm: Union[int, UnsetType] = unset, code_security_host_top99p: Union[int, UnsetType] = unset, @@ -761,6 +768,8 @@ def __init__( serverless_apps_google_count_avg: Union[int, UnsetType] = unset, serverless_apps_infra_gcp_gke_autopilot_pods_avg: Union[int, UnsetType] = unset, serverless_apps_total_count_avg: Union[int, UnsetType] = unset, + siem_12mo_retention_sum: Union[int, UnsetType] = unset, + siem_6mo_retention_sum: Union[int, UnsetType] = unset, siem_analyzed_logs_add_on_count_sum: Union[int, UnsetType] = unset, synthetics_browser_check_calls_count_sum: Union[int, UnsetType] = unset, synthetics_check_calls_count_sum: Union[int, UnsetType] = unset, @@ -921,6 +930,9 @@ def __init__( :param cloud_siem_events_sum: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current date for the given org. :type cloud_siem_events_sum: int, optional + :param cloud_siem_indexed_logs_sum: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current date for the given org. + :type cloud_siem_indexed_logs_sum: int, optional + :param code_analysis_sa_committers_hwm: Shows the high-water mark of all Static Analysis committers over all hours in the current date for the given org. :type code_analysis_sa_committers_hwm: int, optional @@ -1485,6 +1497,12 @@ def __init__( :param serverless_apps_total_count_avg: Shows the average number of Serverless Apps for Azure and Google Cloud for the given date and given org. :type serverless_apps_total_count_avg: int, optional + :param siem_12mo_retention_sum: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current date for the given org. + :type siem_12mo_retention_sum: int, optional + + :param siem_6mo_retention_sum: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current date for the given org. + :type siem_6mo_retention_sum: int, optional + :param siem_analyzed_logs_add_on_count_sum: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current date for the given org. :type siem_analyzed_logs_add_on_count_sum: int, optional @@ -1614,6 +1632,8 @@ def __init__( kwargs["cloud_cost_management_oci_host_count_avg"] = cloud_cost_management_oci_host_count_avg if cloud_siem_events_sum is not unset: kwargs["cloud_siem_events_sum"] = cloud_siem_events_sum + if cloud_siem_indexed_logs_sum is not unset: + kwargs["cloud_siem_indexed_logs_sum"] = cloud_siem_indexed_logs_sum if code_analysis_sa_committers_hwm is not unset: kwargs["code_analysis_sa_committers_hwm"] = code_analysis_sa_committers_hwm if code_analysis_sca_committers_hwm is not unset: @@ -2050,6 +2070,10 @@ def __init__( ] = serverless_apps_infra_gcp_gke_autopilot_pods_avg if serverless_apps_total_count_avg is not unset: kwargs["serverless_apps_total_count_avg"] = serverless_apps_total_count_avg + if siem_12mo_retention_sum is not unset: + kwargs["siem_12mo_retention_sum"] = siem_12mo_retention_sum + if siem_6mo_retention_sum is not unset: + kwargs["siem_6mo_retention_sum"] = siem_6mo_retention_sum if siem_analyzed_logs_add_on_count_sum is not unset: kwargs["siem_analyzed_logs_add_on_count_sum"] = siem_analyzed_logs_add_on_count_sum if synthetics_browser_check_calls_count_sum is not unset: diff --git a/src/datadog_api_client/v1/model/usage_summary_date_org.py b/src/datadog_api_client/v1/model/usage_summary_date_org.py index fcd36aed48..6b23851e59 100644 --- a/src/datadog_api_client/v1/model/usage_summary_date_org.py +++ b/src/datadog_api_client/v1/model/usage_summary_date_org.py @@ -67,6 +67,7 @@ def openapi_types(_): "cloud_cost_management_host_count_avg": (int,), "cloud_cost_management_oci_host_count_avg": (int,), "cloud_siem_events_sum": (int,), + "cloud_siem_indexed_logs_sum": (int,), "code_analysis_sa_committers_hwm": (int,), "code_analysis_sca_committers_hwm": (int,), "code_security_host_top99p": (int,), @@ -259,6 +260,8 @@ def openapi_types(_): "serverless_apps_google_count_avg": (int,), "serverless_apps_infra_gcp_gke_autopilot_pods_avg": (int,), "serverless_apps_total_count_avg": (int,), + "siem_12mo_retention_sum": (int,), + "siem_6mo_retention_sum": (int,), "siem_analyzed_logs_add_on_count_sum": (int,), "synthetics_browser_check_calls_count_sum": (int,), "synthetics_check_calls_count_sum": (int,), @@ -323,6 +326,7 @@ def openapi_types(_): "cloud_cost_management_host_count_avg": "cloud_cost_management_host_count_avg", "cloud_cost_management_oci_host_count_avg": "cloud_cost_management_oci_host_count_avg", "cloud_siem_events_sum": "cloud_siem_events_sum", + "cloud_siem_indexed_logs_sum": "cloud_siem_indexed_logs_sum", "code_analysis_sa_committers_hwm": "code_analysis_sa_committers_hwm", "code_analysis_sca_committers_hwm": "code_analysis_sca_committers_hwm", "code_security_host_top99p": "code_security_host_top99p", @@ -515,6 +519,8 @@ def openapi_types(_): "serverless_apps_google_count_avg": "serverless_apps_google_count_avg", "serverless_apps_infra_gcp_gke_autopilot_pods_avg": "serverless_apps_infra_gcp_gke_autopilot_pods_avg", "serverless_apps_total_count_avg": "serverless_apps_total_count_avg", + "siem_12mo_retention_sum": "siem_12mo_retention_sum", + "siem_6mo_retention_sum": "siem_6mo_retention_sum", "siem_analyzed_logs_add_on_count_sum": "siem_analyzed_logs_add_on_count_sum", "synthetics_browser_check_calls_count_sum": "synthetics_browser_check_calls_count_sum", "synthetics_check_calls_count_sum": "synthetics_check_calls_count_sum", @@ -580,6 +586,7 @@ def __init__( cloud_cost_management_host_count_avg: Union[int, UnsetType] = unset, cloud_cost_management_oci_host_count_avg: Union[int, UnsetType] = unset, cloud_siem_events_sum: Union[int, UnsetType] = unset, + cloud_siem_indexed_logs_sum: Union[int, UnsetType] = unset, code_analysis_sa_committers_hwm: Union[int, UnsetType] = unset, code_analysis_sca_committers_hwm: Union[int, UnsetType] = unset, code_security_host_top99p: Union[int, UnsetType] = unset, @@ -772,6 +779,8 @@ def __init__( serverless_apps_google_count_avg: Union[int, UnsetType] = unset, serverless_apps_infra_gcp_gke_autopilot_pods_avg: Union[int, UnsetType] = unset, serverless_apps_total_count_avg: Union[int, UnsetType] = unset, + siem_12mo_retention_sum: Union[int, UnsetType] = unset, + siem_6mo_retention_sum: Union[int, UnsetType] = unset, siem_analyzed_logs_add_on_count_sum: Union[int, UnsetType] = unset, synthetics_browser_check_calls_count_sum: Union[int, UnsetType] = unset, synthetics_check_calls_count_sum: Union[int, UnsetType] = unset, @@ -938,6 +947,9 @@ def __init__( :param cloud_siem_events_sum: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current date for the given org. :type cloud_siem_events_sum: int, optional + :param cloud_siem_indexed_logs_sum: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current date for the given org. + :type cloud_siem_indexed_logs_sum: int, optional + :param code_analysis_sa_committers_hwm: Shows the high-water mark of all Static Analysis committers over all hours in the current date for the given org. :type code_analysis_sa_committers_hwm: int, optional @@ -1514,6 +1526,12 @@ def __init__( :param serverless_apps_total_count_avg: Shows the average number of Serverless Apps for Azure and Google Cloud for the given date and given org. :type serverless_apps_total_count_avg: int, optional + :param siem_12mo_retention_sum: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current date for the given org. + :type siem_12mo_retention_sum: int, optional + + :param siem_6mo_retention_sum: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current date for the given org. + :type siem_6mo_retention_sum: int, optional + :param siem_analyzed_logs_add_on_count_sum: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current date for the given org. :type siem_analyzed_logs_add_on_count_sum: int, optional @@ -1647,6 +1665,8 @@ def __init__( kwargs["cloud_cost_management_oci_host_count_avg"] = cloud_cost_management_oci_host_count_avg if cloud_siem_events_sum is not unset: kwargs["cloud_siem_events_sum"] = cloud_siem_events_sum + if cloud_siem_indexed_logs_sum is not unset: + kwargs["cloud_siem_indexed_logs_sum"] = cloud_siem_indexed_logs_sum if code_analysis_sa_committers_hwm is not unset: kwargs["code_analysis_sa_committers_hwm"] = code_analysis_sa_committers_hwm if code_analysis_sca_committers_hwm is not unset: @@ -2091,6 +2111,10 @@ def __init__( ] = serverless_apps_infra_gcp_gke_autopilot_pods_avg if serverless_apps_total_count_avg is not unset: kwargs["serverless_apps_total_count_avg"] = serverless_apps_total_count_avg + if siem_12mo_retention_sum is not unset: + kwargs["siem_12mo_retention_sum"] = siem_12mo_retention_sum + if siem_6mo_retention_sum is not unset: + kwargs["siem_6mo_retention_sum"] = siem_6mo_retention_sum if siem_analyzed_logs_add_on_count_sum is not unset: kwargs["siem_analyzed_logs_add_on_count_sum"] = siem_analyzed_logs_add_on_count_sum if synthetics_browser_check_calls_count_sum is not unset: diff --git a/src/datadog_api_client/v1/model/usage_summary_response.py b/src/datadog_api_client/v1/model/usage_summary_response.py index 73445e94af..8de4996bb9 100644 --- a/src/datadog_api_client/v1/model/usage_summary_response.py +++ b/src/datadog_api_client/v1/model/usage_summary_response.py @@ -75,6 +75,7 @@ def openapi_types(_): "cloud_cost_management_host_count_avg_sum": (int,), "cloud_cost_management_oci_host_count_avg_sum": (int,), "cloud_siem_events_agg_sum": (int,), + "cloud_siem_indexed_logs_agg_sum": (int,), "code_analysis_sa_committers_hwm_sum": (int,), "code_analysis_sca_committers_hwm_sum": (int,), "code_security_host_top99p_sum": (int,), @@ -271,6 +272,8 @@ def openapi_types(_): "serverless_apps_google_count_avg_sum": (int,), "serverless_apps_infra_gcp_gke_autopilot_pods_avg_sum": (int,), "serverless_apps_total_count_avg_sum": (int,), + "siem_12mo_retention_agg_sum": (int,), + "siem_6mo_retention_agg_sum": (int,), "siem_analyzed_logs_add_on_count_agg_sum": (int,), "start_date": (datetime,), "synthetics_browser_check_calls_count_agg_sum": (int,), @@ -336,6 +339,7 @@ def openapi_types(_): "cloud_cost_management_host_count_avg_sum": "cloud_cost_management_host_count_avg_sum", "cloud_cost_management_oci_host_count_avg_sum": "cloud_cost_management_oci_host_count_avg_sum", "cloud_siem_events_agg_sum": "cloud_siem_events_agg_sum", + "cloud_siem_indexed_logs_agg_sum": "cloud_siem_indexed_logs_agg_sum", "code_analysis_sa_committers_hwm_sum": "code_analysis_sa_committers_hwm_sum", "code_analysis_sca_committers_hwm_sum": "code_analysis_sca_committers_hwm_sum", "code_security_host_top99p_sum": "code_security_host_top99p_sum", @@ -532,6 +536,8 @@ def openapi_types(_): "serverless_apps_google_count_avg_sum": "serverless_apps_google_count_avg_sum", "serverless_apps_infra_gcp_gke_autopilot_pods_avg_sum": "serverless_apps_infra_gcp_gke_autopilot_pods_avg_sum", "serverless_apps_total_count_avg_sum": "serverless_apps_total_count_avg_sum", + "siem_12mo_retention_agg_sum": "siem_12mo_retention_agg_sum", + "siem_6mo_retention_agg_sum": "siem_6mo_retention_agg_sum", "siem_analyzed_logs_add_on_count_agg_sum": "siem_analyzed_logs_add_on_count_agg_sum", "start_date": "start_date", "synthetics_browser_check_calls_count_agg_sum": "synthetics_browser_check_calls_count_agg_sum", @@ -598,6 +604,7 @@ def __init__( cloud_cost_management_host_count_avg_sum: Union[int, UnsetType] = unset, cloud_cost_management_oci_host_count_avg_sum: Union[int, UnsetType] = unset, cloud_siem_events_agg_sum: Union[int, UnsetType] = unset, + cloud_siem_indexed_logs_agg_sum: Union[int, UnsetType] = unset, code_analysis_sa_committers_hwm_sum: Union[int, UnsetType] = unset, code_analysis_sca_committers_hwm_sum: Union[int, UnsetType] = unset, code_security_host_top99p_sum: Union[int, UnsetType] = unset, @@ -794,6 +801,8 @@ def __init__( serverless_apps_google_count_avg_sum: Union[int, UnsetType] = unset, serverless_apps_infra_gcp_gke_autopilot_pods_avg_sum: Union[int, UnsetType] = unset, serverless_apps_total_count_avg_sum: Union[int, UnsetType] = unset, + siem_12mo_retention_agg_sum: Union[int, UnsetType] = unset, + siem_6mo_retention_agg_sum: Union[int, UnsetType] = unset, siem_analyzed_logs_add_on_count_agg_sum: Union[int, UnsetType] = unset, start_date: Union[datetime, UnsetType] = unset, synthetics_browser_check_calls_count_agg_sum: Union[int, UnsetType] = unset, @@ -959,6 +968,9 @@ def __init__( :param cloud_siem_events_agg_sum: Shows the sum of all Cloud Security Information and Event Management events over all hours in the current month for all organizations. :type cloud_siem_events_agg_sum: int, optional + :param cloud_siem_indexed_logs_agg_sum: Shows the sum of all Cloud SIEM Indexed Logs over all hours in the current month for all organizations. + :type cloud_siem_indexed_logs_agg_sum: int, optional + :param code_analysis_sa_committers_hwm_sum: Shows the high-water mark of all Static Analysis committers over all hours in the current month for all organizations. :type code_analysis_sa_committers_hwm_sum: int, optional @@ -1547,6 +1559,12 @@ def __init__( :param serverless_apps_total_count_avg_sum: Sum of the average number of Serverless Apps for Azure and Google Cloud in the current month for all organizations. :type serverless_apps_total_count_avg_sum: int, optional + :param siem_12mo_retention_agg_sum: Shows the sum of Cloud SIEM Indexed Logs (12-month retention) over all hours in the current month for all organizations. + :type siem_12mo_retention_agg_sum: int, optional + + :param siem_6mo_retention_agg_sum: Shows the sum of Cloud SIEM Indexed Logs (6-month retention) over all hours in the current month for all organizations. + :type siem_6mo_retention_agg_sum: int, optional + :param siem_analyzed_logs_add_on_count_agg_sum: Shows the sum of all log events analyzed by Cloud SIEM over all hours in the current month for all organizations. :type siem_analyzed_logs_add_on_count_agg_sum: int, optional @@ -1684,6 +1702,8 @@ def __init__( kwargs["cloud_cost_management_oci_host_count_avg_sum"] = cloud_cost_management_oci_host_count_avg_sum if cloud_siem_events_agg_sum is not unset: kwargs["cloud_siem_events_agg_sum"] = cloud_siem_events_agg_sum + if cloud_siem_indexed_logs_agg_sum is not unset: + kwargs["cloud_siem_indexed_logs_agg_sum"] = cloud_siem_indexed_logs_agg_sum if code_analysis_sa_committers_hwm_sum is not unset: kwargs["code_analysis_sa_committers_hwm_sum"] = code_analysis_sa_committers_hwm_sum if code_analysis_sca_committers_hwm_sum is not unset: @@ -2156,6 +2176,10 @@ def __init__( ] = serverless_apps_infra_gcp_gke_autopilot_pods_avg_sum if serverless_apps_total_count_avg_sum is not unset: kwargs["serverless_apps_total_count_avg_sum"] = serverless_apps_total_count_avg_sum + if siem_12mo_retention_agg_sum is not unset: + kwargs["siem_12mo_retention_agg_sum"] = siem_12mo_retention_agg_sum + if siem_6mo_retention_agg_sum is not unset: + kwargs["siem_6mo_retention_agg_sum"] = siem_6mo_retention_agg_sum if siem_analyzed_logs_add_on_count_agg_sum is not unset: kwargs["siem_analyzed_logs_add_on_count_agg_sum"] = siem_analyzed_logs_add_on_count_agg_sum if start_date is not unset: diff --git a/tests/v1/features/monitors.feature b/tests/v1/features/monitors.feature index e3e5ca6c41..73ed30421f 100644 --- a/tests/v1/features/monitors.feature +++ b/tests/v1/features/monitors.feature @@ -219,7 +219,7 @@ Feature: Monitors Scenario: Edit a monitor returns "Bad Request" response Given new "UpdateMonitor" request And request contains "monitor_id" parameter from "REPLACE.ME" - And body with value {"assets": [{"category": "runbook", "name": "Monitor Runbook", "resource_key": "12345", "resource_type": "notebook", "url": "/notebooks/12345"}], "draft_status": "published", "options": {"evaluation_delay": null, "include_tags": true, "min_failure_duration": 0, "min_location_failed": 1, "new_group_delay": null, "new_host_delay": 300, "no_data_timeframe": null, "notification_preset_name": "show_all", "notify_audit": false, "notify_by": [], "on_missing_data": "default", "renotify_interval": null, "renotify_occurrences": null, "renotify_statuses": ["alert"], "scheduling_options": {"custom_schedule": {"recurrences": [{"rrule": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR", "start": "2023-08-31T16:30:00", "timezone": "Europe/Paris"}]}, "evaluation_window": {"day_starts": "04:00", "hour_starts": 0, "month_starts": 1, "timezone": "Europe/Paris"}}, "synthetics_check_id": null, "threshold_windows": {"recovery_window": null, "trigger_window": null}, "thresholds": {"critical_query": "formula(\"2 * query1\").rollup(\"avg\").last(\"6mo\")", "critical_recovery": null, "critical_recovery_query": "formula(\"1.5 * query1\").rollup(\"avg\").last(\"3mo\")", "ok": null, "unknown": null, "warning": null, "warning_recovery": null}, "timeout_h": null, "variables": [{"compute": {"aggregation": "avg", "interval": 60000, "metric": "@duration", "name": "compute_result", "source": "filter_query"}, "data_source": "rum", "group_by": [{"facet": "status", "limit": 10, "sort": {"aggregation": "avg", "order": "desc"}, "source": "filter_query"}], "indexes": ["days-3", "days-7"], "name": "query_errors", "search": {"query": "service:query"}}]}, "priority": null, "restricted_roles": [], "tags": [], "type": "query alert"} + And body with value {"assets": [{"category": "runbook", "name": "Monitor Runbook", "resource_key": "12345", "resource_type": "notebook", "url": "/notebooks/12345"}], "draft_status": "published", "options": {"evaluation_delay": null, "include_tags": true, "min_failure_duration": 0, "min_location_failed": 1, "new_group_delay": null, "new_host_delay": 300, "no_data_timeframe": null, "notification_preset_name": "show_all", "notify_audit": false, "notify_by": [], "on_missing_data": "default", "renotify_interval": null, "renotify_occurrences": null, "renotify_statuses": ["alert"], "scheduling_options": {"custom_schedule": {"recurrences": [{"rrule": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR", "start": "2023-08-31T16:30:00", "timezone": "Europe/Paris"}]}, "evaluation_window": {"day_starts": "04:00", "hour_starts": 0, "month_starts": 1, "timezone": "Europe/Paris"}}, "synthetics_check_id": null, "threshold_windows": {"recovery_window": null, "trigger_window": null}, "thresholds": {"critical_recovery": null, "ok": null, "unknown": null, "warning": null, "warning_recovery": null}, "timeout_h": null, "variables": [{"compute": {"aggregation": "avg", "interval": 60000, "metric": "@duration", "name": "compute_result", "source": "filter_query"}, "data_source": "rum", "group_by": [{"facet": "status", "limit": 10, "sort": {"aggregation": "avg", "order": "desc"}, "source": "filter_query"}], "indexes": ["days-3", "days-7"], "name": "query_errors", "search": {"query": "service:query"}}]}, "priority": null, "restricted_roles": [], "tags": [], "type": "query alert"} When the request is sent Then the response status is 400 Bad Request