Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Usage Metering Cont Usage fields #1281

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.4",
"regenerated": "2022-12-28 16:11:06.259973",
"spec_repo_commit": "b2d7d94f"
"regenerated": "2022-12-28 17:38:36.087850",
"spec_repo_commit": "8cc05e11"
},
"v2": {
"apigentools_version": "1.6.4",
"regenerated": "2022-12-28 16:11:06.274362",
"spec_repo_commit": "b2d7d94f"
"regenerated": "2022-12-28 17:38:36.105011",
"spec_repo_commit": "8cc05e11"
}
}
}
15 changes: 15 additions & 0 deletions .generator/schemas/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3670,6 +3670,7 @@ components:
- profiled_host_usage
- snmp_usage
- estimated_rum_sessions_usage
- cont_usage
type: string
x-enum-varnames:
- API_USAGE
Expand Down Expand Up @@ -3700,6 +3701,7 @@ components:
- PROFILED_HOST_USAGE
- SNMP_USAGE
- ESTIMATED_RUM_SESSIONS_USAGE
- CONT_USAGE
IFrameWidgetDefinition:
description: The iframe widget allows you to embed a portion of any other web
page on your dashboard. Only available on FREE layout dashboards.
Expand Down Expand Up @@ -7028,6 +7030,8 @@ components:
- snmp_percentage
- estimated_rum_sessions_usage
- estimated_rum_sessions_percentage
- cont_usage
- cont_percentage
- '*'
type: string
x-enum-varnames:
Expand Down Expand Up @@ -7087,6 +7091,8 @@ components:
- SNMP_PERCENTAGE
- ESTIMATED_RUM_SESSIONS_USAGE
- ESTIMATED_RUM_SESSIONS_PERCENTAGE
- CONT_USAGE
- CONT_PERCENTAGE
- ALL
MonthlyUsageAttributionValues:
description: Fields in Usage Summary by tag(s).
Expand Down Expand Up @@ -7142,6 +7148,15 @@ components:
description: The synthetic browser test usage by tag(s).
format: double
type: number
cont_percentage:
description: The percentage of container usage without the Datadog Agent
by tag(s).
format: double
type: number
cont_usage:
description: The container usage without Datadog agent by tag(s).
format: double
type: number
container_percentage:
description: The percentage of container usage by tag(s).
format: double
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
"""
Supported products for hourly usage attribution requests.

:param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_hosts_usage", "dbm_hosts_usage", "dbm_queries_usage", "estimated_indexed_logs_usage", "estimated_ingested_logs_usage", "estimated_indexed_spans_usage", "estimated_ingested_spans_usage", "fargate_usage", "functions_usage", "indexed_logs_usage", "infra_host_usage", "invocations_usage", "npm_host_usage", "profiled_container_usage", "profiled_host_usage", "snmp_usage", "estimated_rum_sessions_usage"].
:param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_hosts_usage", "dbm_hosts_usage", "dbm_queries_usage", "estimated_indexed_logs_usage", "estimated_ingested_logs_usage", "estimated_indexed_spans_usage", "estimated_ingested_spans_usage", "fargate_usage", "functions_usage", "indexed_logs_usage", "infra_host_usage", "invocations_usage", "npm_host_usage", "profiled_container_usage", "profiled_host_usage", "snmp_usage", "estimated_rum_sessions_usage", "cont_usage"].
:type value: str
"""

Expand Down Expand Up @@ -49,6 +49,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
"profiled_host_usage",
"snmp_usage",
"estimated_rum_sessions_usage",
"cont_usage",
}
API_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
APM_FARGATE_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
Expand Down Expand Up @@ -78,6 +79,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
PROFILED_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
SNMP_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
CONT_USAGE: ClassVar["HourlyUsageAttributionUsageType"]

@cached_property
def openapi_types(_):
Expand Down Expand Up @@ -124,3 +126,4 @@ def openapi_types(_):
HourlyUsageAttributionUsageType.ESTIMATED_RUM_SESSIONS_USAGE = HourlyUsageAttributionUsageType(
"estimated_rum_sessions_usage"
)
HourlyUsageAttributionUsageType.CONT_USAGE = HourlyUsageAttributionUsageType("cont_usage")
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
"""
Supported metrics for monthly usage attribution requests.

: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", "appsec_usage", "appsec_percentage", "browser_usage", "browser_percentage", "container_usage", "container_percentage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_timeseries_usage", "custom_timeseries_percentage", "cws_containers_percentage", "cws_containers_usage", "cws_hosts_percentage", "cws_hosts_usage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "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", "fargate_usage", "fargate_percentage", "functions_usage", "functions_percentage", "indexed_logs_usage", "indexed_logs_percentage", "infra_host_usage", "infra_host_percentage", "invocations_usage", "invocations_percentage", "npm_host_usage", "npm_host_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_host_usage", "profiled_host_percentage", "snmp_usage", "snmp_percentage", "estimated_rum_sessions_usage", "estimated_rum_sessions_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", "appsec_usage", "appsec_percentage", "browser_usage", "browser_percentage", "container_usage", "container_percentage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_timeseries_usage", "custom_timeseries_percentage", "cws_containers_percentage", "cws_containers_usage", "cws_hosts_percentage", "cws_hosts_usage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "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", "fargate_usage", "fargate_percentage", "functions_usage", "functions_percentage", "indexed_logs_usage", "indexed_logs_percentage", "infra_host_usage", "infra_host_percentage", "invocations_usage", "invocations_percentage", "npm_host_usage", "npm_host_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_host_usage", "profiled_host_percentage", "snmp_usage", "snmp_percentage", "estimated_rum_sessions_usage", "estimated_rum_sessions_percentage", "cont_usage", "cont_percentage", "*"].
:type value: str
"""

Expand Down Expand Up @@ -77,6 +77,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
"snmp_percentage",
"estimated_rum_sessions_usage",
"estimated_rum_sessions_percentage",
"cont_usage",
"cont_percentage",
"*",
}
API_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
Expand Down Expand Up @@ -135,6 +137,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
SNMP_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
ESTIMATED_RUM_SESSIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
CONT_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
CONT_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
ALL: ClassVar["MonthlyUsageAttributionSupportedMetrics"]

@cached_property
Expand Down Expand Up @@ -274,4 +278,6 @@ def openapi_types(_):
MonthlyUsageAttributionSupportedMetrics.ESTIMATED_RUM_SESSIONS_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
"estimated_rum_sessions_percentage"
)
MonthlyUsageAttributionSupportedMetrics.CONT_USAGE = MonthlyUsageAttributionSupportedMetrics("cont_usage")
MonthlyUsageAttributionSupportedMetrics.CONT_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics("cont_percentage")
MonthlyUsageAttributionSupportedMetrics.ALL = MonthlyUsageAttributionSupportedMetrics("*")
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ def openapi_types(_):
"appsec_usage": (float,),
"browser_percentage": (float,),
"browser_usage": (float,),
"cont_percentage": (float,),
"cont_usage": (float,),
"container_percentage": (float,),
"container_usage": (float,),
"cspm_containers_percentage": (float,),
Expand Down Expand Up @@ -88,6 +90,8 @@ def openapi_types(_):
"appsec_usage": "appsec_usage",
"browser_percentage": "browser_percentage",
"browser_usage": "browser_usage",
"cont_percentage": "cont_percentage",
"cont_usage": "cont_usage",
"container_percentage": "container_percentage",
"container_usage": "container_usage",
"cspm_containers_percentage": "cspm_containers_percentage",
Expand Down Expand Up @@ -148,6 +152,8 @@ def __init__(
appsec_usage: Union[float, UnsetType] = unset,
browser_percentage: Union[float, UnsetType] = unset,
browser_usage: Union[float, UnsetType] = unset,
cont_percentage: Union[float, UnsetType] = unset,
cont_usage: Union[float, UnsetType] = unset,
container_percentage: Union[float, UnsetType] = unset,
container_usage: Union[float, UnsetType] = unset,
cspm_containers_percentage: Union[float, UnsetType] = unset,
Expand Down Expand Up @@ -233,6 +239,12 @@ def __init__(
:param browser_usage: The synthetic browser test usage by tag(s).
:type browser_usage: float, optional

:param cont_percentage: The percentage of container usage without the Datadog Agent by tag(s).
:type cont_percentage: float, optional

:param cont_usage: The container usage without Datadog agent by tag(s).
:type cont_usage: float, optional

:param container_percentage: The percentage of container usage by tag(s).
:type container_percentage: float, optional

Expand Down Expand Up @@ -389,6 +401,10 @@ def __init__(
kwargs["browser_percentage"] = browser_percentage
if browser_usage is not unset:
kwargs["browser_usage"] = browser_usage
if cont_percentage is not unset:
kwargs["cont_percentage"] = cont_percentage
if cont_usage is not unset:
kwargs["cont_usage"] = cont_usage
if container_percentage is not unset:
kwargs["container_percentage"] = container_percentage
if container_usage is not unset:
Expand Down