From 70987e9dade3f6a01f522d10c2bf192498c2008e Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 14 Sep 2022 07:53:59 +0000 Subject: [PATCH] Regenerate client from commit 4e5b7510 of spec repo --- .apigentools-info | 8 +- .generator/schemas/v1/openapi.yaml | 50 ++++++++++++ ...del_hourly_usage_attribution_usage_type.go | 2 + ...hly_usage_attribution_supported_metrics.go | 4 + .../model_monthly_usage_attribution_values.go | 78 +++++++++++++++++++ api/datadogV1/model_usage_attribution_sort.go | 4 + ...del_usage_attribution_supported_metrics.go | 4 + .../model_usage_attribution_values.go | 78 +++++++++++++++++++ api/datadogV1/model_usage_fargate_hour.go | 39 ++++++++++ api/datadogV1/model_usage_summary_date.go | 39 ++++++++++ api/datadogV1/model_usage_summary_date_org.go | 39 ++++++++++ api/datadogV1/model_usage_summary_response.go | 39 ++++++++++ 12 files changed, 380 insertions(+), 4 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index ff9f561134a..da3fc455ba2 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.4", - "regenerated": "2022-09-13 07:28:02.784061", - "spec_repo_commit": "82fabb35" + "regenerated": "2022-09-14 07:52:39.048467", + "spec_repo_commit": "4e5b7510" }, "v2": { "apigentools_version": "1.6.4", - "regenerated": "2022-09-13 07:28:02.796264", - "spec_repo_commit": "82fabb35" + "regenerated": "2022-09-14 07:52:39.066098", + "spec_repo_commit": "4e5b7510" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 3b423d98db4..8260d429787 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -3627,6 +3627,7 @@ components: description: Supported products for hourly usage attribution requests. enum: - api_usage + - apm_fargate_usage - apm_host_usage - appsec_usage - browser_usage @@ -3654,6 +3655,7 @@ components: type: string x-enum-varnames: - API_USAGE + - APM_FARGATE_USAGE - APM_HOST_USAGE - APPSEC_USAGE - BROWSER_USAGE @@ -6875,6 +6877,8 @@ components: enum: - api_usage - api_percentage + - apm_fargate_usage + - apm_fargate_percentage - apm_host_usage - apm_host_percentage - appsec_usage @@ -6928,6 +6932,8 @@ components: x-enum-varnames: - API_USAGE - API_PERCENTAGE + - APM_FARGATE_USAGE + - APM_FARGATE_PERCENTAGE - APM_HOST_USAGE - APM_HOST_PERCENTAGE - APPSEC_USAGE @@ -6988,6 +6994,14 @@ components: description: The synthetic API test usage by tag(s). format: double type: number + apm_fargate_percentage: + description: The percentage of APM ECS Fargate task usage by tag(s). + format: double + type: number + apm_fargate_usage: + description: The APM ECS Fargate task usage by tag(s). + format: double + type: number apm_host_percentage: description: The percentage of APM host usage by tag(s). format: double @@ -14000,6 +14014,8 @@ components: - estimated_indexed_spans_percentage - estimated_ingested_spans_usage - estimated_ingested_spans_percentage + - apm_fargate_usage + - apm_fargate_percentage type: string x-enum-varnames: - API_PERCENTAGE @@ -14032,6 +14048,8 @@ components: - ESTIMATED_INDEXED_SPANS_PERCENTAGE - ESTIMATED_INGESTED_SPANS_USAGE - ESTIMATED_INGESTED_SPANS_PERCENTAGE + - APM_FARGATE_USAGE + - APM_FARGATE_PERCENTAGE UsageAttributionSupportedMetrics: description: Supported fields for usage attribution requests (valid requests contain one or more metrics, or `*` for all). @@ -14076,6 +14094,8 @@ components: - estimated_indexed_spans_percentage - estimated_ingested_spans_usage - estimated_ingested_spans_percentage + - apm_fargate_usage + - apm_fargate_percentage - '*' type: string x-enum-varnames: @@ -14119,6 +14139,8 @@ components: - ESTIMATED_INDEXED_SPANS_PERCENTAGE - ESTIMATED_INGESTED_SPANS_USAGE - ESTIMATED_INGESTED_SPANS_PERCENTAGE + - APM_FARGATE_USAGE + - APM_FARGATE_PERCENTAGE - ALL UsageAttributionTagNames: additionalProperties: @@ -14159,6 +14181,14 @@ components: description: The synthetic API test usage by tag(s). format: double type: number + apm_fargate_percentage: + description: The percentage of APM ECS Fargate task usage by tag(s). + format: double + type: number + apm_fargate_usage: + description: The APM ECS Fargate task usage by tag(s). + format: double + type: number apm_host_percentage: description: The percentage of APM host usage by tag(s). format: double @@ -14843,6 +14873,11 @@ components: UsageFargateHour: description: Number of Fargate tasks run and hourly usage. properties: + apm_fargate_count: + description: The high-water mark of APM ECS Fargate tasks during the given + hour. + format: int64 + type: integer avg_profiled_fargate_tasks: description: The average profiled task count for Fargate Profiling. format: int64 @@ -15645,6 +15680,11 @@ components: over all hours in the current date all organizations. format: int64 type: integer + apm_fargate_count_avg: + description: Shows the average of all APM ECS Fargate tasks over all hours + in the current date for all organizations. + format: int64 + type: integer apm_host_top99p: description: Shows the 99th percentile of all distinct APM hosts over all hours in the current date for all organizations. @@ -15975,6 +16015,11 @@ components: over all hours in the current date for the given org. format: int64 type: integer + apm_fargate_count_avg: + description: Shows the average of all APM ECS Fargate tasks over all hours + in the current months for the given org. + format: int64 + type: integer apm_host_top99p: description: Shows the 99th percentile of all distinct APM hosts over all hours in the current date for the given org. @@ -16308,6 +16353,11 @@ components: over all hours in the current months all organizations. format: int64 type: integer + apm_fargate_count_avg_sum: + description: Shows the average of all APM ECS Fargate tasks over all hours + in the current months for all organizations. + format: int64 + type: integer apm_host_top99p_sum: description: Shows the 99th percentile of all distinct APM hosts over all hours in the current months for all organizations. diff --git a/api/datadogV1/model_hourly_usage_attribution_usage_type.go b/api/datadogV1/model_hourly_usage_attribution_usage_type.go index 2351681777a..d5da83d2c00 100644 --- a/api/datadogV1/model_hourly_usage_attribution_usage_type.go +++ b/api/datadogV1/model_hourly_usage_attribution_usage_type.go @@ -15,6 +15,7 @@ type HourlyUsageAttributionUsageType string // List of HourlyUsageAttributionUsageType. const ( HOURLYUSAGEATTRIBUTIONUSAGETYPE_API_USAGE HourlyUsageAttributionUsageType = "api_usage" + HOURLYUSAGEATTRIBUTIONUSAGETYPE_APM_FARGATE_USAGE HourlyUsageAttributionUsageType = "apm_fargate_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_APM_HOST_USAGE HourlyUsageAttributionUsageType = "apm_host_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_APPSEC_USAGE HourlyUsageAttributionUsageType = "appsec_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_BROWSER_USAGE HourlyUsageAttributionUsageType = "browser_usage" @@ -43,6 +44,7 @@ const ( var allowedHourlyUsageAttributionUsageTypeEnumValues = []HourlyUsageAttributionUsageType{ HOURLYUSAGEATTRIBUTIONUSAGETYPE_API_USAGE, + HOURLYUSAGEATTRIBUTIONUSAGETYPE_APM_FARGATE_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_APM_HOST_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_APPSEC_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_BROWSER_USAGE, diff --git a/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go b/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go index 008115f06fe..10a1db1fa5c 100644 --- a/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go +++ b/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go @@ -16,6 +16,8 @@ type MonthlyUsageAttributionSupportedMetrics string const ( MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_API_USAGE MonthlyUsageAttributionSupportedMetrics = "api_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_API_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "api_percentage" + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_USAGE MonthlyUsageAttributionSupportedMetrics = "apm_fargate_usage" + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "apm_fargate_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_HOST_USAGE MonthlyUsageAttributionSupportedMetrics = "apm_host_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_HOST_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "apm_host_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APPSEC_USAGE MonthlyUsageAttributionSupportedMetrics = "appsec_usage" @@ -70,6 +72,8 @@ const ( var allowedMonthlyUsageAttributionSupportedMetricsEnumValues = []MonthlyUsageAttributionSupportedMetrics{ MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_API_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_API_PERCENTAGE, + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_USAGE, + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_HOST_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APM_HOST_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APPSEC_USAGE, diff --git a/api/datadogV1/model_monthly_usage_attribution_values.go b/api/datadogV1/model_monthly_usage_attribution_values.go index 08b90ef14a5..9e2927b89ec 100644 --- a/api/datadogV1/model_monthly_usage_attribution_values.go +++ b/api/datadogV1/model_monthly_usage_attribution_values.go @@ -14,6 +14,10 @@ type MonthlyUsageAttributionValues struct { ApiPercentage *float64 `json:"api_percentage,omitempty"` // The synthetic API test usage by tag(s). ApiUsage *float64 `json:"api_usage,omitempty"` + // The percentage of APM ECS Fargate task usage by tag(s). + ApmFargatePercentage *float64 `json:"apm_fargate_percentage,omitempty"` + // The APM ECS Fargate task usage by tag(s). + ApmFargateUsage *float64 `json:"apm_fargate_usage,omitempty"` // The percentage of APM host usage by tag(s). ApmHostPercentage *float64 `json:"apm_host_percentage,omitempty"` // The APM host usage by tag(s). @@ -172,6 +176,70 @@ func (o *MonthlyUsageAttributionValues) SetApiUsage(v float64) { o.ApiUsage = &v } +// GetApmFargatePercentage returns the ApmFargatePercentage field value if set, zero value otherwise. +func (o *MonthlyUsageAttributionValues) GetApmFargatePercentage() float64 { + if o == nil || o.ApmFargatePercentage == nil { + var ret float64 + return ret + } + return *o.ApmFargatePercentage +} + +// GetApmFargatePercentageOk returns a tuple with the ApmFargatePercentage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *MonthlyUsageAttributionValues) GetApmFargatePercentageOk() (*float64, bool) { + if o == nil || o.ApmFargatePercentage == nil { + return nil, false + } + return o.ApmFargatePercentage, true +} + +// HasApmFargatePercentage returns a boolean if a field has been set. +func (o *MonthlyUsageAttributionValues) HasApmFargatePercentage() bool { + if o != nil && o.ApmFargatePercentage != nil { + return true + } + + return false +} + +// SetApmFargatePercentage gets a reference to the given float64 and assigns it to the ApmFargatePercentage field. +func (o *MonthlyUsageAttributionValues) SetApmFargatePercentage(v float64) { + o.ApmFargatePercentage = &v +} + +// GetApmFargateUsage returns the ApmFargateUsage field value if set, zero value otherwise. +func (o *MonthlyUsageAttributionValues) GetApmFargateUsage() float64 { + if o == nil || o.ApmFargateUsage == nil { + var ret float64 + return ret + } + return *o.ApmFargateUsage +} + +// GetApmFargateUsageOk returns a tuple with the ApmFargateUsage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *MonthlyUsageAttributionValues) GetApmFargateUsageOk() (*float64, bool) { + if o == nil || o.ApmFargateUsage == nil { + return nil, false + } + return o.ApmFargateUsage, true +} + +// HasApmFargateUsage returns a boolean if a field has been set. +func (o *MonthlyUsageAttributionValues) HasApmFargateUsage() bool { + if o != nil && o.ApmFargateUsage != nil { + return true + } + + return false +} + +// SetApmFargateUsage gets a reference to the given float64 and assigns it to the ApmFargateUsage field. +func (o *MonthlyUsageAttributionValues) SetApmFargateUsage(v float64) { + o.ApmFargateUsage = &v +} + // GetApmHostPercentage returns the ApmHostPercentage field value if set, zero value otherwise. func (o *MonthlyUsageAttributionValues) GetApmHostPercentage() float64 { if o == nil || o.ApmHostPercentage == nil { @@ -1336,6 +1404,12 @@ func (o MonthlyUsageAttributionValues) MarshalJSON() ([]byte, error) { if o.ApiUsage != nil { toSerialize["api_usage"] = o.ApiUsage } + if o.ApmFargatePercentage != nil { + toSerialize["apm_fargate_percentage"] = o.ApmFargatePercentage + } + if o.ApmFargateUsage != nil { + toSerialize["apm_fargate_usage"] = o.ApmFargateUsage + } if o.ApmHostPercentage != nil { toSerialize["apm_host_percentage"] = o.ApmHostPercentage } @@ -1457,6 +1531,8 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) all := struct { ApiPercentage *float64 `json:"api_percentage,omitempty"` ApiUsage *float64 `json:"api_usage,omitempty"` + ApmFargatePercentage *float64 `json:"apm_fargate_percentage,omitempty"` + ApmFargateUsage *float64 `json:"apm_fargate_usage,omitempty"` ApmHostPercentage *float64 `json:"apm_host_percentage,omitempty"` ApmHostUsage *float64 `json:"apm_host_usage,omitempty"` AppsecPercentage *float64 `json:"appsec_percentage,omitempty"` @@ -1505,6 +1581,8 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) } o.ApiPercentage = all.ApiPercentage o.ApiUsage = all.ApiUsage + o.ApmFargatePercentage = all.ApmFargatePercentage + o.ApmFargateUsage = all.ApmFargateUsage o.ApmHostPercentage = all.ApmHostPercentage o.ApmHostUsage = all.ApmHostUsage o.AppsecPercentage = all.AppsecPercentage diff --git a/api/datadogV1/model_usage_attribution_sort.go b/api/datadogV1/model_usage_attribution_sort.go index 7c0f5029b58..5a8acd164b0 100644 --- a/api/datadogV1/model_usage_attribution_sort.go +++ b/api/datadogV1/model_usage_attribution_sort.go @@ -44,6 +44,8 @@ const ( USAGEATTRIBUTIONSORT_ESTIMATED_INDEXED_SPANS_PERCENTAGE UsageAttributionSort = "estimated_indexed_spans_percentage" USAGEATTRIBUTIONSORT_ESTIMATED_INGESTED_SPANS_USAGE UsageAttributionSort = "estimated_ingested_spans_usage" USAGEATTRIBUTIONSORT_ESTIMATED_INGESTED_SPANS_PERCENTAGE UsageAttributionSort = "estimated_ingested_spans_percentage" + USAGEATTRIBUTIONSORT_APM_FARGATE_USAGE UsageAttributionSort = "apm_fargate_usage" + USAGEATTRIBUTIONSORT_APM_FARGATE_PERCENTAGE UsageAttributionSort = "apm_fargate_percentage" ) var allowedUsageAttributionSortEnumValues = []UsageAttributionSort{ @@ -77,6 +79,8 @@ var allowedUsageAttributionSortEnumValues = []UsageAttributionSort{ USAGEATTRIBUTIONSORT_ESTIMATED_INDEXED_SPANS_PERCENTAGE, USAGEATTRIBUTIONSORT_ESTIMATED_INGESTED_SPANS_USAGE, USAGEATTRIBUTIONSORT_ESTIMATED_INGESTED_SPANS_PERCENTAGE, + USAGEATTRIBUTIONSORT_APM_FARGATE_USAGE, + USAGEATTRIBUTIONSORT_APM_FARGATE_PERCENTAGE, } // GetAllowedValues reeturns the list of possible values. diff --git a/api/datadogV1/model_usage_attribution_supported_metrics.go b/api/datadogV1/model_usage_attribution_supported_metrics.go index 9baa4f9f725..50be8ed6434 100644 --- a/api/datadogV1/model_usage_attribution_supported_metrics.go +++ b/api/datadogV1/model_usage_attribution_supported_metrics.go @@ -54,6 +54,8 @@ const ( USAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_INDEXED_SPANS_PERCENTAGE UsageAttributionSupportedMetrics = "estimated_indexed_spans_percentage" USAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_INGESTED_SPANS_USAGE UsageAttributionSupportedMetrics = "estimated_ingested_spans_usage" USAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_INGESTED_SPANS_PERCENTAGE UsageAttributionSupportedMetrics = "estimated_ingested_spans_percentage" + USAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_USAGE UsageAttributionSupportedMetrics = "apm_fargate_usage" + USAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_PERCENTAGE UsageAttributionSupportedMetrics = "apm_fargate_percentage" USAGEATTRIBUTIONSUPPORTEDMETRICS_ALL UsageAttributionSupportedMetrics = "*" ) @@ -98,6 +100,8 @@ var allowedUsageAttributionSupportedMetricsEnumValues = []UsageAttributionSuppor USAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_INDEXED_SPANS_PERCENTAGE, USAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_INGESTED_SPANS_USAGE, USAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_INGESTED_SPANS_PERCENTAGE, + USAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_USAGE, + USAGEATTRIBUTIONSUPPORTEDMETRICS_APM_FARGATE_PERCENTAGE, USAGEATTRIBUTIONSUPPORTEDMETRICS_ALL, } diff --git a/api/datadogV1/model_usage_attribution_values.go b/api/datadogV1/model_usage_attribution_values.go index 434fe5f7af6..02a6810e1dc 100644 --- a/api/datadogV1/model_usage_attribution_values.go +++ b/api/datadogV1/model_usage_attribution_values.go @@ -14,6 +14,10 @@ type UsageAttributionValues struct { ApiPercentage *float64 `json:"api_percentage,omitempty"` // The synthetic API test usage by tag(s). ApiUsage *float64 `json:"api_usage,omitempty"` + // The percentage of APM ECS Fargate task usage by tag(s). + ApmFargatePercentage *float64 `json:"apm_fargate_percentage,omitempty"` + // The APM ECS Fargate task usage by tag(s). + ApmFargateUsage *float64 `json:"apm_fargate_usage,omitempty"` // The percentage of APM host usage by tag(s). ApmHostPercentage *float64 `json:"apm_host_percentage,omitempty"` // The APM host usage by tag(s). @@ -188,6 +192,70 @@ func (o *UsageAttributionValues) SetApiUsage(v float64) { o.ApiUsage = &v } +// GetApmFargatePercentage returns the ApmFargatePercentage field value if set, zero value otherwise. +func (o *UsageAttributionValues) GetApmFargatePercentage() float64 { + if o == nil || o.ApmFargatePercentage == nil { + var ret float64 + return ret + } + return *o.ApmFargatePercentage +} + +// GetApmFargatePercentageOk returns a tuple with the ApmFargatePercentage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *UsageAttributionValues) GetApmFargatePercentageOk() (*float64, bool) { + if o == nil || o.ApmFargatePercentage == nil { + return nil, false + } + return o.ApmFargatePercentage, true +} + +// HasApmFargatePercentage returns a boolean if a field has been set. +func (o *UsageAttributionValues) HasApmFargatePercentage() bool { + if o != nil && o.ApmFargatePercentage != nil { + return true + } + + return false +} + +// SetApmFargatePercentage gets a reference to the given float64 and assigns it to the ApmFargatePercentage field. +func (o *UsageAttributionValues) SetApmFargatePercentage(v float64) { + o.ApmFargatePercentage = &v +} + +// GetApmFargateUsage returns the ApmFargateUsage field value if set, zero value otherwise. +func (o *UsageAttributionValues) GetApmFargateUsage() float64 { + if o == nil || o.ApmFargateUsage == nil { + var ret float64 + return ret + } + return *o.ApmFargateUsage +} + +// GetApmFargateUsageOk returns a tuple with the ApmFargateUsage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *UsageAttributionValues) GetApmFargateUsageOk() (*float64, bool) { + if o == nil || o.ApmFargateUsage == nil { + return nil, false + } + return o.ApmFargateUsage, true +} + +// HasApmFargateUsage returns a boolean if a field has been set. +func (o *UsageAttributionValues) HasApmFargateUsage() bool { + if o != nil && o.ApmFargateUsage != nil { + return true + } + + return false +} + +// SetApmFargateUsage gets a reference to the given float64 and assigns it to the ApmFargateUsage field. +func (o *UsageAttributionValues) SetApmFargateUsage(v float64) { + o.ApmFargateUsage = &v +} + // GetApmHostPercentage returns the ApmHostPercentage field value if set, zero value otherwise. func (o *UsageAttributionValues) GetApmHostPercentage() float64 { if o == nil || o.ApmHostPercentage == nil { @@ -1608,6 +1676,12 @@ func (o UsageAttributionValues) MarshalJSON() ([]byte, error) { if o.ApiUsage != nil { toSerialize["api_usage"] = o.ApiUsage } + if o.ApmFargatePercentage != nil { + toSerialize["apm_fargate_percentage"] = o.ApmFargatePercentage + } + if o.ApmFargateUsage != nil { + toSerialize["apm_fargate_usage"] = o.ApmFargateUsage + } if o.ApmHostPercentage != nil { toSerialize["apm_host_percentage"] = o.ApmHostPercentage } @@ -1753,6 +1827,8 @@ func (o *UsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) { all := struct { ApiPercentage *float64 `json:"api_percentage,omitempty"` ApiUsage *float64 `json:"api_usage,omitempty"` + ApmFargatePercentage *float64 `json:"apm_fargate_percentage,omitempty"` + ApmFargateUsage *float64 `json:"apm_fargate_usage,omitempty"` ApmHostPercentage *float64 `json:"apm_host_percentage,omitempty"` ApmHostUsage *float64 `json:"apm_host_usage,omitempty"` AppsecPercentage *float64 `json:"appsec_percentage,omitempty"` @@ -1809,6 +1885,8 @@ func (o *UsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) { } o.ApiPercentage = all.ApiPercentage o.ApiUsage = all.ApiUsage + o.ApmFargatePercentage = all.ApmFargatePercentage + o.ApmFargateUsage = all.ApmFargateUsage o.ApmHostPercentage = all.ApmHostPercentage o.ApmHostUsage = all.ApmHostUsage o.AppsecPercentage = all.AppsecPercentage diff --git a/api/datadogV1/model_usage_fargate_hour.go b/api/datadogV1/model_usage_fargate_hour.go index 864bd2e769d..804e9caeb69 100644 --- a/api/datadogV1/model_usage_fargate_hour.go +++ b/api/datadogV1/model_usage_fargate_hour.go @@ -11,6 +11,8 @@ import ( // UsageFargateHour Number of Fargate tasks run and hourly usage. type UsageFargateHour struct { + // The high-water mark of APM ECS Fargate tasks during the given hour. + ApmFargateCount *int64 `json:"apm_fargate_count,omitempty"` // The average profiled task count for Fargate Profiling. AvgProfiledFargateTasks *int64 `json:"avg_profiled_fargate_tasks,omitempty"` // The hour for the usage. @@ -43,6 +45,38 @@ func NewUsageFargateHourWithDefaults() *UsageFargateHour { return &this } +// GetApmFargateCount returns the ApmFargateCount field value if set, zero value otherwise. +func (o *UsageFargateHour) GetApmFargateCount() int64 { + if o == nil || o.ApmFargateCount == nil { + var ret int64 + return ret + } + return *o.ApmFargateCount +} + +// GetApmFargateCountOk returns a tuple with the ApmFargateCount field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *UsageFargateHour) GetApmFargateCountOk() (*int64, bool) { + if o == nil || o.ApmFargateCount == nil { + return nil, false + } + return o.ApmFargateCount, true +} + +// HasApmFargateCount returns a boolean if a field has been set. +func (o *UsageFargateHour) HasApmFargateCount() bool { + if o != nil && o.ApmFargateCount != nil { + return true + } + + return false +} + +// SetApmFargateCount gets a reference to the given int64 and assigns it to the ApmFargateCount field. +func (o *UsageFargateHour) SetApmFargateCount(v int64) { + o.ApmFargateCount = &v +} + // GetAvgProfiledFargateTasks returns the AvgProfiledFargateTasks field value if set, zero value otherwise. func (o *UsageFargateHour) GetAvgProfiledFargateTasks() int64 { if o == nil || o.AvgProfiledFargateTasks == nil { @@ -209,6 +243,9 @@ func (o UsageFargateHour) MarshalJSON() ([]byte, error) { if o.UnparsedObject != nil { return json.Marshal(o.UnparsedObject) } + if o.ApmFargateCount != nil { + toSerialize["apm_fargate_count"] = o.ApmFargateCount + } if o.AvgProfiledFargateTasks != nil { toSerialize["avg_profiled_fargate_tasks"] = o.AvgProfiledFargateTasks } @@ -239,6 +276,7 @@ func (o UsageFargateHour) MarshalJSON() ([]byte, error) { func (o *UsageFargateHour) UnmarshalJSON(bytes []byte) (err error) { raw := map[string]interface{}{} all := struct { + ApmFargateCount *int64 `json:"apm_fargate_count,omitempty"` AvgProfiledFargateTasks *int64 `json:"avg_profiled_fargate_tasks,omitempty"` Hour *time.Time `json:"hour,omitempty"` OrgName *string `json:"org_name,omitempty"` @@ -254,6 +292,7 @@ func (o *UsageFargateHour) UnmarshalJSON(bytes []byte) (err error) { o.UnparsedObject = raw return nil } + o.ApmFargateCount = all.ApmFargateCount o.AvgProfiledFargateTasks = all.AvgProfiledFargateTasks o.Hour = all.Hour o.OrgName = all.OrgName diff --git a/api/datadogV1/model_usage_summary_date.go b/api/datadogV1/model_usage_summary_date.go index adf56d6f896..6854d9896b3 100644 --- a/api/datadogV1/model_usage_summary_date.go +++ b/api/datadogV1/model_usage_summary_date.go @@ -15,6 +15,8 @@ type UsageSummaryDate struct { AgentHostTop99p *int64 `json:"agent_host_top99p,omitempty"` // Shows the 99th percentile of all Azure app services using APM over all hours in the current date all organizations. ApmAzureAppServiceHostTop99p *int64 `json:"apm_azure_app_service_host_top99p,omitempty"` + // Shows the average of all APM ECS Fargate tasks over all hours in the current date for all organizations. + ApmFargateCountAvg *int64 `json:"apm_fargate_count_avg,omitempty"` // Shows the 99th percentile of all distinct APM hosts over all hours in the current date for all organizations. ApmHostTop99p *int64 `json:"apm_host_top99p,omitempty"` // Shows the sum of audit logs lines indexed over all hours in the current date for all organizations. @@ -227,6 +229,38 @@ func (o *UsageSummaryDate) SetApmAzureAppServiceHostTop99p(v int64) { o.ApmAzureAppServiceHostTop99p = &v } +// GetApmFargateCountAvg returns the ApmFargateCountAvg field value if set, zero value otherwise. +func (o *UsageSummaryDate) GetApmFargateCountAvg() int64 { + if o == nil || o.ApmFargateCountAvg == nil { + var ret int64 + return ret + } + return *o.ApmFargateCountAvg +} + +// GetApmFargateCountAvgOk returns a tuple with the ApmFargateCountAvg field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *UsageSummaryDate) GetApmFargateCountAvgOk() (*int64, bool) { + if o == nil || o.ApmFargateCountAvg == nil { + return nil, false + } + return o.ApmFargateCountAvg, true +} + +// HasApmFargateCountAvg returns a boolean if a field has been set. +func (o *UsageSummaryDate) HasApmFargateCountAvg() bool { + if o != nil && o.ApmFargateCountAvg != nil { + return true + } + + return false +} + +// SetApmFargateCountAvg gets a reference to the given int64 and assigns it to the ApmFargateCountAvg field. +func (o *UsageSummaryDate) SetApmFargateCountAvg(v int64) { + o.ApmFargateCountAvg = &v +} + // GetApmHostTop99p returns the ApmHostTop99p field value if set, zero value otherwise. func (o *UsageSummaryDate) GetApmHostTop99p() int64 { if o == nil || o.ApmHostTop99p == nil { @@ -2255,6 +2289,9 @@ func (o UsageSummaryDate) MarshalJSON() ([]byte, error) { if o.ApmAzureAppServiceHostTop99p != nil { toSerialize["apm_azure_app_service_host_top99p"] = o.ApmAzureAppServiceHostTop99p } + if o.ApmFargateCountAvg != nil { + toSerialize["apm_fargate_count_avg"] = o.ApmFargateCountAvg + } if o.ApmHostTop99p != nil { toSerialize["apm_host_top99p"] = o.ApmHostTop99p } @@ -2461,6 +2498,7 @@ func (o *UsageSummaryDate) UnmarshalJSON(bytes []byte) (err error) { all := struct { AgentHostTop99p *int64 `json:"agent_host_top99p,omitempty"` ApmAzureAppServiceHostTop99p *int64 `json:"apm_azure_app_service_host_top99p,omitempty"` + ApmFargateCountAvg *int64 `json:"apm_fargate_count_avg,omitempty"` ApmHostTop99p *int64 `json:"apm_host_top99p,omitempty"` AuditLogsLinesIndexedSum *int64 `json:"audit_logs_lines_indexed_sum,omitempty"` AvgProfiledFargateTasks *int64 `json:"avg_profiled_fargate_tasks,omitempty"` @@ -2536,6 +2574,7 @@ func (o *UsageSummaryDate) UnmarshalJSON(bytes []byte) (err error) { } o.AgentHostTop99p = all.AgentHostTop99p o.ApmAzureAppServiceHostTop99p = all.ApmAzureAppServiceHostTop99p + o.ApmFargateCountAvg = all.ApmFargateCountAvg o.ApmHostTop99p = all.ApmHostTop99p o.AuditLogsLinesIndexedSum = all.AuditLogsLinesIndexedSum o.AvgProfiledFargateTasks = all.AvgProfiledFargateTasks diff --git a/api/datadogV1/model_usage_summary_date_org.go b/api/datadogV1/model_usage_summary_date_org.go index 3bb236bfe11..7b5cde40a23 100644 --- a/api/datadogV1/model_usage_summary_date_org.go +++ b/api/datadogV1/model_usage_summary_date_org.go @@ -14,6 +14,8 @@ type UsageSummaryDateOrg struct { AgentHostTop99p *int64 `json:"agent_host_top99p,omitempty"` // Shows the 99th percentile of all Azure app services using APM over all hours in the current date for the given org. ApmAzureAppServiceHostTop99p *int64 `json:"apm_azure_app_service_host_top99p,omitempty"` + // Shows the average of all APM ECS Fargate tasks over all hours in the current months for the given org. + ApmFargateCountAvg *int64 `json:"apm_fargate_count_avg,omitempty"` // Shows the 99th percentile of all distinct APM hosts over all hours in the current date for the given org. ApmHostTop99p *int64 `json:"apm_host_top99p,omitempty"` // Shows the sum of all audit logs lines indexed over all hours in the current date for the given org. @@ -230,6 +232,38 @@ func (o *UsageSummaryDateOrg) SetApmAzureAppServiceHostTop99p(v int64) { o.ApmAzureAppServiceHostTop99p = &v } +// GetApmFargateCountAvg returns the ApmFargateCountAvg field value if set, zero value otherwise. +func (o *UsageSummaryDateOrg) GetApmFargateCountAvg() int64 { + if o == nil || o.ApmFargateCountAvg == nil { + var ret int64 + return ret + } + return *o.ApmFargateCountAvg +} + +// GetApmFargateCountAvgOk returns a tuple with the ApmFargateCountAvg field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *UsageSummaryDateOrg) GetApmFargateCountAvgOk() (*int64, bool) { + if o == nil || o.ApmFargateCountAvg == nil { + return nil, false + } + return o.ApmFargateCountAvg, true +} + +// HasApmFargateCountAvg returns a boolean if a field has been set. +func (o *UsageSummaryDateOrg) HasApmFargateCountAvg() bool { + if o != nil && o.ApmFargateCountAvg != nil { + return true + } + + return false +} + +// SetApmFargateCountAvg gets a reference to the given int64 and assigns it to the ApmFargateCountAvg field. +func (o *UsageSummaryDateOrg) SetApmFargateCountAvg(v int64) { + o.ApmFargateCountAvg = &v +} + // GetApmHostTop99p returns the ApmHostTop99p field value if set, zero value otherwise. func (o *UsageSummaryDateOrg) GetApmHostTop99p() int64 { if o == nil || o.ApmHostTop99p == nil { @@ -2322,6 +2356,9 @@ func (o UsageSummaryDateOrg) MarshalJSON() ([]byte, error) { if o.ApmAzureAppServiceHostTop99p != nil { toSerialize["apm_azure_app_service_host_top99p"] = o.ApmAzureAppServiceHostTop99p } + if o.ApmFargateCountAvg != nil { + toSerialize["apm_fargate_count_avg"] = o.ApmFargateCountAvg + } if o.ApmHostTop99p != nil { toSerialize["apm_host_top99p"] = o.ApmHostTop99p } @@ -2530,6 +2567,7 @@ func (o *UsageSummaryDateOrg) UnmarshalJSON(bytes []byte) (err error) { all := struct { AgentHostTop99p *int64 `json:"agent_host_top99p,omitempty"` ApmAzureAppServiceHostTop99p *int64 `json:"apm_azure_app_service_host_top99p,omitempty"` + ApmFargateCountAvg *int64 `json:"apm_fargate_count_avg,omitempty"` ApmHostTop99p *int64 `json:"apm_host_top99p,omitempty"` AuditLogsLinesIndexedSum *int64 `json:"audit_logs_lines_indexed_sum,omitempty"` AvgProfiledFargateTasks *int64 `json:"avg_profiled_fargate_tasks,omitempty"` @@ -2607,6 +2645,7 @@ func (o *UsageSummaryDateOrg) UnmarshalJSON(bytes []byte) (err error) { } o.AgentHostTop99p = all.AgentHostTop99p o.ApmAzureAppServiceHostTop99p = all.ApmAzureAppServiceHostTop99p + o.ApmFargateCountAvg = all.ApmFargateCountAvg o.ApmHostTop99p = all.ApmHostTop99p o.AuditLogsLinesIndexedSum = all.AuditLogsLinesIndexedSum o.AvgProfiledFargateTasks = all.AvgProfiledFargateTasks diff --git a/api/datadogV1/model_usage_summary_response.go b/api/datadogV1/model_usage_summary_response.go index d0adf4af346..2e23d821912 100644 --- a/api/datadogV1/model_usage_summary_response.go +++ b/api/datadogV1/model_usage_summary_response.go @@ -15,6 +15,8 @@ type UsageSummaryResponse struct { AgentHostTop99pSum *int64 `json:"agent_host_top99p_sum,omitempty"` // Shows the 99th percentile of all Azure app services using APM over all hours in the current months all organizations. ApmAzureAppServiceHostTop99pSum *int64 `json:"apm_azure_app_service_host_top99p_sum,omitempty"` + // Shows the average of all APM ECS Fargate tasks over all hours in the current months for all organizations. + ApmFargateCountAvgSum *int64 `json:"apm_fargate_count_avg_sum,omitempty"` // Shows the 99th percentile of all distinct APM hosts over all hours in the current months for all organizations. ApmHostTop99pSum *int64 `json:"apm_host_top99p_sum,omitempty"` // Shows the sum of all audit logs lines indexed over all hours in the current months for all organizations. @@ -245,6 +247,38 @@ func (o *UsageSummaryResponse) SetApmAzureAppServiceHostTop99pSum(v int64) { o.ApmAzureAppServiceHostTop99pSum = &v } +// GetApmFargateCountAvgSum returns the ApmFargateCountAvgSum field value if set, zero value otherwise. +func (o *UsageSummaryResponse) GetApmFargateCountAvgSum() int64 { + if o == nil || o.ApmFargateCountAvgSum == nil { + var ret int64 + return ret + } + return *o.ApmFargateCountAvgSum +} + +// GetApmFargateCountAvgSumOk returns a tuple with the ApmFargateCountAvgSum field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *UsageSummaryResponse) GetApmFargateCountAvgSumOk() (*int64, bool) { + if o == nil || o.ApmFargateCountAvgSum == nil { + return nil, false + } + return o.ApmFargateCountAvgSum, true +} + +// HasApmFargateCountAvgSum returns a boolean if a field has been set. +func (o *UsageSummaryResponse) HasApmFargateCountAvgSum() bool { + if o != nil && o.ApmFargateCountAvgSum != nil { + return true + } + + return false +} + +// SetApmFargateCountAvgSum gets a reference to the given int64 and assigns it to the ApmFargateCountAvgSum field. +func (o *UsageSummaryResponse) SetApmFargateCountAvgSum(v int64) { + o.ApmFargateCountAvgSum = &v +} + // GetApmHostTop99pSum returns the ApmHostTop99pSum field value if set, zero value otherwise. func (o *UsageSummaryResponse) GetApmHostTop99pSum() int64 { if o == nil || o.ApmHostTop99pSum == nil { @@ -2561,6 +2595,9 @@ func (o UsageSummaryResponse) MarshalJSON() ([]byte, error) { if o.ApmAzureAppServiceHostTop99pSum != nil { toSerialize["apm_azure_app_service_host_top99p_sum"] = o.ApmAzureAppServiceHostTop99pSum } + if o.ApmFargateCountAvgSum != nil { + toSerialize["apm_fargate_count_avg_sum"] = o.ApmFargateCountAvgSum + } if o.ApmHostTop99pSum != nil { toSerialize["apm_host_top99p_sum"] = o.ApmHostTop99pSum } @@ -2802,6 +2839,7 @@ func (o *UsageSummaryResponse) UnmarshalJSON(bytes []byte) (err error) { all := struct { AgentHostTop99pSum *int64 `json:"agent_host_top99p_sum,omitempty"` ApmAzureAppServiceHostTop99pSum *int64 `json:"apm_azure_app_service_host_top99p_sum,omitempty"` + ApmFargateCountAvgSum *int64 `json:"apm_fargate_count_avg_sum,omitempty"` ApmHostTop99pSum *int64 `json:"apm_host_top99p_sum,omitempty"` AuditLogsLinesIndexedAggSum *int64 `json:"audit_logs_lines_indexed_agg_sum,omitempty"` AvgProfiledFargateTasksSum *int64 `json:"avg_profiled_fargate_tasks_sum,omitempty"` @@ -2886,6 +2924,7 @@ func (o *UsageSummaryResponse) UnmarshalJSON(bytes []byte) (err error) { } o.AgentHostTop99pSum = all.AgentHostTop99pSum o.ApmAzureAppServiceHostTop99pSum = all.ApmAzureAppServiceHostTop99pSum + o.ApmFargateCountAvgSum = all.ApmFargateCountAvgSum o.ApmHostTop99pSum = all.ApmHostTop99pSum o.AuditLogsLinesIndexedAggSum = all.AuditLogsLinesIndexedAggSum o.AvgProfiledFargateTasksSum = all.AvgProfiledFargateTasksSum