Skip to content

Commit a66c9ab

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Add Usage Metering Cont Usage fields (#1281)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent af38cc1 commit a66c9ab

File tree

5 files changed

+46
-6
lines changed

5 files changed

+46
-6
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.4",
7-
"regenerated": "2022-12-28 16:11:06.259973",
8-
"spec_repo_commit": "b2d7d94f"
7+
"regenerated": "2022-12-28 17:38:36.087850",
8+
"spec_repo_commit": "8cc05e11"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.4",
12-
"regenerated": "2022-12-28 16:11:06.274362",
13-
"spec_repo_commit": "b2d7d94f"
12+
"regenerated": "2022-12-28 17:38:36.105011",
13+
"spec_repo_commit": "8cc05e11"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3670,6 +3670,7 @@ components:
36703670
- profiled_host_usage
36713671
- snmp_usage
36723672
- estimated_rum_sessions_usage
3673+
- cont_usage
36733674
type: string
36743675
x-enum-varnames:
36753676
- API_USAGE
@@ -3700,6 +3701,7 @@ components:
37003701
- PROFILED_HOST_USAGE
37013702
- SNMP_USAGE
37023703
- ESTIMATED_RUM_SESSIONS_USAGE
3704+
- CONT_USAGE
37033705
IFrameWidgetDefinition:
37043706
description: The iframe widget allows you to embed a portion of any other web
37053707
page on your dashboard. Only available on FREE layout dashboards.
@@ -7028,6 +7030,8 @@ components:
70287030
- snmp_percentage
70297031
- estimated_rum_sessions_usage
70307032
- estimated_rum_sessions_percentage
7033+
- cont_usage
7034+
- cont_percentage
70317035
- '*'
70327036
type: string
70337037
x-enum-varnames:
@@ -7087,6 +7091,8 @@ components:
70877091
- SNMP_PERCENTAGE
70887092
- ESTIMATED_RUM_SESSIONS_USAGE
70897093
- ESTIMATED_RUM_SESSIONS_PERCENTAGE
7094+
- CONT_USAGE
7095+
- CONT_PERCENTAGE
70907096
- ALL
70917097
MonthlyUsageAttributionValues:
70927098
description: Fields in Usage Summary by tag(s).
@@ -7142,6 +7148,15 @@ components:
71427148
description: The synthetic browser test usage by tag(s).
71437149
format: double
71447150
type: number
7151+
cont_percentage:
7152+
description: The percentage of container usage without the Datadog Agent
7153+
by tag(s).
7154+
format: double
7155+
type: number
7156+
cont_usage:
7157+
description: The container usage without Datadog agent by tag(s).
7158+
format: double
7159+
type: number
71457160
container_percentage:
71467161
description: The percentage of container usage by tag(s).
71477162
format: double

src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
1616
"""
1717
Supported products for hourly usage attribution requests.
1818
19-
: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"].
19+
: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"].
2020
:type value: str
2121
"""
2222

@@ -49,6 +49,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
4949
"profiled_host_usage",
5050
"snmp_usage",
5151
"estimated_rum_sessions_usage",
52+
"cont_usage",
5253
}
5354
API_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5455
APM_FARGATE_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
@@ -78,6 +79,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
7879
PROFILED_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
7980
SNMP_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
8081
ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
82+
CONT_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
8183

8284
@cached_property
8385
def openapi_types(_):
@@ -124,3 +126,4 @@ def openapi_types(_):
124126
HourlyUsageAttributionUsageType.ESTIMATED_RUM_SESSIONS_USAGE = HourlyUsageAttributionUsageType(
125127
"estimated_rum_sessions_usage"
126128
)
129+
HourlyUsageAttributionUsageType.CONT_USAGE = HourlyUsageAttributionUsageType("cont_usage")

src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
1616
"""
1717
Supported metrics for monthly usage attribution requests.
1818
19-
: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", "*"].
19+
: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", "*"].
2020
:type value: str
2121
"""
2222

@@ -77,6 +77,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
7777
"snmp_percentage",
7878
"estimated_rum_sessions_usage",
7979
"estimated_rum_sessions_percentage",
80+
"cont_usage",
81+
"cont_percentage",
8082
"*",
8183
}
8284
API_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -135,6 +137,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
135137
SNMP_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
136138
ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
137139
ESTIMATED_RUM_SESSIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
140+
CONT_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
141+
CONT_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
138142
ALL: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
139143

140144
@cached_property
@@ -274,4 +278,6 @@ def openapi_types(_):
274278
MonthlyUsageAttributionSupportedMetrics.ESTIMATED_RUM_SESSIONS_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
275279
"estimated_rum_sessions_percentage"
276280
)
281+
MonthlyUsageAttributionSupportedMetrics.CONT_USAGE = MonthlyUsageAttributionSupportedMetrics("cont_usage")
282+
MonthlyUsageAttributionSupportedMetrics.CONT_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics("cont_percentage")
277283
MonthlyUsageAttributionSupportedMetrics.ALL = MonthlyUsageAttributionSupportedMetrics("*")

src/datadog_api_client/v1/model/monthly_usage_attribution_values.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ def openapi_types(_):
2929
"appsec_usage": (float,),
3030
"browser_percentage": (float,),
3131
"browser_usage": (float,),
32+
"cont_percentage": (float,),
33+
"cont_usage": (float,),
3234
"container_percentage": (float,),
3335
"container_usage": (float,),
3436
"cspm_containers_percentage": (float,),
@@ -88,6 +90,8 @@ def openapi_types(_):
8890
"appsec_usage": "appsec_usage",
8991
"browser_percentage": "browser_percentage",
9092
"browser_usage": "browser_usage",
93+
"cont_percentage": "cont_percentage",
94+
"cont_usage": "cont_usage",
9195
"container_percentage": "container_percentage",
9296
"container_usage": "container_usage",
9397
"cspm_containers_percentage": "cspm_containers_percentage",
@@ -148,6 +152,8 @@ def __init__(
148152
appsec_usage: Union[float, UnsetType] = unset,
149153
browser_percentage: Union[float, UnsetType] = unset,
150154
browser_usage: Union[float, UnsetType] = unset,
155+
cont_percentage: Union[float, UnsetType] = unset,
156+
cont_usage: Union[float, UnsetType] = unset,
151157
container_percentage: Union[float, UnsetType] = unset,
152158
container_usage: Union[float, UnsetType] = unset,
153159
cspm_containers_percentage: Union[float, UnsetType] = unset,
@@ -233,6 +239,12 @@ def __init__(
233239
:param browser_usage: The synthetic browser test usage by tag(s).
234240
:type browser_usage: float, optional
235241
242+
:param cont_percentage: The percentage of container usage without the Datadog Agent by tag(s).
243+
:type cont_percentage: float, optional
244+
245+
:param cont_usage: The container usage without Datadog agent by tag(s).
246+
:type cont_usage: float, optional
247+
236248
:param container_percentage: The percentage of container usage by tag(s).
237249
:type container_percentage: float, optional
238250
@@ -389,6 +401,10 @@ def __init__(
389401
kwargs["browser_percentage"] = browser_percentage
390402
if browser_usage is not unset:
391403
kwargs["browser_usage"] = browser_usage
404+
if cont_percentage is not unset:
405+
kwargs["cont_percentage"] = cont_percentage
406+
if cont_usage is not unset:
407+
kwargs["cont_usage"] = cont_usage
392408
if container_percentage is not unset:
393409
kwargs["container_percentage"] = container_percentage
394410
if container_usage is not unset:

0 commit comments

Comments
 (0)