Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Usage Metering container_excl_agent_usage fields #1857

Merged
merged 1 commit into from
Feb 8, 2023
Merged

Add Usage Metering container_excl_agent_usage fields #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
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-06 21:06:40.680412",
"spec_repo_commit": "17eb9903"
"regenerated": "2023-02-08 15:58:33.427025",
"spec_repo_commit": "7c0c43cc"
},
"v2": {
"apigentools_version": "1.6.4",
"regenerated": "2023-02-06 21:06:40.697519",
"spec_repo_commit": "17eb9903"
"regenerated": "2023-02-08 15:58:33.442544",
"spec_repo_commit": "7c0c43cc"
}
}
}
16 changes: 8 additions & 8 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3652,6 +3652,7 @@ components:
- appsec_fargate_usage
- appsec_usage
- browser_usage
- container_excl_agent_usage
- container_usage
- cspm_containers_usage
- cspm_hosts_usage
Expand All @@ -3673,7 +3674,6 @@ components:
- profiled_host_usage
- snmp_usage
- estimated_rum_sessions_usage
- cont_usage
type: string
x-enum-varnames:
- API_USAGE
Expand All @@ -3682,6 +3682,7 @@ components:
- APPSEC_FARGATE_USAGE
- APPSEC_USAGE
- BROWSER_USAGE
- CONTAINER_EXCL_AGENT_USAGE
- CONTAINER_USAGE
- CSPM_CONTAINERS_USAGE
- CSPM_HOSTS_USAGE
Expand All @@ -3703,7 +3704,6 @@ components:
- PROFILED_HOST_USAGE
- SNMP_USAGE
- ESTIMATED_RUM_SESSIONS_USAGE
- CONT_USAGE
IFrameWidgetDefinition:
description: The iframe widget allows you to embed a portion of any other web
page on your dashboard. Only available on FREE layout dashboards.
Expand Down Expand Up @@ -7084,6 +7084,8 @@ components:
- appsec_percentage
- browser_usage
- browser_percentage
- container_excl_agent_usage
- container_excl_agent_percentage
- container_usage
- container_percentage
- cspm_containers_percentage
Expand Down Expand Up @@ -7126,8 +7128,6 @@ components:
- snmp_percentage
- estimated_rum_sessions_usage
- estimated_rum_sessions_percentage
- cont_usage
- cont_percentage
- '*'
type: string
x-enum-varnames:
Expand All @@ -7143,6 +7143,8 @@ components:
- APPSEC_PERCENTAGE
- BROWSER_USAGE
- BROWSER_PERCENTAGE
- CONTAINER_EXCL_AGENT_USAGE
- CONTAINER_EXCL_AGENT_PERCENTAGE
- CONTAINER_USAGE
- CONTAINER_PERCENTAGE
- CSPM_CONTAINERS_PERCENTAGE
Expand Down Expand Up @@ -7185,8 +7187,6 @@ components:
- SNMP_PERCENTAGE
- ESTIMATED_RUM_SESSIONS_USAGE
- ESTIMATED_RUM_SESSIONS_PERCENTAGE
- CONT_USAGE
- CONT_PERCENTAGE
- ALL
MonthlyUsageAttributionValues:
description: Fields in Usage Summary by tag(s).
Expand Down Expand Up @@ -7242,12 +7242,12 @@ components:
description: The synthetic browser test usage by tag(s).
format: double
type: number
cont_percentage:
container_excl_agent_percentage:
description: The percentage of container usage without the Datadog Agent
by tag(s).
format: double
type: number
cont_usage:
container_excl_agent_usage:
description: The container usage without the Datadog Agent by tag(s).
format: double
type: number
Expand Down
4 changes: 2 additions & 2 deletions api/datadogV1/model_hourly_usage_attribution_usage_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const (
HOURLYUSAGEATTRIBUTIONUSAGETYPE_APPSEC_FARGATE_USAGE HourlyUsageAttributionUsageType = "appsec_fargate_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_APPSEC_USAGE HourlyUsageAttributionUsageType = "appsec_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_BROWSER_USAGE HourlyUsageAttributionUsageType = "browser_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CONTAINER_EXCL_AGENT_USAGE HourlyUsageAttributionUsageType = "container_excl_agent_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CONTAINER_USAGE HourlyUsageAttributionUsageType = "container_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CSPM_CONTAINERS_USAGE HourlyUsageAttributionUsageType = "cspm_containers_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CSPM_HOSTS_USAGE HourlyUsageAttributionUsageType = "cspm_hosts_usage"
Expand All @@ -41,7 +42,6 @@ const (
HOURLYUSAGEATTRIBUTIONUSAGETYPE_PROFILED_HOST_USAGE HourlyUsageAttributionUsageType = "profiled_host_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_SNMP_USAGE HourlyUsageAttributionUsageType = "snmp_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_ESTIMATED_RUM_SESSIONS_USAGE HourlyUsageAttributionUsageType = "estimated_rum_sessions_usage"
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CONT_USAGE HourlyUsageAttributionUsageType = "cont_usage"
)

var allowedHourlyUsageAttributionUsageTypeEnumValues = []HourlyUsageAttributionUsageType{
Expand All @@ -51,6 +51,7 @@ var allowedHourlyUsageAttributionUsageTypeEnumValues = []HourlyUsageAttributionU
HOURLYUSAGEATTRIBUTIONUSAGETYPE_APPSEC_FARGATE_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_APPSEC_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_BROWSER_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CONTAINER_EXCL_AGENT_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CONTAINER_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CSPM_CONTAINERS_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CSPM_HOSTS_USAGE,
Expand All @@ -72,7 +73,6 @@ var allowedHourlyUsageAttributionUsageTypeEnumValues = []HourlyUsageAttributionU
HOURLYUSAGEATTRIBUTIONUSAGETYPE_PROFILED_HOST_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_SNMP_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_ESTIMATED_RUM_SESSIONS_USAGE,
HOURLYUSAGEATTRIBUTIONUSAGETYPE_CONT_USAGE,
}

// GetAllowedValues reeturns the list of possible values.
Expand Down
8 changes: 4 additions & 4 deletions api/datadogV1/model_monthly_usage_attribution_supported_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ const (
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APPSEC_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "appsec_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_BROWSER_USAGE MonthlyUsageAttributionSupportedMetrics = "browser_usage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_BROWSER_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "browser_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_EXCL_AGENT_USAGE MonthlyUsageAttributionSupportedMetrics = "container_excl_agent_usage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_EXCL_AGENT_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "container_excl_agent_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_USAGE MonthlyUsageAttributionSupportedMetrics = "container_usage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "container_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CSPM_CONTAINERS_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "cspm_containers_percentage"
Expand Down Expand Up @@ -68,8 +70,6 @@ const (
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_SNMP_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "snmp_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_RUM_SESSIONS_USAGE MonthlyUsageAttributionSupportedMetrics = "estimated_rum_sessions_usage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_RUM_SESSIONS_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "estimated_rum_sessions_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONT_USAGE MonthlyUsageAttributionSupportedMetrics = "cont_usage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONT_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "cont_percentage"
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_ALL MonthlyUsageAttributionSupportedMetrics = "*"
)

Expand All @@ -86,6 +86,8 @@ var allowedMonthlyUsageAttributionSupportedMetricsEnumValues = []MonthlyUsageAtt
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_APPSEC_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_BROWSER_USAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_BROWSER_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_EXCL_AGENT_USAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_EXCL_AGENT_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_USAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONTAINER_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CSPM_CONTAINERS_PERCENTAGE,
Expand Down Expand Up @@ -128,8 +130,6 @@ var allowedMonthlyUsageAttributionSupportedMetricsEnumValues = []MonthlyUsageAtt
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_SNMP_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_RUM_SESSIONS_USAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_ESTIMATED_RUM_SESSIONS_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONT_USAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CONT_PERCENTAGE,
MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_ALL,
}

Expand Down
76 changes: 38 additions & 38 deletions api/datadogV1/model_monthly_usage_attribution_values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ type MonthlyUsageAttributionValues struct {
// The synthetic browser test usage by tag(s).
BrowserUsage *float64 `json:"browser_usage,omitempty"`
// The percentage of container usage without the Datadog Agent by tag(s).
ContPercentage *float64 `json:"cont_percentage,omitempty"`
ContainerExclAgentPercentage *float64 `json:"container_excl_agent_percentage,omitempty"`
// The container usage without the Datadog Agent by tag(s).
ContUsage *float64 `json:"cont_usage,omitempty"`
ContainerExclAgentUsage *float64 `json:"container_excl_agent_usage,omitempty"`
// The percentage of container usage by tag(s).
ContainerPercentage *float64 `json:"container_percentage,omitempty"`
// The container usage by tag(s).
Expand Down Expand Up @@ -480,60 +480,60 @@ func (o *MonthlyUsageAttributionValues) SetBrowserUsage(v float64) {
o.BrowserUsage = &v
}

// GetContPercentage returns the ContPercentage field value if set, zero value otherwise.
func (o *MonthlyUsageAttributionValues) GetContPercentage() float64 {
if o == nil || o.ContPercentage == nil {
// GetContainerExclAgentPercentage returns the ContainerExclAgentPercentage field value if set, zero value otherwise.
func (o *MonthlyUsageAttributionValues) GetContainerExclAgentPercentage() float64 {
if o == nil || o.ContainerExclAgentPercentage == nil {
var ret float64
return ret
}
return *o.ContPercentage
return *o.ContainerExclAgentPercentage
}

// GetContPercentageOk returns a tuple with the ContPercentage field value if set, nil otherwise
// GetContainerExclAgentPercentageOk returns a tuple with the ContainerExclAgentPercentage field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *MonthlyUsageAttributionValues) GetContPercentageOk() (*float64, bool) {
if o == nil || o.ContPercentage == nil {
func (o *MonthlyUsageAttributionValues) GetContainerExclAgentPercentageOk() (*float64, bool) {
if o == nil || o.ContainerExclAgentPercentage == nil {
return nil, false
}
return o.ContPercentage, true
return o.ContainerExclAgentPercentage, true
}

// HasContPercentage returns a boolean if a field has been set.
func (o *MonthlyUsageAttributionValues) HasContPercentage() bool {
return o != nil && o.ContPercentage != nil
// HasContainerExclAgentPercentage returns a boolean if a field has been set.
func (o *MonthlyUsageAttributionValues) HasContainerExclAgentPercentage() bool {
return o != nil && o.ContainerExclAgentPercentage != nil
}

// SetContPercentage gets a reference to the given float64 and assigns it to the ContPercentage field.
func (o *MonthlyUsageAttributionValues) SetContPercentage(v float64) {
o.ContPercentage = &v
// SetContainerExclAgentPercentage gets a reference to the given float64 and assigns it to the ContainerExclAgentPercentage field.
func (o *MonthlyUsageAttributionValues) SetContainerExclAgentPercentage(v float64) {
o.ContainerExclAgentPercentage = &v
}

// GetContUsage returns the ContUsage field value if set, zero value otherwise.
func (o *MonthlyUsageAttributionValues) GetContUsage() float64 {
if o == nil || o.ContUsage == nil {
// GetContainerExclAgentUsage returns the ContainerExclAgentUsage field value if set, zero value otherwise.
func (o *MonthlyUsageAttributionValues) GetContainerExclAgentUsage() float64 {
if o == nil || o.ContainerExclAgentUsage == nil {
var ret float64
return ret
}
return *o.ContUsage
return *o.ContainerExclAgentUsage
}

// GetContUsageOk returns a tuple with the ContUsage field value if set, nil otherwise
// GetContainerExclAgentUsageOk returns a tuple with the ContainerExclAgentUsage field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *MonthlyUsageAttributionValues) GetContUsageOk() (*float64, bool) {
if o == nil || o.ContUsage == nil {
func (o *MonthlyUsageAttributionValues) GetContainerExclAgentUsageOk() (*float64, bool) {
if o == nil || o.ContainerExclAgentUsage == nil {
return nil, false
}
return o.ContUsage, true
return o.ContainerExclAgentUsage, true
}

// HasContUsage returns a boolean if a field has been set.
func (o *MonthlyUsageAttributionValues) HasContUsage() bool {
return o != nil && o.ContUsage != nil
// HasContainerExclAgentUsage returns a boolean if a field has been set.
func (o *MonthlyUsageAttributionValues) HasContainerExclAgentUsage() bool {
return o != nil && o.ContainerExclAgentUsage != nil
}

// SetContUsage gets a reference to the given float64 and assigns it to the ContUsage field.
func (o *MonthlyUsageAttributionValues) SetContUsage(v float64) {
o.ContUsage = &v
// SetContainerExclAgentUsage gets a reference to the given float64 and assigns it to the ContainerExclAgentUsage field.
func (o *MonthlyUsageAttributionValues) SetContainerExclAgentUsage(v float64) {
o.ContainerExclAgentUsage = &v
}

// GetContainerPercentage returns the ContainerPercentage field value if set, zero value otherwise.
Expand Down Expand Up @@ -1754,11 +1754,11 @@ func (o MonthlyUsageAttributionValues) MarshalJSON() ([]byte, error) {
if o.BrowserUsage != nil {
toSerialize["browser_usage"] = o.BrowserUsage
}
if o.ContPercentage != nil {
toSerialize["cont_percentage"] = o.ContPercentage
if o.ContainerExclAgentPercentage != nil {
toSerialize["container_excl_agent_percentage"] = o.ContainerExclAgentPercentage
}
if o.ContUsage != nil {
toSerialize["cont_usage"] = o.ContUsage
if o.ContainerExclAgentUsage != nil {
toSerialize["container_excl_agent_usage"] = o.ContainerExclAgentUsage
}
if o.ContainerPercentage != nil {
toSerialize["container_percentage"] = o.ContainerPercentage
Expand Down Expand Up @@ -1909,8 +1909,8 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error)
AppsecUsage *float64 `json:"appsec_usage,omitempty"`
BrowserPercentage *float64 `json:"browser_percentage,omitempty"`
BrowserUsage *float64 `json:"browser_usage,omitempty"`
ContPercentage *float64 `json:"cont_percentage,omitempty"`
ContUsage *float64 `json:"cont_usage,omitempty"`
ContainerExclAgentPercentage *float64 `json:"container_excl_agent_percentage,omitempty"`
ContainerExclAgentUsage *float64 `json:"container_excl_agent_usage,omitempty"`
ContainerPercentage *float64 `json:"container_percentage,omitempty"`
ContainerUsage *float64 `json:"container_usage,omitempty"`
CspmContainersPercentage *float64 `json:"cspm_containers_percentage,omitempty"`
Expand Down Expand Up @@ -1975,8 +1975,8 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error)
o.AppsecUsage = all.AppsecUsage
o.BrowserPercentage = all.BrowserPercentage
o.BrowserUsage = all.BrowserUsage
o.ContPercentage = all.ContPercentage
o.ContUsage = all.ContUsage
o.ContainerExclAgentPercentage = all.ContainerExclAgentPercentage
o.ContainerExclAgentUsage = all.ContainerExclAgentUsage
o.ContainerPercentage = all.ContainerPercentage
o.ContainerUsage = all.ContainerUsage
o.CspmContainersPercentage = all.CspmContainersPercentage
Expand Down