Skip to content

Commit

Permalink
Add profiled fargate tasks to usage attribution (#1256)
Browse files Browse the repository at this point in the history
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
  • Loading branch information
api-clients-generation-pipeline[bot] and ci.datadog-api-spec authored Feb 23, 2023
1 parent d2d21a1 commit 4918a09
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 8 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.4",
"regenerated": "2023-02-22 19:40:48.868501",
"spec_repo_commit": "837505a7"
"regenerated": "2023-02-23 20:26:33.044700",
"spec_repo_commit": "437dad25"
},
"v2": {
"apigentools_version": "1.6.4",
"regenerated": "2023-02-22 19:40:48.880833",
"spec_repo_commit": "837505a7"
"regenerated": "2023-02-23 20:26:33.056596",
"spec_repo_commit": "437dad25"
}
}
}
14 changes: 14 additions & 0 deletions .generator/schemas/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3665,6 +3665,7 @@ components:
- invocations_usage
- npm_host_usage
- profiled_container_usage
- profiled_fargate_usage
- profiled_host_usage
- snmp_usage
- estimated_rum_sessions_usage
Expand Down Expand Up @@ -3695,6 +3696,7 @@ components:
- INVOCATIONS_USAGE
- NPM_HOST_USAGE
- PROFILED_CONTAINER_USAGE
- PROFILED_FARGATE_USAGE
- PROFILED_HOST_USAGE
- SNMP_USAGE
- ESTIMATED_RUM_SESSIONS_USAGE
Expand Down Expand Up @@ -7138,6 +7140,8 @@ components:
- npm_host_percentage
- profiled_container_usage
- profiled_container_percentage
- profiled_fargate_usage
- profiled_fargate_percentage
- profiled_host_usage
- profiled_host_percentage
- snmp_usage
Expand Down Expand Up @@ -7197,6 +7201,8 @@ components:
- NPM_HOST_PERCENTAGE
- PROFILED_CONTAINER_USAGE
- PROFILED_CONTAINER_PERCENTAGE
- PROFILED_FARGATE_USAGE
- PROFILED_FARGATE_PERCENTAGE
- PROFILED_HOST_USAGE
- PROFILED_HOST_PERCENTAGE
- SNMP_USAGE
Expand Down Expand Up @@ -7420,6 +7426,14 @@ components:
description: The profiled container usage by tag(s).
format: double
type: number
profiled_fargate_percentage:
description: The percentage of profiled Fargate task usage by tag(s).
format: double
type: number
profiled_fargate_usage:
description: The profiled Fargate task usage by tag(s).
format: double
type: number
profiled_host_percentage:
description: The percentage of profiled hosts usage by tag(s).
format: double
Expand Down
6 changes: 3 additions & 3 deletions lib/datadog_api_client/v1/api/usage_metering_api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def get_hourly_usage_attribution_with_http_info(start_hr, usage_type, opts = {})
fail ArgumentError, "Missing the required parameter 'usage_type' when calling UsageMeteringAPI.get_hourly_usage_attribution"
end
# verify enum value
allowable_values = ['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']
allowable_values = ['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_fargate_usage', 'profiled_host_usage', 'snmp_usage', 'estimated_rum_sessions_usage']
if @api_client.config.client_side_validation && !allowable_values.include?(usage_type)
fail ArgumentError, "invalid value for \"usage_type\", must be one of #{allowable_values}"
end
Expand Down Expand Up @@ -472,15 +472,15 @@ def get_monthly_usage_attribution_with_http_info(start_month, fields, opts = {})
fail ArgumentError, "Missing the required parameter 'fields' when calling UsageMeteringAPI.get_monthly_usage_attribution"
end
# verify enum value
allowable_values = ['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', '*']
allowable_values = ['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_fargate_usage', 'profiled_fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', 'estimated_rum_sessions_usage', 'estimated_rum_sessions_percentage', '*']
if @api_client.config.client_side_validation && !allowable_values.include?(fields)
fail ArgumentError, "invalid value for \"fields\", must be one of #{allowable_values}"
end
allowable_values = ['desc', 'asc']
if @api_client.config.client_side_validation && opts[:'sort_direction'] && !allowable_values.include?(opts[:'sort_direction'])
fail ArgumentError, "invalid value for \"sort_direction\", must be one of #{allowable_values}"
end
allowable_values = ['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', '*']
allowable_values = ['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_fargate_usage', 'profiled_fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', 'estimated_rum_sessions_usage', 'estimated_rum_sessions_percentage', '*']
if @api_client.config.client_side_validation && opts[:'sort_name'] && !allowable_values.include?(opts[:'sort_name'])
fail ArgumentError, "invalid value for \"sort_name\", must be one of #{allowable_values}"
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class HourlyUsageAttributionUsageType
INVOCATIONS_USAGE = "invocations_usage".freeze
NPM_HOST_USAGE = "npm_host_usage".freeze
PROFILED_CONTAINER_USAGE = "profiled_container_usage".freeze
PROFILED_FARGATE_USAGE = "profiled_fargate_usage".freeze
PROFILED_HOST_USAGE = "profiled_host_usage".freeze
SNMP_USAGE = "snmp_usage".freeze
ESTIMATED_RUM_SESSIONS_USAGE = "estimated_rum_sessions_usage".freeze
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ class MonthlyUsageAttributionSupportedMetrics
NPM_HOST_PERCENTAGE = "npm_host_percentage".freeze
PROFILED_CONTAINER_USAGE = "profiled_container_usage".freeze
PROFILED_CONTAINER_PERCENTAGE = "profiled_container_percentage".freeze
PROFILED_FARGATE_USAGE = "profiled_fargate_usage".freeze
PROFILED_FARGATE_PERCENTAGE = "profiled_fargate_percentage".freeze
PROFILED_HOST_USAGE = "profiled_host_usage".freeze
PROFILED_HOST_PERCENTAGE = "profiled_host_percentage".freeze
SNMP_USAGE = "snmp_usage".freeze
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ class MonthlyUsageAttributionValues
# The profiled container usage by tag(s).
attr_accessor :profiled_container_usage

# The percentage of profiled Fargate task usage by tag(s).
attr_accessor :profiled_fargate_percentage

# The profiled Fargate task usage by tag(s).
attr_accessor :profiled_fargate_usage

# The percentage of profiled hosts usage by tag(s).
attr_accessor :profiled_host_percentage

Expand Down Expand Up @@ -249,6 +255,8 @@ def self.attribute_map
:'npm_host_usage' => :'npm_host_usage',
:'profiled_container_percentage' => :'profiled_container_percentage',
:'profiled_container_usage' => :'profiled_container_usage',
:'profiled_fargate_percentage' => :'profiled_fargate_percentage',
:'profiled_fargate_usage' => :'profiled_fargate_usage',
:'profiled_host_percentage' => :'profiled_host_percentage',
:'profiled_host_usage' => :'profiled_host_usage',
:'snmp_percentage' => :'snmp_percentage',
Expand Down Expand Up @@ -312,6 +320,8 @@ def self.openapi_types
:'npm_host_usage' => :'Float',
:'profiled_container_percentage' => :'Float',
:'profiled_container_usage' => :'Float',
:'profiled_fargate_percentage' => :'Float',
:'profiled_fargate_usage' => :'Float',
:'profiled_host_percentage' => :'Float',
:'profiled_host_usage' => :'Float',
:'snmp_percentage' => :'Float',
Expand Down Expand Up @@ -543,6 +553,14 @@ def initialize(attributes = {})
self.profiled_container_usage = attributes[:'profiled_container_usage']
end

if attributes.key?(:'profiled_fargate_percentage')
self.profiled_fargate_percentage = attributes[:'profiled_fargate_percentage']
end

if attributes.key?(:'profiled_fargate_usage')
self.profiled_fargate_usage = attributes[:'profiled_fargate_usage']
end

if attributes.key?(:'profiled_host_percentage')
self.profiled_host_percentage = attributes[:'profiled_host_percentage']
end
Expand Down Expand Up @@ -625,6 +643,8 @@ def ==(o)
npm_host_usage == o.npm_host_usage &&
profiled_container_percentage == o.profiled_container_percentage &&
profiled_container_usage == o.profiled_container_usage &&
profiled_fargate_percentage == o.profiled_fargate_percentage &&
profiled_fargate_usage == o.profiled_fargate_usage &&
profiled_host_percentage == o.profiled_host_percentage &&
profiled_host_usage == o.profiled_host_usage &&
snmp_percentage == o.snmp_percentage &&
Expand All @@ -635,7 +655,7 @@ def ==(o)
# @return [Integer] Hash code
# @!visibility private
def hash
[api_percentage, api_usage, apm_fargate_percentage, apm_fargate_usage, apm_host_percentage, apm_host_usage, appsec_fargate_percentage, appsec_fargate_usage, appsec_percentage, appsec_usage, browser_percentage, browser_usage, container_excl_agent_percentage, container_excl_agent_usage, container_percentage, container_usage, cspm_containers_percentage, cspm_containers_usage, cspm_hosts_percentage, cspm_hosts_usage, custom_timeseries_percentage, custom_timeseries_usage, 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_percentage, estimated_indexed_logs_usage, estimated_indexed_spans_percentage, estimated_indexed_spans_usage, estimated_ingested_logs_percentage, estimated_ingested_logs_usage, estimated_ingested_spans_percentage, estimated_ingested_spans_usage, estimated_rum_sessions_percentage, estimated_rum_sessions_usage, fargate_percentage, fargate_usage, functions_percentage, functions_usage, infra_host_percentage, infra_host_usage, invocations_percentage, invocations_usage, npm_host_percentage, npm_host_usage, profiled_container_percentage, profiled_container_usage, profiled_host_percentage, profiled_host_usage, snmp_percentage, snmp_usage].hash
[api_percentage, api_usage, apm_fargate_percentage, apm_fargate_usage, apm_host_percentage, apm_host_usage, appsec_fargate_percentage, appsec_fargate_usage, appsec_percentage, appsec_usage, browser_percentage, browser_usage, container_excl_agent_percentage, container_excl_agent_usage, container_percentage, container_usage, cspm_containers_percentage, cspm_containers_usage, cspm_hosts_percentage, cspm_hosts_usage, custom_timeseries_percentage, custom_timeseries_usage, 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_percentage, estimated_indexed_logs_usage, estimated_indexed_spans_percentage, estimated_indexed_spans_usage, estimated_ingested_logs_percentage, estimated_ingested_logs_usage, estimated_ingested_spans_percentage, estimated_ingested_spans_usage, estimated_rum_sessions_percentage, estimated_rum_sessions_usage, fargate_percentage, fargate_usage, functions_percentage, functions_usage, infra_host_percentage, infra_host_usage, invocations_percentage, invocations_usage, npm_host_percentage, npm_host_usage, profiled_container_percentage, profiled_container_usage, profiled_fargate_percentage, profiled_fargate_usage, profiled_host_percentage, profiled_host_usage, snmp_percentage, snmp_usage].hash
end
end
end

0 comments on commit 4918a09

Please sign in to comment.