Skip to content

Commit 83b5266

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Add Network Device Monitoring Netflow to usage (#1694)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent 8853cae commit 83b5266

10 files changed

+90
-8
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.6",
7-
"regenerated": "2023-09-29 08:08:42.720309",
8-
"spec_repo_commit": "b63ccd75"
7+
"regenerated": "2023-09-29 16:55:31.141240",
8+
"spec_repo_commit": "514c9081"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2023-09-29 08:08:42.733950",
13-
"spec_repo_commit": "b63ccd75"
12+
"regenerated": "2023-09-29 16:55:31.163049",
13+
"spec_repo_commit": "514c9081"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3922,6 +3922,7 @@ components:
39223922
- infra_host_usage
39233923
- invocations_usage
39243924
- mobile_app_testing_usage
3925+
- ndm_netflow_usage
39253926
- npm_host_usage
39263927
- obs_pipeline_bytes_usage
39273928
- profiled_container_usage
@@ -3962,6 +3963,7 @@ components:
39623963
- INFRA_HOST_USAGE
39633964
- INVOCATIONS_USAGE
39643965
- MOBILE_APP_TESTING_USAGE
3966+
- NDM_NETFLOW_USAGE
39653967
- NPM_HOST_USAGE
39663968
- OBS_PIPELINE_BYTES_USAGE
39673969
- PROFILED_CONTAINER_USAGE
@@ -7495,6 +7497,8 @@ components:
74957497
- invocations_percentage
74967498
- mobile_app_testing_percentage
74977499
- mobile_app_testing_usage
7500+
- ndm_netflow_usage
7501+
- ndm_netflow_percentage
74987502
- npm_host_usage
74997503
- npm_host_percentage
75007504
- obs_pipeline_bytes_usage
@@ -7574,6 +7578,8 @@ components:
75747578
- INVOCATIONS_PERCENTAGE
75757579
- MOBILE_APP_TESTING_USAGE
75767580
- MOBILE_APP_TESTING_PERCENTAGE
7581+
- NDM_NETFLOW_USAGE
7582+
- NDM_NETFLOW_PERCENTAGE
75777583
- NPM_HOST_USAGE
75787584
- NPM_HOST_PERCENTAGE
75797585
- OBS_PIPELINE_BYTES_USAGE
@@ -7834,6 +7840,15 @@ components:
78347840
description: The Synthetic mobile application test usage by tag(s).
78357841
format: double
78367842
type: number
7843+
ndm_netflow_percentage:
7844+
description: The percentage of Network Device Monitoring NetFlow usage by
7845+
tag(s).
7846+
format: double
7847+
type: number
7848+
ndm_netflow_usage:
7849+
description: The Network Device Monitoring NetFlow usage by tag(s).
7850+
format: double
7851+
type: number
78377852
npm_host_percentage:
78387853
description: The percentage of network host usage by tag(s).
78397854
format: double
@@ -18113,6 +18128,11 @@ components:
1811318128
current date for all organizations.
1811418129
format: int64
1811518130
type: integer
18131+
ndm_netflow_events_sum:
18132+
description: Shows the sum of all Network Device Monitoring NetFlow events
18133+
over all hours in the current date for the given org.
18134+
format: int64
18135+
type: integer
1811618136
netflow_indexed_events_count_sum:
1811718137
description: Shows the sum of all Network flows indexed over all hours in
1811818138
the current date for all organizations.
@@ -18630,6 +18650,11 @@ components:
1863018650
name:
1863118651
description: The organization name.
1863218652
type: string
18653+
ndm_netflow_events_sum:
18654+
description: Shows the sum of all Network Device Monitoring NetFlow events
18655+
over all hours in the current date for the given org.
18656+
format: int64
18657+
type: integer
1863318658
netflow_indexed_events_count_sum:
1863418659
description: Shows the sum of all Network flows indexed over all hours in
1863518660
the current date for the given org.
@@ -19171,6 +19196,11 @@ components:
1917119196
current months for all organizations.
1917219197
format: int64
1917319198
type: integer
19199+
ndm_netflow_events_agg_sum:
19200+
description: Shows the sum of all Network Device Monitoring NetFlow events
19201+
over all hours in the current months for all organizations.
19202+
format: int64
19203+
type: integer
1917419204
netflow_indexed_events_count_agg_sum:
1917519205
description: Shows the sum of all Network flows indexed over all hours in
1917619206
the current months for all organizations.

.generator/schemas/v2/openapi.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27595,7 +27595,8 @@ paths:
2759527595
`infra_hosts`, `incident_management`, `indexed_logs`, `indexed_spans`, `ingested_spans`,
2759627596
`iot`,
2759727597

27598-
`lambda_traced_invocations`, `logs`, `network_flows`, `network_hosts`, `observability_pipelines`,
27598+
`lambda_traced_invocations`, `logs`, `network_flows`, `network_hosts`, `netflow_monitoring`,
27599+
`observability_pipelines`,
2759927600

2760027601
`online_archive`, `profiling`, `rum`, `rum_browser_sessions`, `rum_mobile_sessions`,
2760127602
`sds`, `snmp`,

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", "apm_usm_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "ci_visibility_itr_usage", "container_excl_agent_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_ingested_timeseries_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_hosts_usage", "dbm_hosts_usage", "dbm_queries_usage", "estimated_indexed_logs_usage", "estimated_indexed_spans_usage", "estimated_ingested_logs_usage", "estimated_ingested_spans_usage", "estimated_rum_sessions_usage", "fargate_usage", "functions_usage", "infra_host_usage", "invocations_usage", "mobile_app_testing_usage", "npm_host_usage", "obs_pipeline_bytes_usage", "profiled_container_usage", "profiled_fargate_usage", "profiled_host_usage", "sds_scanned_bytes_usage", "serverless_apps_usage", "snmp_usage", "universal_service_monitoring_usage", "vuln_management_hosts_usage"].
19+
:param value: Must be one of ["api_usage", "apm_fargate_usage", "apm_host_usage", "apm_usm_usage", "appsec_fargate_usage", "appsec_usage", "browser_usage", "ci_visibility_itr_usage", "container_excl_agent_usage", "container_usage", "cspm_containers_usage", "cspm_hosts_usage", "custom_ingested_timeseries_usage", "custom_timeseries_usage", "cws_containers_usage", "cws_hosts_usage", "dbm_hosts_usage", "dbm_queries_usage", "estimated_indexed_logs_usage", "estimated_indexed_spans_usage", "estimated_ingested_logs_usage", "estimated_ingested_spans_usage", "estimated_rum_sessions_usage", "fargate_usage", "functions_usage", "infra_host_usage", "invocations_usage", "mobile_app_testing_usage", "ndm_netflow_usage", "npm_host_usage", "obs_pipeline_bytes_usage", "profiled_container_usage", "profiled_fargate_usage", "profiled_host_usage", "sds_scanned_bytes_usage", "serverless_apps_usage", "snmp_usage", "universal_service_monitoring_usage", "vuln_management_hosts_usage"].
2020
:type value: str
2121
"""
2222

@@ -49,6 +49,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
4949
"infra_host_usage",
5050
"invocations_usage",
5151
"mobile_app_testing_usage",
52+
"ndm_netflow_usage",
5253
"npm_host_usage",
5354
"obs_pipeline_bytes_usage",
5455
"profiled_container_usage",
@@ -88,6 +89,7 @@ class HourlyUsageAttributionUsageType(ModelSimple):
8889
INFRA_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
8990
INVOCATIONS_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
9091
MOBILE_APP_TESTING_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
92+
NDM_NETFLOW_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
9193
NPM_HOST_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
9294
OBS_PIPELINE_BYTES_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
9395
PROFILED_CONTAINER_USAGE: ClassVar["HourlyUsageAttributionUsageType"]
@@ -148,6 +150,7 @@ def openapi_types(_):
148150
HourlyUsageAttributionUsageType.INFRA_HOST_USAGE = HourlyUsageAttributionUsageType("infra_host_usage")
149151
HourlyUsageAttributionUsageType.INVOCATIONS_USAGE = HourlyUsageAttributionUsageType("invocations_usage")
150152
HourlyUsageAttributionUsageType.MOBILE_APP_TESTING_USAGE = HourlyUsageAttributionUsageType("mobile_app_testing_usage")
153+
HourlyUsageAttributionUsageType.NDM_NETFLOW_USAGE = HourlyUsageAttributionUsageType("ndm_netflow_usage")
151154
HourlyUsageAttributionUsageType.NPM_HOST_USAGE = HourlyUsageAttributionUsageType("npm_host_usage")
152155
HourlyUsageAttributionUsageType.OBS_PIPELINE_BYTES_USAGE = HourlyUsageAttributionUsageType("obs_pipeline_bytes_usage")
153156
HourlyUsageAttributionUsageType.PROFILED_CONTAINER_USAGE = HourlyUsageAttributionUsageType("profiled_container_usage")

src/datadog_api_client/v1/model/monthly_usage_attribution_supported_metrics.py

Lines changed: 9 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", "apm_usm_usage", "apm_usm_percentage", "appsec_usage", "appsec_percentage", "browser_usage", "browser_percentage", "ci_visibility_itr_usage", "ci_visibility_itr_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_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", "mobile_app_testing_percentage", "mobile_app_testing_usage", "npm_host_usage", "npm_host_percentage", "obs_pipeline_bytes_usage", "obs_pipeline_bytes_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_fargate_usage", "profiled_fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "serverless_apps_usage", "serverless_apps_percentage", "snmp_usage", "snmp_percentage", "estimated_rum_sessions_usage", "estimated_rum_sessions_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", "*"].
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", "apm_usm_usage", "apm_usm_percentage", "appsec_usage", "appsec_percentage", "browser_usage", "browser_percentage", "ci_visibility_itr_usage", "ci_visibility_itr_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_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", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_usage", "ndm_netflow_percentage", "npm_host_usage", "npm_host_percentage", "obs_pipeline_bytes_usage", "obs_pipeline_bytes_percentage", "profiled_container_usage", "profiled_container_percentage", "profiled_fargate_usage", "profiled_fargate_percentage", "profiled_host_usage", "profiled_host_percentage", "serverless_apps_usage", "serverless_apps_percentage", "snmp_usage", "snmp_percentage", "estimated_rum_sessions_usage", "estimated_rum_sessions_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", "*"].
2020
:type value: str
2121
"""
2222

@@ -75,6 +75,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
7575
"invocations_percentage",
7676
"mobile_app_testing_percentage",
7777
"mobile_app_testing_usage",
78+
"ndm_netflow_usage",
79+
"ndm_netflow_percentage",
7880
"npm_host_usage",
7981
"npm_host_percentage",
8082
"obs_pipeline_bytes_usage",
@@ -153,6 +155,8 @@ class MonthlyUsageAttributionSupportedMetrics(ModelSimple):
153155
INVOCATIONS_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
154156
MOBILE_APP_TESTING_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
155157
MOBILE_APP_TESTING_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
158+
NDM_NETFLOW_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
159+
NDM_NETFLOW_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
156160
NPM_HOST_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
157161
NPM_HOST_PERCENTAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
158162
OBS_PIPELINE_BYTES_USAGE: ClassVar["MonthlyUsageAttributionSupportedMetrics"]
@@ -312,6 +316,10 @@ def openapi_types(_):
312316
MonthlyUsageAttributionSupportedMetrics.MOBILE_APP_TESTING_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
313317
"mobile_app_testing_usage"
314318
)
319+
MonthlyUsageAttributionSupportedMetrics.NDM_NETFLOW_USAGE = MonthlyUsageAttributionSupportedMetrics("ndm_netflow_usage")
320+
MonthlyUsageAttributionSupportedMetrics.NDM_NETFLOW_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
321+
"ndm_netflow_percentage"
322+
)
315323
MonthlyUsageAttributionSupportedMetrics.NPM_HOST_USAGE = MonthlyUsageAttributionSupportedMetrics("npm_host_usage")
316324
MonthlyUsageAttributionSupportedMetrics.NPM_HOST_PERCENTAGE = MonthlyUsageAttributionSupportedMetrics(
317325
"npm_host_percentage"

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
@@ -73,6 +73,8 @@ def openapi_types(_):
7373
"invocations_usage": (float,),
7474
"mobile_app_testing_percentage": (float,),
7575
"mobile_app_testing_usage": (float,),
76+
"ndm_netflow_percentage": (float,),
77+
"ndm_netflow_usage": (float,),
7678
"npm_host_percentage": (float,),
7779
"npm_host_usage": (float,),
7880
"obs_pipeline_bytes_percentage": (float,),
@@ -152,6 +154,8 @@ def openapi_types(_):
152154
"invocations_usage": "invocations_usage",
153155
"mobile_app_testing_percentage": "mobile_app_testing_percentage",
154156
"mobile_app_testing_usage": "mobile_app_testing_usage",
157+
"ndm_netflow_percentage": "ndm_netflow_percentage",
158+
"ndm_netflow_usage": "ndm_netflow_usage",
155159
"npm_host_percentage": "npm_host_percentage",
156160
"npm_host_usage": "npm_host_usage",
157161
"obs_pipeline_bytes_percentage": "obs_pipeline_bytes_percentage",
@@ -232,6 +236,8 @@ def __init__(
232236
invocations_usage: Union[float, UnsetType] = unset,
233237
mobile_app_testing_percentage: Union[float, UnsetType] = unset,
234238
mobile_app_testing_usage: Union[float, UnsetType] = unset,
239+
ndm_netflow_percentage: Union[float, UnsetType] = unset,
240+
ndm_netflow_usage: Union[float, UnsetType] = unset,
235241
npm_host_percentage: Union[float, UnsetType] = unset,
236242
npm_host_usage: Union[float, UnsetType] = unset,
237243
obs_pipeline_bytes_percentage: Union[float, UnsetType] = unset,
@@ -425,6 +431,12 @@ def __init__(
425431
:param mobile_app_testing_usage: The Synthetic mobile application test usage by tag(s).
426432
:type mobile_app_testing_usage: float, optional
427433
434+
:param ndm_netflow_percentage: The percentage of Network Device Monitoring NetFlow usage by tag(s).
435+
:type ndm_netflow_percentage: float, optional
436+
437+
:param ndm_netflow_usage: The Network Device Monitoring NetFlow usage by tag(s).
438+
:type ndm_netflow_usage: float, optional
439+
428440
:param npm_host_percentage: The percentage of network host usage by tag(s).
429441
:type npm_host_percentage: float, optional
430442
@@ -597,6 +609,10 @@ def __init__(
597609
kwargs["mobile_app_testing_percentage"] = mobile_app_testing_percentage
598610
if mobile_app_testing_usage is not unset:
599611
kwargs["mobile_app_testing_usage"] = mobile_app_testing_usage
612+
if ndm_netflow_percentage is not unset:
613+
kwargs["ndm_netflow_percentage"] = ndm_netflow_percentage
614+
if ndm_netflow_usage is not unset:
615+
kwargs["ndm_netflow_usage"] = ndm_netflow_usage
600616
if npm_host_percentage is not unset:
601617
kwargs["npm_host_percentage"] = npm_host_percentage
602618
if npm_host_usage is not unset:

src/datadog_api_client/v1/model/usage_summary_date.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def openapi_types(_):
9393
"mobile_rum_session_count_roku_sum": (int,),
9494
"mobile_rum_session_count_sum": (int,),
9595
"mobile_rum_units_sum": (int,),
96+
"ndm_netflow_events_sum": (int,),
9697
"netflow_indexed_events_count_sum": (int,),
9798
"npm_host_top99p": (int,),
9899
"observability_pipelines_bytes_processed_sum": (int,),
@@ -196,6 +197,7 @@ def openapi_types(_):
196197
"mobile_rum_session_count_roku_sum": "mobile_rum_session_count_roku_sum",
197198
"mobile_rum_session_count_sum": "mobile_rum_session_count_sum",
198199
"mobile_rum_units_sum": "mobile_rum_units_sum",
200+
"ndm_netflow_events_sum": "ndm_netflow_events_sum",
199201
"netflow_indexed_events_count_sum": "netflow_indexed_events_count_sum",
200202
"npm_host_top99p": "npm_host_top99p",
201203
"observability_pipelines_bytes_processed_sum": "observability_pipelines_bytes_processed_sum",
@@ -300,6 +302,7 @@ def __init__(
300302
mobile_rum_session_count_roku_sum: Union[int, UnsetType] = unset,
301303
mobile_rum_session_count_sum: Union[int, UnsetType] = unset,
302304
mobile_rum_units_sum: Union[int, UnsetType] = unset,
305+
ndm_netflow_events_sum: Union[int, UnsetType] = unset,
303306
netflow_indexed_events_count_sum: Union[int, UnsetType] = unset,
304307
npm_host_top99p: Union[int, UnsetType] = unset,
305308
observability_pipelines_bytes_processed_sum: Union[int, UnsetType] = unset,
@@ -543,6 +546,9 @@ def __init__(
543546
:param mobile_rum_units_sum: Shows the sum of all mobile RUM units over all hours in the current date for all organizations.
544547
:type mobile_rum_units_sum: int, optional
545548
549+
:param ndm_netflow_events_sum: Shows the sum of all Network Device Monitoring NetFlow events over all hours in the current date for the given org.
550+
:type ndm_netflow_events_sum: int, optional
551+
546552
:param netflow_indexed_events_count_sum: Shows the sum of all Network flows indexed over all hours in the current date for all organizations.
547553
:type netflow_indexed_events_count_sum: int, optional
548554
@@ -776,6 +782,8 @@ def __init__(
776782
kwargs["mobile_rum_session_count_sum"] = mobile_rum_session_count_sum
777783
if mobile_rum_units_sum is not unset:
778784
kwargs["mobile_rum_units_sum"] = mobile_rum_units_sum
785+
if ndm_netflow_events_sum is not unset:
786+
kwargs["ndm_netflow_events_sum"] = ndm_netflow_events_sum
779787
if netflow_indexed_events_count_sum is not unset:
780788
kwargs["netflow_indexed_events_count_sum"] = netflow_indexed_events_count_sum
781789
if npm_host_top99p is not unset:

0 commit comments

Comments
 (0)