Skip to content

Commit

Permalink
add ASM serverless to usage metering API docs (#1876)
Browse files Browse the repository at this point in the history
Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
  • Loading branch information
api-clients-generation-pipeline[bot] and ci.datadog-api-spec authored Feb 22, 2024
1 parent b2664c5 commit 637076f
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-02-21 20:20:09.813942",
"spec_repo_commit": "90ae1ed9"
"regenerated": "2024-02-21 21:43:32.537459",
"spec_repo_commit": "ea7f4c9f"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-02-21 20:20:09.828646",
"spec_repo_commit": "90ae1ed9"
"regenerated": "2024-02-21 21:43:32.552447",
"spec_repo_commit": "ea7f4c9f"
}
}
}
23 changes: 23 additions & 0 deletions .generator/schemas/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16870,6 +16870,8 @@ components:
- appsec_fargate_percentage
- estimated_rum_usage_attribution_usage
- estimated_rum_usage_attribution_percentage
- asm_serverless_traced_invocations_usage
- asm_serverless_traced_invocations_percentage
type: string
x-enum-varnames:
- API_PERCENTAGE
Expand Down Expand Up @@ -16908,6 +16910,8 @@ components:
- APPSEC_FARGATE_PERCENTAGE
- ESTIMATED_RUM_USAGE_ATTRIBUTION_USAGE
- ESTIMATED_RUM_USAGE_ATTRIBUTION_PERCENTAGE
- ASM_SERVERLESS_TRACED_INVOCATIONS_USAGE
- ASM_SERVERLESS_TRACED_INVOCATIONS_PERCENTAGE
UsageAttributionSupportedMetrics:
description: Supported fields for usage attribution requests (valid requests
contain one or more metrics, or `*` for all).
Expand Down Expand Up @@ -16958,6 +16962,8 @@ components:
- appsec_fargate_percentage
- estimated_rum_usage_attribution_usage
- estimated_rum_usage_attribution_percentage
- asm_serverless_traced_invocations_usage
- asm_serverless_traced_invocations_percentage
- '*'
type: string
x-enum-varnames:
Expand Down Expand Up @@ -17007,6 +17013,8 @@ components:
- APPSEC_FARGATE_PERCENTAGE
- ESTIMATED_RUM_USAGE_ATTRIBUTION_USAGE
- ESTIMATED_RUM_USAGE_ATTRIBUTION_PERCENTAGE
- ASM_SERVERLESS_TRACED_INVOCATIONS_USAGE
- ASM_SERVERLESS_TRACED_INVOCATIONS_PERCENTAGE
- ALL
UsageAttributionTagNames:
additionalProperties:
Expand Down Expand Up @@ -18717,6 +18725,11 @@ components:
Fargate tasks over all hours in the current date for all organizations.
format: int64
type: integer
asm_serverless_sum:
description: Shows the sum of all Application Security Monitoring Serverless
invocations over all hours in the current date for all organizations.
format: int64
type: integer
audit_logs_lines_indexed_sum:
deprecated: true
description: Shows the sum of audit logs lines indexed over all hours in
Expand Down Expand Up @@ -19247,6 +19260,11 @@ components:
Fargate tasks over all hours in the current months for the given org.
format: int64
type: integer
asm_serverless_sum:
description: Shows the sum of all Application Security Monitoring Serverless
invocations over all hours in the current month for the given org.
format: int64
type: integer
audit_logs_lines_indexed_sum:
deprecated: true
description: Shows the sum of all audit logs lines indexed over all hours
Expand Down Expand Up @@ -19790,6 +19808,11 @@ components:
Fargate tasks over all hours in the current months for all organizations.
format: int64
type: integer
asm_serverless_agg_sum:
description: Shows the sum of all Application Security Monitoring Serverless
invocations over all hours in the current months for all organizations.
format: int64
type: integer
audit_logs_lines_indexed_agg_sum:
deprecated: true
description: Shows the sum of all audit logs lines indexed over all hours
Expand Down
12 changes: 11 additions & 1 deletion src/datadog_api_client/v1/model/usage_attribution_sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class UsageAttributionSort(ModelSimple):
"""
The field to sort by.
:param value: If omitted defaults to "custom_timeseries_usage". Must be one of ["api_percentage", "snmp_usage", "apm_host_usage", "api_usage", "appsec_usage", "appsec_percentage", "container_usage", "custom_timeseries_percentage", "container_percentage", "apm_host_percentage", "npm_host_percentage", "browser_percentage", "browser_usage", "infra_host_percentage", "snmp_percentage", "npm_host_usage", "infra_host_usage", "custom_timeseries_usage", "lambda_functions_usage", "lambda_functions_percentage", "lambda_invocations_usage", "lambda_invocations_percentage", "estimated_indexed_logs_usage", "estimated_indexed_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_logs_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "apm_fargate_usage", "apm_fargate_percentage", "appsec_fargate_usage", "appsec_fargate_percentage", "estimated_rum_usage_attribution_usage", "estimated_rum_usage_attribution_percentage"].
:param value: If omitted defaults to "custom_timeseries_usage". Must be one of ["api_percentage", "snmp_usage", "apm_host_usage", "api_usage", "appsec_usage", "appsec_percentage", "container_usage", "custom_timeseries_percentage", "container_percentage", "apm_host_percentage", "npm_host_percentage", "browser_percentage", "browser_usage", "infra_host_percentage", "snmp_percentage", "npm_host_usage", "infra_host_usage", "custom_timeseries_usage", "lambda_functions_usage", "lambda_functions_percentage", "lambda_invocations_usage", "lambda_invocations_percentage", "estimated_indexed_logs_usage", "estimated_indexed_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_logs_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "apm_fargate_usage", "apm_fargate_percentage", "appsec_fargate_usage", "appsec_fargate_percentage", "estimated_rum_usage_attribution_usage", "estimated_rum_usage_attribution_percentage", "asm_serverless_traced_invocations_usage", "asm_serverless_traced_invocations_percentage"].
:type value: str
"""

Expand Down Expand Up @@ -57,6 +57,8 @@ class UsageAttributionSort(ModelSimple):
"appsec_fargate_percentage",
"estimated_rum_usage_attribution_usage",
"estimated_rum_usage_attribution_percentage",
"asm_serverless_traced_invocations_usage",
"asm_serverless_traced_invocations_percentage",
}
API_PERCENTAGE: ClassVar["UsageAttributionSort"]
SNMP_USAGE: ClassVar["UsageAttributionSort"]
Expand Down Expand Up @@ -94,6 +96,8 @@ class UsageAttributionSort(ModelSimple):
APPSEC_FARGATE_PERCENTAGE: ClassVar["UsageAttributionSort"]
ESTIMATED_RUM_USAGE_ATTRIBUTION_USAGE: ClassVar["UsageAttributionSort"]
ESTIMATED_RUM_USAGE_ATTRIBUTION_PERCENTAGE: ClassVar["UsageAttributionSort"]
ASM_SERVERLESS_TRACED_INVOCATIONS_USAGE: ClassVar["UsageAttributionSort"]
ASM_SERVERLESS_TRACED_INVOCATIONS_PERCENTAGE: ClassVar["UsageAttributionSort"]

@cached_property
def openapi_types(_):
Expand Down Expand Up @@ -142,3 +146,9 @@ def openapi_types(_):
UsageAttributionSort.ESTIMATED_RUM_USAGE_ATTRIBUTION_PERCENTAGE = UsageAttributionSort(
"estimated_rum_usage_attribution_percentage"
)
UsageAttributionSort.ASM_SERVERLESS_TRACED_INVOCATIONS_USAGE = UsageAttributionSort(
"asm_serverless_traced_invocations_usage"
)
UsageAttributionSort.ASM_SERVERLESS_TRACED_INVOCATIONS_PERCENTAGE = UsageAttributionSort(
"asm_serverless_traced_invocations_percentage"
)
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class UsageAttributionSupportedMetrics(ModelSimple):
"""
Supported fields for usage attribution requests (valid requests contain one or more metrics, or `*` for all).
:param value: Must be one of ["custom_timeseries_usage", "container_usage", "snmp_percentage", "apm_host_usage", "browser_usage", "npm_host_percentage", "infra_host_usage", "custom_timeseries_percentage", "container_percentage", "api_usage", "apm_host_percentage", "infra_host_percentage", "snmp_usage", "browser_percentage", "api_percentage", "npm_host_usage", "lambda_functions_usage", "lambda_functions_percentage", "lambda_invocations_usage", "lambda_invocations_percentage", "fargate_usage", "fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "profiled_container_usage", "profiled_container_percentage", "dbm_hosts_usage", "dbm_hosts_percentage", "dbm_queries_usage", "dbm_queries_percentage", "estimated_indexed_logs_usage", "estimated_indexed_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_logs_percentage", "appsec_usage", "appsec_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "apm_fargate_usage", "apm_fargate_percentage", "appsec_fargate_usage", "appsec_fargate_percentage", "estimated_rum_usage_attribution_usage", "estimated_rum_usage_attribution_percentage", "*"].
:param value: Must be one of ["custom_timeseries_usage", "container_usage", "snmp_percentage", "apm_host_usage", "browser_usage", "npm_host_percentage", "infra_host_usage", "custom_timeseries_percentage", "container_percentage", "api_usage", "apm_host_percentage", "infra_host_percentage", "snmp_usage", "browser_percentage", "api_percentage", "npm_host_usage", "lambda_functions_usage", "lambda_functions_percentage", "lambda_invocations_usage", "lambda_invocations_percentage", "fargate_usage", "fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "profiled_container_usage", "profiled_container_percentage", "dbm_hosts_usage", "dbm_hosts_percentage", "dbm_queries_usage", "dbm_queries_percentage", "estimated_indexed_logs_usage", "estimated_indexed_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_logs_percentage", "appsec_usage", "appsec_percentage", "estimated_indexed_spans_usage", "estimated_indexed_spans_percentage", "estimated_ingested_spans_usage", "estimated_ingested_spans_percentage", "apm_fargate_usage", "apm_fargate_percentage", "appsec_fargate_usage", "appsec_fargate_percentage", "estimated_rum_usage_attribution_usage", "estimated_rum_usage_attribution_percentage", "asm_serverless_traced_invocations_usage", "asm_serverless_traced_invocations_percentage", "*"].
:type value: str
"""

Expand Down Expand Up @@ -67,6 +67,8 @@ class UsageAttributionSupportedMetrics(ModelSimple):
"appsec_fargate_percentage",
"estimated_rum_usage_attribution_usage",
"estimated_rum_usage_attribution_percentage",
"asm_serverless_traced_invocations_usage",
"asm_serverless_traced_invocations_percentage",
"*",
}
CUSTOM_TIMESERIES_USAGE: ClassVar["UsageAttributionSupportedMetrics"]
Expand Down Expand Up @@ -115,6 +117,8 @@ class UsageAttributionSupportedMetrics(ModelSimple):
APPSEC_FARGATE_PERCENTAGE: ClassVar["UsageAttributionSupportedMetrics"]
ESTIMATED_RUM_USAGE_ATTRIBUTION_USAGE: ClassVar["UsageAttributionSupportedMetrics"]
ESTIMATED_RUM_USAGE_ATTRIBUTION_PERCENTAGE: ClassVar["UsageAttributionSupportedMetrics"]
ASM_SERVERLESS_TRACED_INVOCATIONS_USAGE: ClassVar["UsageAttributionSupportedMetrics"]
ASM_SERVERLESS_TRACED_INVOCATIONS_PERCENTAGE: ClassVar["UsageAttributionSupportedMetrics"]
ALL: ClassVar["UsageAttributionSupportedMetrics"]

@cached_property
Expand Down Expand Up @@ -200,4 +204,10 @@ def openapi_types(_):
UsageAttributionSupportedMetrics.ESTIMATED_RUM_USAGE_ATTRIBUTION_PERCENTAGE = UsageAttributionSupportedMetrics(
"estimated_rum_usage_attribution_percentage"
)
UsageAttributionSupportedMetrics.ASM_SERVERLESS_TRACED_INVOCATIONS_USAGE = UsageAttributionSupportedMetrics(
"asm_serverless_traced_invocations_usage"
)
UsageAttributionSupportedMetrics.ASM_SERVERLESS_TRACED_INVOCATIONS_PERCENTAGE = UsageAttributionSupportedMetrics(
"asm_serverless_traced_invocations_percentage"
)
UsageAttributionSupportedMetrics.ALL = UsageAttributionSupportedMetrics("*")
8 changes: 8 additions & 0 deletions src/datadog_api_client/v1/model/usage_summary_date.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def openapi_types(_):
"apm_fargate_count_avg": (int,),
"apm_host_top99p": (int,),
"appsec_fargate_count_avg": (int,),
"asm_serverless_sum": (int,),
"audit_logs_lines_indexed_sum": (int,),
"audit_trail_enabled_hwm": (int,),
"avg_profiled_fargate_tasks": (int,),
Expand Down Expand Up @@ -136,6 +137,7 @@ def openapi_types(_):
"apm_fargate_count_avg": "apm_fargate_count_avg",
"apm_host_top99p": "apm_host_top99p",
"appsec_fargate_count_avg": "appsec_fargate_count_avg",
"asm_serverless_sum": "asm_serverless_sum",
"audit_logs_lines_indexed_sum": "audit_logs_lines_indexed_sum",
"audit_trail_enabled_hwm": "audit_trail_enabled_hwm",
"avg_profiled_fargate_tasks": "avg_profiled_fargate_tasks",
Expand Down Expand Up @@ -243,6 +245,7 @@ def __init__(
apm_fargate_count_avg: Union[int, UnsetType] = unset,
apm_host_top99p: Union[int, UnsetType] = unset,
appsec_fargate_count_avg: Union[int, UnsetType] = unset,
asm_serverless_sum: Union[int, UnsetType] = unset,
audit_logs_lines_indexed_sum: Union[int, UnsetType] = unset,
audit_trail_enabled_hwm: Union[int, UnsetType] = unset,
avg_profiled_fargate_tasks: Union[int, UnsetType] = unset,
Expand Down Expand Up @@ -363,6 +366,9 @@ def __init__(
:param appsec_fargate_count_avg: Shows the average of all Application Security Monitoring ECS Fargate tasks over all hours in the current date for all organizations.
:type appsec_fargate_count_avg: int, optional
:param asm_serverless_sum: Shows the sum of all Application Security Monitoring Serverless invocations over all hours in the current date for all organizations.
:type asm_serverless_sum: int, optional
:param audit_logs_lines_indexed_sum: Shows the sum of audit logs lines indexed over all hours in the current date for all organizations. **Deprecated**.
:type audit_logs_lines_indexed_sum: int, optional
Expand Down Expand Up @@ -666,6 +672,8 @@ def __init__(
kwargs["apm_host_top99p"] = apm_host_top99p
if appsec_fargate_count_avg is not unset:
kwargs["appsec_fargate_count_avg"] = appsec_fargate_count_avg
if asm_serverless_sum is not unset:
kwargs["asm_serverless_sum"] = asm_serverless_sum
if audit_logs_lines_indexed_sum is not unset:
kwargs["audit_logs_lines_indexed_sum"] = audit_logs_lines_indexed_sum
if audit_trail_enabled_hwm is not unset:
Expand Down
8 changes: 8 additions & 0 deletions src/datadog_api_client/v1/model/usage_summary_date_org.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def openapi_types(_):
"apm_fargate_count_avg": (int,),
"apm_host_top99p": (int,),
"appsec_fargate_count_avg": (int,),
"asm_serverless_sum": (int,),
"audit_logs_lines_indexed_sum": (int,),
"audit_trail_enabled_hwm": (int,),
"avg_profiled_fargate_tasks": (int,),
Expand Down Expand Up @@ -133,6 +134,7 @@ def openapi_types(_):
"apm_fargate_count_avg": "apm_fargate_count_avg",
"apm_host_top99p": "apm_host_top99p",
"appsec_fargate_count_avg": "appsec_fargate_count_avg",
"asm_serverless_sum": "asm_serverless_sum",
"audit_logs_lines_indexed_sum": "audit_logs_lines_indexed_sum",
"audit_trail_enabled_hwm": "audit_trail_enabled_hwm",
"avg_profiled_fargate_tasks": "avg_profiled_fargate_tasks",
Expand Down Expand Up @@ -244,6 +246,7 @@ def __init__(
apm_fargate_count_avg: Union[int, UnsetType] = unset,
apm_host_top99p: Union[int, UnsetType] = unset,
appsec_fargate_count_avg: Union[int, UnsetType] = unset,
asm_serverless_sum: Union[int, UnsetType] = unset,
audit_logs_lines_indexed_sum: Union[int, UnsetType] = unset,
audit_trail_enabled_hwm: Union[int, UnsetType] = unset,
avg_profiled_fargate_tasks: Union[int, UnsetType] = unset,
Expand Down Expand Up @@ -368,6 +371,9 @@ def __init__(
:param appsec_fargate_count_avg: Shows the average of all Application Security Monitoring ECS Fargate tasks over all hours in the current months for the given org.
:type appsec_fargate_count_avg: int, optional
:param asm_serverless_sum: Shows the sum of all Application Security Monitoring Serverless invocations over all hours in the current month for the given org.
:type asm_serverless_sum: int, optional
:param audit_logs_lines_indexed_sum: Shows the sum of all audit logs lines indexed over all hours in the current date for the given org. **Deprecated**.
:type audit_logs_lines_indexed_sum: int, optional
Expand Down Expand Up @@ -683,6 +689,8 @@ def __init__(
kwargs["apm_host_top99p"] = apm_host_top99p
if appsec_fargate_count_avg is not unset:
kwargs["appsec_fargate_count_avg"] = appsec_fargate_count_avg
if asm_serverless_sum is not unset:
kwargs["asm_serverless_sum"] = asm_serverless_sum
if audit_logs_lines_indexed_sum is not unset:
kwargs["audit_logs_lines_indexed_sum"] = audit_logs_lines_indexed_sum
if audit_trail_enabled_hwm is not unset:
Expand Down
8 changes: 8 additions & 0 deletions src/datadog_api_client/v1/model/usage_summary_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def openapi_types(_):
"apm_fargate_count_avg_sum": (int,),
"apm_host_top99p_sum": (int,),
"appsec_fargate_count_avg_sum": (int,),
"asm_serverless_agg_sum": (int,),
"audit_logs_lines_indexed_agg_sum": (int,),
"audit_trail_enabled_hwm_sum": (int,),
"avg_profiled_fargate_tasks_sum": (int,),
Expand Down Expand Up @@ -149,6 +150,7 @@ def openapi_types(_):
"apm_fargate_count_avg_sum": "apm_fargate_count_avg_sum",
"apm_host_top99p_sum": "apm_host_top99p_sum",
"appsec_fargate_count_avg_sum": "appsec_fargate_count_avg_sum",
"asm_serverless_agg_sum": "asm_serverless_agg_sum",
"audit_logs_lines_indexed_agg_sum": "audit_logs_lines_indexed_agg_sum",
"audit_trail_enabled_hwm_sum": "audit_trail_enabled_hwm_sum",
"avg_profiled_fargate_tasks_sum": "avg_profiled_fargate_tasks_sum",
Expand Down Expand Up @@ -267,6 +269,7 @@ def __init__(
apm_fargate_count_avg_sum: Union[int, UnsetType] = unset,
apm_host_top99p_sum: Union[int, UnsetType] = unset,
appsec_fargate_count_avg_sum: Union[int, UnsetType] = unset,
asm_serverless_agg_sum: Union[int, UnsetType] = unset,
audit_logs_lines_indexed_agg_sum: Union[int, UnsetType] = unset,
audit_trail_enabled_hwm_sum: Union[int, UnsetType] = unset,
avg_profiled_fargate_tasks_sum: Union[int, UnsetType] = unset,
Expand Down Expand Up @@ -398,6 +401,9 @@ def __init__(
:param appsec_fargate_count_avg_sum: Shows the average of all Application Security Monitoring ECS Fargate tasks over all hours in the current months for all organizations.
:type appsec_fargate_count_avg_sum: int, optional
:param asm_serverless_agg_sum: Shows the sum of all Application Security Monitoring Serverless invocations over all hours in the current months for all organizations.
:type asm_serverless_agg_sum: int, optional
:param audit_logs_lines_indexed_agg_sum: Shows the sum of all audit logs lines indexed over all hours in the current months for all organizations. **Deprecated**.
:type audit_logs_lines_indexed_agg_sum: int, optional
Expand Down Expand Up @@ -734,6 +740,8 @@ def __init__(
kwargs["apm_host_top99p_sum"] = apm_host_top99p_sum
if appsec_fargate_count_avg_sum is not unset:
kwargs["appsec_fargate_count_avg_sum"] = appsec_fargate_count_avg_sum
if asm_serverless_agg_sum is not unset:
kwargs["asm_serverless_agg_sum"] = asm_serverless_agg_sum
if audit_logs_lines_indexed_agg_sum is not unset:
kwargs["audit_logs_lines_indexed_agg_sum"] = audit_logs_lines_indexed_agg_sum
if audit_trail_enabled_hwm_sum is not unset:
Expand Down

0 comments on commit 637076f

Please sign in to comment.