Skip to content

Commit 5c7c5e1

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Add Usage Metering container_excl_agent_usage fields (#1328)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent b3a5c4e commit 5c7c5e1

File tree

5 files changed

+43
-37
lines changed

5 files changed

+43
-37
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": "2023-02-06 21:06:32.889234",
8-
"spec_repo_commit": "17eb9903"
7+
"regenerated": "2023-02-08 15:58:24.646504",
8+
"spec_repo_commit": "7c0c43cc"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.4",
12-
"regenerated": "2023-02-06 21:06:32.900452",
13-
"spec_repo_commit": "17eb9903"
12+
"regenerated": "2023-02-08 15:58:24.657649",
13+
"spec_repo_commit": "7c0c43cc"
1414
}
1515
}
1616
}

‎.generator/schemas/v1/openapi.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3652,6 +3652,7 @@ components:
36523652
- appsec_fargate_usage
36533653
- appsec_usage
36543654
- browser_usage
3655+
- container_excl_agent_usage
36553656
- container_usage
36563657
- cspm_containers_usage
36573658
- cspm_hosts_usage
@@ -3673,7 +3674,6 @@ components:
36733674
- profiled_host_usage
36743675
- snmp_usage
36753676
- estimated_rum_sessions_usage
3676-
- cont_usage
36773677
type: string
36783678
x-enum-varnames:
36793679
- API_USAGE
@@ -3682,6 +3682,7 @@ components:
36823682
- APPSEC_FARGATE_USAGE
36833683
- APPSEC_USAGE
36843684
- BROWSER_USAGE
3685+
- CONTAINER_EXCL_AGENT_USAGE
36853686
- CONTAINER_USAGE
36863687
- CSPM_CONTAINERS_USAGE
36873688
- CSPM_HOSTS_USAGE
@@ -3703,7 +3704,6 @@ components:
37033704
- PROFILED_HOST_USAGE
37043705
- SNMP_USAGE
37053706
- ESTIMATED_RUM_SESSIONS_USAGE
3706-
- CONT_USAGE
37073707
IFrameWidgetDefinition:
37083708
description: The iframe widget allows you to embed a portion of any other web
37093709
page on your dashboard. Only available on FREE layout dashboards.
@@ -7084,6 +7084,8 @@ components:
70847084
- appsec_percentage
70857085
- browser_usage
70867086
- browser_percentage
7087+
- container_excl_agent_usage
7088+
- container_excl_agent_percentage
70877089
- container_usage
70887090
- container_percentage
70897091
- cspm_containers_percentage
@@ -7126,8 +7128,6 @@ components:
71267128
- snmp_percentage
71277129
- estimated_rum_sessions_usage
71287130
- estimated_rum_sessions_percentage
7129-
- cont_usage
7130-
- cont_percentage
71317131
- '*'
71327132
type: string
71337133
x-enum-varnames:
@@ -7143,6 +7143,8 @@ components:
71437143
- APPSEC_PERCENTAGE
71447144
- BROWSER_USAGE
71457145
- BROWSER_PERCENTAGE
7146+
- CONTAINER_EXCL_AGENT_USAGE
7147+
- CONTAINER_EXCL_AGENT_PERCENTAGE
71467148
- CONTAINER_USAGE
71477149
- CONTAINER_PERCENTAGE
71487150
- CSPM_CONTAINERS_PERCENTAGE
@@ -7185,8 +7187,6 @@ components:
71857187
- SNMP_PERCENTAGE
71867188
- ESTIMATED_RUM_SESSIONS_USAGE
71877189
- ESTIMATED_RUM_SESSIONS_PERCENTAGE
7188-
- CONT_USAGE
7189-
- CONT_PERCENTAGE
71907190
- ALL
71917191
MonthlyUsageAttributionValues:
71927192
description: Fields in Usage Summary by tag(s).
@@ -7242,12 +7242,12 @@ components:
72427242
description: The synthetic browser test usage by tag(s).
72437243
format: double
72447244
type: number
7245-
cont_percentage:
7245+
container_excl_agent_percentage:
72467246
description: The percentage of container usage without the Datadog Agent
72477247
by tag(s).
72487248
format: double
72497249
type: number
7250-
cont_usage:
7250+
container_excl_agent_usage:
72517251
description: The container usage without the Datadog Agent by tag(s).
72527252
format: double
72537253
type: number

‎src/datadog_api_client/v1/model/hourly_usage_attribution_usage_type.py

Lines changed: 6 additions & 4 deletions
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", "infra_host_usage", "invocations_usage", "npm_host_usage", "profiled_container_usage", "profiled_host_usage", "snmp_usage", "estimated_rum_sessions_usage", "cont_usage"].
19+
:param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "container_excl_agent_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", "infra_host_usage", "invocations_usage", "npm_host_usage", "profiled_container_usage", "profiled_host_usage", "snmp_usage", "estimated_rum_sessions_usage"].
2020
:type value: str
2121
"""
2222

@@ -27,6 +27,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
2727
"appsec_fargate_usage",
2828
"appsec_usage",
2929
"browser_usage",
30+
"container_excl_agent_usage",
3031
"container_usage",
3132
"cspm_containers_usage",
3233
"cspm_hosts_usage",
@@ -48,14 +49,14 @@ class HourlyUsageAttributionUsageType(ModelSimple):
4849
"profiled_host_usage",
4950
"snmp_usage",
5051
"estimated_rum_sessions_usage",
51-
"cont_usage",
5252
}
5353
API_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5454
APM_FARGATE_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5555
APM_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5656
APPSEC_FARGATE_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5757
APPSEC_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5858
BROWSER_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
59+
CONTAINER_EXCL_AGENT_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
5960
CONTAINER_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
6061
CSPM_CONTAINERS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
6162
CSPM_HOSTS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
@@ -77,7 +78,6 @@ class HourlyUsageAttributionUsageType(ModelSimple):
7778
PROFILED_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
7879
SNMP_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
7980
ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
80-
CONT_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
8181

8282
@cached_property
8383
def openapi_types(_):
@@ -92,6 +92,9 @@ def openapi_types(_):
9292
HourlyUsageAttributionUsageType.APPSEC_FARGATE_USAGE = HourlyUsageAttributionUsageType("appsec_fargate_usage")
9393
HourlyUsageAttributionUsageType.APPSEC_USAGE = HourlyUsageAttributionUsageType("appsec_usage")
9494
HourlyUsageAttributionUsageType.BROWSER_USAGE = HourlyUsageAttributionUsageType("browser_usage")
95+
HourlyUsageAttributionUsageType.CONTAINER_EXCL_AGENT_USAGE = HourlyUsageAttributionUsageType(
96+
"container_excl_agent_usage"
97+
)
9598
HourlyUsageAttributionUsageType.CONTAINER_USAGE = HourlyUsageAttributionUsageType("container_usage")
9699
HourlyUsageAttributionUsageType.CSPM_CONTAINERS_USAGE = HourlyUsageAttributionUsageType("cspm_containers_usage")
97100
HourlyUsageAttributionUsageType.CSPM_HOSTS_USAGE = HourlyUsageAttributionUsageType("cspm_hosts_usage")
@@ -123,4 +126,3 @@ def openapi_types(_):
123126
HourlyUsageAttributionUsageType.ESTIMATED_RUM_SESSIONS_USAGE = HourlyUsageAttributionUsageType(
124127
"estimated_rum_sessions_usage"
125128
)
126-
HourlyUsageAttributionUsageType.CONT_USAGE = HourlyUsageAttributionUsageType("cont_usage")

‎src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py

Lines changed: 11 additions & 7 deletions
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", "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", "*"].
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_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", "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", "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", "*"].
2020
:type value: str
2121
"""
2222

@@ -33,6 +33,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
3333
"appsec_percentage",
3434
"browser_usage",
3535
"browser_percentage",
36+
"container_excl_agent_usage",
37+
"container_excl_agent_percentage",
3638
"container_usage",
3739
"container_percentage",
3840
"cspm_containers_percentage",
@@ -75,8 +77,6 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
7577
"snmp_percentage",
7678
"estimated_rum_sessions_usage",
7779
"estimated_rum_sessions_percentage",
78-
"cont_usage",
79-
"cont_percentage",
8080
"*",
8181
}
8282
API_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -91,6 +91,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
9191
APPSEC_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
9292
BROWSER_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
9393
BROWSER_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
94+
CONTAINER_EXCL_AGENT_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
95+
CONTAINER_EXCL_AGENT_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
9496
CONTAINER_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
9597
CONTAINER_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
9698
CSPM_CONTAINERS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -133,8 +135,6 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
133135
SNMP_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
134136
ESTIMATED_RUM_SESSIONS_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
135137
ESTIMATED_RUM_SESSIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
136-
CONT_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
137-
CONT_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
138138
ALL: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
139139

140140
@cached_property
@@ -166,6 +166,12 @@ def openapi_types(_):
166166
MonthlyUsageAttributionSupportedMetrics.BROWSER_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
167167
"browser_percentage"
168168
)
169+
MonthlyUsageAttributionSupportedMetrics.CONTAINER_EXCL_AGENT_USAGE = MonthlyUsageAttributionSupportedMetrics(
170+
"container_excl_agent_usage"
171+
)
172+
MonthlyUsageAttributionSupportedMetrics.CONTAINER_EXCL_AGENT_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
173+
"container_excl_agent_percentage"
174+
)
169175
MonthlyUsageAttributionSupportedMetrics.CONTAINER_USAGE = MonthlyUsageAttributionSupportedMetrics("container_usage")
170176
MonthlyUsageAttributionSupportedMetrics.CONTAINER_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
171177
"container_percentage"
@@ -268,6 +274,4 @@ def openapi_types(_):
268274
MonthlyUsageAttributionSupportedMetrics.ESTIMATED_RUM_SESSIONS_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
269275
"estimated_rum_sessions_percentage"
270276
)
271-
MonthlyUsageAttributionSupportedMetrics.CONT_USAGE = MonthlyUsageAttributionSupportedMetrics("cont_usage")
272-
MonthlyUsageAttributionSupportedMetrics.CONT_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics("cont_percentage")
273277
MonthlyUsageAttributionSupportedMetrics.ALL = MonthlyUsageAttributionSupportedMetrics("*")

‎src/datadog_api_client/v1/model/monthly_usage_attribution_values.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +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,),
32+
"container_excl_agent_percentage": (float,),
33+
"container_excl_agent_usage": (float,),
3434
"container_percentage": (float,),
3535
"container_usage": (float,),
3636
"cspm_containers_percentage": (float,),
@@ -88,8 +88,8 @@ def openapi_types(_):
8888
"appsec_usage": "appsec_usage",
8989
"browser_percentage": "browser_percentage",
9090
"browser_usage": "browser_usage",
91-
"cont_percentage": "cont_percentage",
92-
"cont_usage": "cont_usage",
91+
"container_excl_agent_percentage": "container_excl_agent_percentage",
92+
"container_excl_agent_usage": "container_excl_agent_usage",
9393
"container_percentage": "container_percentage",
9494
"container_usage": "container_usage",
9595
"cspm_containers_percentage": "cspm_containers_percentage",
@@ -148,8 +148,8 @@ def __init__(
148148
appsec_usage: Union[float, UnsetType] = unset,
149149
browser_percentage: Union[float, UnsetType] = unset,
150150
browser_usage: Union[float, UnsetType] = unset,
151-
cont_percentage: Union[float, UnsetType] = unset,
152-
cont_usage: Union[float, UnsetType] = unset,
151+
container_excl_agent_percentage: Union[float, UnsetType] = unset,
152+
container_excl_agent_usage: Union[float, UnsetType] = unset,
153153
container_percentage: Union[float, UnsetType] = unset,
154154
container_usage: Union[float, UnsetType] = unset,
155155
cspm_containers_percentage: Union[float, UnsetType] = unset,
@@ -233,11 +233,11 @@ def __init__(
233233
:param browser_usage: The synthetic browser test usage by tag(s).
234234
:type browser_usage: float, optional
235235
236-
:param cont_percentage: The percentage of container usage without the Datadog Agent by tag(s).
237-
:type cont_percentage: float, optional
236+
:param container_excl_agent_percentage: The percentage of container usage without the Datadog Agent by tag(s).
237+
:type container_excl_agent_percentage: float, optional
238238
239-
:param cont_usage: The container usage without the Datadog Agent by tag(s).
240-
:type cont_usage: float, optional
239+
:param container_excl_agent_usage: The container usage without the Datadog Agent by tag(s).
240+
:type container_excl_agent_usage: float, optional
241241
242242
:param container_percentage: The percentage of container usage by tag(s).
243243
:type container_percentage: float, optional
@@ -389,10 +389,10 @@ def __init__(
389389
kwargs["browser_percentage"] = browser_percentage
390390
if browser_usage is not unset:
391391
kwargs["browser_usage"] = browser_usage
392-
if cont_percentage is not unset:
393-
kwargs["cont_percentage"] = cont_percentage
394-
if cont_usage is not unset:
395-
kwargs["cont_usage"] = cont_usage
392+
if container_excl_agent_percentage is not unset:
393+
kwargs["container_excl_agent_percentage"] = container_excl_agent_percentage
394+
if container_excl_agent_usage is not unset:
395+
kwargs["container_excl_agent_usage"] = container_excl_agent_usage
396396
if container_percentage is not unset:
397397
kwargs["container_percentage"] = container_percentage
398398
if container_usage is not unset:

0 commit comments

Comments
 (0)