Skip to content

Commit 493c4fa

Browse files
Merge master into datadog-api-spec/test/sherz/handle-empty-oneOf
2 parents 7ebaec6 + 46c520f commit 493c4fa

14 files changed

+135
-1219
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": "2024-09-24 18:16:27.931184",
8-
"spec_repo_commit": "2eb52c63"
7+
"regenerated": "2024-09-30 13:56:52.513837",
8+
"spec_repo_commit": "eb66b1cf"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-09-24 18:16:27.945962",
13-
"spec_repo_commit": "2eb52c63"
12+
"regenerated": "2024-09-30 13:56:52.527994",
13+
"spec_repo_commit": "eb66b1cf"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

Lines changed: 22 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -950,64 +950,6 @@ components:
950950
$ref: '#/components/schemas/AWSRelatedAccount'
951951
type: array
952952
type: object
953-
AbbreviatedTeam:
954-
description: The definition of `AbbreviatedTeam` object.
955-
properties:
956-
attributes:
957-
$ref: '#/components/schemas/AbbreviatedTeamAttributes'
958-
id:
959-
description: ID of the team
960-
type: string
961-
type:
962-
$ref: '#/components/schemas/AbbreviatedTeamType'
963-
required:
964-
- attributes
965-
- type
966-
type: object
967-
AbbreviatedTeamAttributes:
968-
description: The definition of `AbbreviatedTeamAttributes` object.
969-
properties:
970-
avatar:
971-
description: Unicode representation of the avatar for the team, limited
972-
to a single grapheme
973-
nullable: true
974-
type: string
975-
banner:
976-
description: Banner selection for the team
977-
format: int64
978-
type: integer
979-
handle:
980-
description: The team's identifier
981-
example: ''
982-
type: string
983-
handles:
984-
description: The `AbbreviatedTeamAttributes` `handles`.
985-
type: string
986-
is_open_membership:
987-
description: The `AbbreviatedTeamAttributes` `is_open_membership`.
988-
readOnly: true
989-
type: boolean
990-
name:
991-
description: The name of the team
992-
example: ''
993-
type: string
994-
summary:
995-
description: A brief summary of the team
996-
readOnly: true
997-
type: string
998-
required:
999-
- handle
1000-
- name
1001-
type: object
1002-
AbbreviatedTeamType:
1003-
default: team
1004-
description: The definition of `AbbreviatedTeamType` object.
1005-
enum:
1006-
- team
1007-
example: team
1008-
type: string
1009-
x-enum-varnames:
1010-
- TEAM
1011953
ActiveBillingDimensionsAttributes:
1012954
description: List of active billing dimensions.
1013955
properties:
@@ -6559,6 +6501,12 @@ components:
65596501
example: 1693491974000000000
65606502
format: int64
65616503
type: integer
6504+
team:
6505+
description: Name of the team owning the deployed service. If not provided,
6506+
this is automatically populated with the team associated with the service
6507+
in the Service Catalog.
6508+
example: backend
6509+
type: string
65626510
version:
65636511
description: Version to correlate with [APM Deployment Tracking](https://docs.datadoghq.com/tracing/services/deployment_tracking/).
65646512
example: v1.12.07
@@ -13991,8 +13939,8 @@ components:
1399113939
- time: sum, space: sum
1399213940

1399313941

13994-
Can only be applied to metrics that have a `metric_type` of `count`, `rate`,
13995-
or `gauge`.'
13942+
Can only be applied to non_distribution metrics that have a `metric_type`
13943+
of `count`, `rate`, or `gauge`.'
1399613944
example:
1399713945
- space: sum
1399813946
time: sum
@@ -14600,6 +14548,17 @@ components:
1460014548
required:
1460114549
- data
1460214550
type: object
14551+
MetricTagConfigurationMetricTypeCategory:
14552+
default: distribution
14553+
description: The metric's type category.
14554+
enum:
14555+
- non_distribution
14556+
- distribution
14557+
example: distribution
14558+
type: string
14559+
x-enum-varnames:
14560+
- NON_DISTRIBUTION
14561+
- DISTRIBUTION
1460314562
MetricTagConfigurationMetricTypes:
1460414563
default: gauge
1460514564
description: The metric's type.
@@ -24866,8 +24825,6 @@ components:
2486624825
oneOf:
2486724826
- $ref: '#/components/schemas/User'
2486824827
- $ref: '#/components/schemas/Team'
24869-
- $ref: '#/components/schemas/AbbreviatedTeam'
24870-
- $ref: '#/components/schemas/UserTeamUser'
2487124828
UserTeamPermission:
2487224829
description: A user's permissions for a given team
2487324830
properties:
@@ -24972,42 +24929,6 @@ components:
2497224929
required:
2497324930
- data
2497424931
type: object
24975-
UserTeamUser:
24976-
description: The definition of `UserTeamUser` object.
24977-
properties:
24978-
attributes:
24979-
$ref: '#/components/schemas/UserTeamUserAttributes'
24980-
id:
24981-
description: The `UserTeamUser` ID.
24982-
type: string
24983-
type:
24984-
$ref: '#/components/schemas/UserTeamUserType'
24985-
required:
24986-
- type
24987-
type: object
24988-
UserTeamUserAttributes:
24989-
description: The definition of `UserTeamUserAttributes` object.
24990-
properties:
24991-
disabled:
24992-
description: The `UserTeamUserAttributes` `disabled`.
24993-
type: boolean
24994-
email:
24995-
description: The `UserTeamUserAttributes` `email`.
24996-
type: string
24997-
handle:
24998-
description: The `UserTeamUserAttributes` `handle`.
24999-
type: string
25000-
icon:
25001-
description: The `UserTeamUserAttributes` `icon`.
25002-
type: string
25003-
name:
25004-
description: The `UserTeamUserAttributes` `name`.
25005-
nullable: true
25006-
type: string
25007-
service_account:
25008-
description: The `UserTeamUserAttributes` `service_account`.
25009-
type: boolean
25010-
type: object
2501124932
UserTeamUserType:
2501224933
default: users
2501324934
description: User team user type
@@ -32495,7 +32416,7 @@ paths:
3249532416
name: filter[metric_type]
3249632417
required: false
3249732418
schema:
32498-
$ref: '#/components/schemas/MetricTagConfigurationMetricTypes'
32419+
$ref: '#/components/schemas/MetricTagConfigurationMetricTypeCategory'
3249932420
- description: 'Filter distributions with additional percentile
3250032421

3250132422
aggregations enabled or disabled.'
@@ -32865,8 +32786,7 @@ paths:
3286532786
schema:
3286632787
type: string
3286732788
- description: The number of hours of look back (from now) to estimate cardinality
32868-
with. Estimates are based on historical data, and unspecified fields default
32869-
to the minimum 49 hours.
32789+
with. If unspecified, it defaults to 0 hours.
3287032790
example: 49
3287132791
in: query
3287232792
name: filter[hours_ago]
@@ -32895,7 +32815,7 @@ paths:
3289532815
schema:
3289632816
type: boolean
3289732817
- description: A window, in hours, from the look back to estimate cardinality
32898-
with.
32818+
with. The minimum and default is 1 hour.
3289932819
example: 6
3290032820
in: query
3290132821
name: filter[timespan_h]
@@ -38980,7 +38900,6 @@ paths:
3898038900
name: filter[keyword]
3898138901
required: false
3898238902
schema:
38983-
description: Search query, can be user email or name.
3898438903
type: string
3898538904
responses:
3898638905
'200':

api/datadogV2/api_metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ func (a *MetricsApi) ListTagConfigurationByName(ctx _context.Context, metricName
697697
type ListTagConfigurationsOptionalParameters struct {
698698
FilterConfigured *bool
699699
FilterTagsConfigured *string
700-
FilterMetricType *MetricTagConfigurationMetricTypes
700+
FilterMetricType *MetricTagConfigurationMetricTypeCategory
701701
FilterIncludePercentiles *bool
702702
FilterQueried *bool
703703
FilterTags *string
@@ -723,7 +723,7 @@ func (r *ListTagConfigurationsOptionalParameters) WithFilterTagsConfigured(filte
723723
}
724724

725725
// WithFilterMetricType sets the corresponding parameter name and returns the struct.
726-
func (r *ListTagConfigurationsOptionalParameters) WithFilterMetricType(filterMetricType MetricTagConfigurationMetricTypes) *ListTagConfigurationsOptionalParameters {
726+
func (r *ListTagConfigurationsOptionalParameters) WithFilterMetricType(filterMetricType MetricTagConfigurationMetricTypeCategory) *ListTagConfigurationsOptionalParameters {
727727
r.FilterMetricType = &filterMetricType
728728
return r
729729
}

0 commit comments

Comments
 (0)