Skip to content

Commit 665831a

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit d764cf5 of spec repo
1 parent 7a5ae6f commit 665831a

8 files changed

Lines changed: 195 additions & 16 deletions

.generator/schemas/v1/openapi.yaml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2962,10 +2962,7 @@ components:
29622962
data_source:
29632963
$ref: '#/components/schemas/FormulaAndFunctionEventsDataSource'
29642964
group_by:
2965-
description: Group by options.
2966-
items:
2967-
$ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupBy'
2968-
type: array
2965+
$ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupByConfig'
29692966
indexes:
29702967
description: An array of index names to query in the stream. Omit or use
29712968
`[]` to query all indexes at once.
@@ -3037,6 +3034,39 @@ components:
30373034
required:
30383035
- facet
30393036
type: object
3037+
FormulaAndFunctionEventQueryGroupByConfig:
3038+
description: Group by configuration for an events query. Can be a nested array
3039+
of facet objects or a flat object with a list of fields.
3040+
oneOf:
3041+
- $ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupByList'
3042+
- $ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupByFields'
3043+
FormulaAndFunctionEventQueryGroupByFields:
3044+
description: Flat group by using multiple event facets.
3045+
properties:
3046+
fields:
3047+
description: List of event facets to group by.
3048+
example:
3049+
- hostname
3050+
- service
3051+
items:
3052+
description: Event facet.
3053+
type: string
3054+
type: array
3055+
limit:
3056+
description: Number of groups to return.
3057+
example: 10
3058+
format: int64
3059+
type: integer
3060+
sort:
3061+
$ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupBySort'
3062+
required:
3063+
- fields
3064+
type: object
3065+
FormulaAndFunctionEventQueryGroupByList:
3066+
description: Nested group by using a list of facet objects.
3067+
items:
3068+
$ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupBy'
3069+
type: array
30403070
FormulaAndFunctionEventQueryGroupBySort:
30413071
description: Options for sorting group by results.
30423072
properties:

docs/datadog_api_client.v1.model.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -928,6 +928,20 @@ datadog\_api\_client.v1.model.formula\_and\_function\_event\_query\_group\_by mo
928928
:members:
929929
:show-inheritance:
930930

931+
datadog\_api\_client.v1.model.formula\_and\_function\_event\_query\_group\_by\_config module
932+
--------------------------------------------------------------------------------------------
933+
934+
.. automodule:: datadog_api_client.v1.model.formula_and_function_event_query_group_by_config
935+
:members:
936+
:show-inheritance:
937+
938+
datadog\_api\_client.v1.model.formula\_and\_function\_event\_query\_group\_by\_fields module
939+
--------------------------------------------------------------------------------------------
940+
941+
.. automodule:: datadog_api_client.v1.model.formula_and_function_event_query_group_by_fields
942+
:members:
943+
:show-inheritance:
944+
931945
datadog\_api\_client.v1.model.formula\_and\_function\_event\_query\_group\_by\_sort module
932946
------------------------------------------------------------------------------------------
933947

src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def __init__(self, **kwargs):
3636
:param compute: Compute options.
3737
:type compute: FormulaAndFunctionEventQueryDefinitionCompute
3838
39-
:param group_by: Group by options.
40-
:type group_by: [FormulaAndFunctionEventQueryGroupBy], optional
39+
:param group_by: Group by configuration for an events query. Can be a nested array of facet objects or a flat object with a list of fields.
40+
:type group_by: FormulaAndFunctionEventQueryGroupByConfig, optional
4141
4242
:param indexes: An array of index names to query in the stream. Omit or use `[]` to query all indexes at once.
4343
:type indexes: [str], optional

src/datadog_api_client/v1/model/formula_and_function_event_query_definition.py

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,18 @@
1818
FormulaAndFunctionEventQueryDefinitionCompute,
1919
)
2020
from datadog_api_client.v1.model.formula_and_function_events_data_source import FormulaAndFunctionEventsDataSource
21-
from datadog_api_client.v1.model.formula_and_function_event_query_group_by import (
22-
FormulaAndFunctionEventQueryGroupBy,
21+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_config import (
22+
FormulaAndFunctionEventQueryGroupByConfig,
2323
)
2424
from datadog_api_client.v1.model.formula_and_function_event_query_definition_search import (
2525
FormulaAndFunctionEventQueryDefinitionSearch,
2626
)
27+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by import (
28+
FormulaAndFunctionEventQueryGroupBy,
29+
)
30+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_fields import (
31+
FormulaAndFunctionEventQueryGroupByFields,
32+
)
2733

2834

2935
class FormulaAndFunctionEventQueryDefinition(ModelNormal):
@@ -41,8 +47,8 @@ def openapi_types(_):
4147
from datadog_api_client.v1.model.formula_and_function_events_data_source import (
4248
FormulaAndFunctionEventsDataSource,
4349
)
44-
from datadog_api_client.v1.model.formula_and_function_event_query_group_by import (
45-
FormulaAndFunctionEventQueryGroupBy,
50+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_config import (
51+
FormulaAndFunctionEventQueryGroupByConfig,
4652
)
4753
from datadog_api_client.v1.model.formula_and_function_event_query_definition_search import (
4854
FormulaAndFunctionEventQueryDefinitionSearch,
@@ -52,7 +58,7 @@ def openapi_types(_):
5258
"compute": (FormulaAndFunctionEventQueryDefinitionCompute,),
5359
"cross_org_uuids": ([str],),
5460
"data_source": (FormulaAndFunctionEventsDataSource,),
55-
"group_by": ([FormulaAndFunctionEventQueryGroupBy],),
61+
"group_by": (FormulaAndFunctionEventQueryGroupByConfig,),
5662
"indexes": ([str],),
5763
"name": (str,),
5864
"search": (FormulaAndFunctionEventQueryDefinitionSearch,),
@@ -76,7 +82,12 @@ def __init__(
7682
data_source: FormulaAndFunctionEventsDataSource,
7783
name: str,
7884
cross_org_uuids: Union[List[str], UnsetType] = unset,
79-
group_by: Union[List[FormulaAndFunctionEventQueryGroupBy], UnsetType] = unset,
85+
group_by: Union[
86+
FormulaAndFunctionEventQueryGroupByConfig,
87+
List[FormulaAndFunctionEventQueryGroupBy],
88+
FormulaAndFunctionEventQueryGroupByFields,
89+
UnsetType,
90+
] = unset,
8091
indexes: Union[List[str], UnsetType] = unset,
8192
search: Union[FormulaAndFunctionEventQueryDefinitionSearch, UnsetType] = unset,
8293
storage: Union[str, UnsetType] = unset,
@@ -94,8 +105,8 @@ def __init__(
94105
:param data_source: Data source for event platform-based queries.
95106
:type data_source: FormulaAndFunctionEventsDataSource
96107
97-
:param group_by: Group by options.
98-
:type group_by: [FormulaAndFunctionEventQueryGroupBy], optional
108+
:param group_by: Group by configuration for an events query. Can be a nested array of facet objects or a flat object with a list of fields.
109+
:type group_by: FormulaAndFunctionEventQueryGroupByConfig, optional
99110
100111
:param indexes: An array of index names to query in the stream. Omit or use ``[]`` to query all indexes at once.
101112
:type indexes: [str], optional
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
2+
# This product includes software developed at Datadog (https://www.datadoghq.com/).
3+
# Copyright 2019-Present Datadog, Inc.
4+
from __future__ import annotations
5+
6+
7+
from datadog_api_client.model_utils import (
8+
ModelComposed,
9+
cached_property,
10+
)
11+
12+
13+
class FormulaAndFunctionEventQueryGroupByConfig(ModelComposed):
14+
def __init__(self, **kwargs):
15+
"""
16+
Group by configuration for an events query. Can be a nested array of facet objects or a flat object with a list of fields.
17+
18+
:param fields: List of event facets to group by.
19+
:type fields: [str]
20+
21+
:param limit: Number of groups to return.
22+
:type limit: int, optional
23+
24+
:param sort: Options for sorting group by results.
25+
:type sort: FormulaAndFunctionEventQueryGroupBySort, optional
26+
"""
27+
super().__init__(kwargs)
28+
29+
@cached_property
30+
def _composed_schemas(_):
31+
# we need this here to make our import statements work
32+
# we must store _composed_schemas in here so the code is only run
33+
# when we invoke this method. If we kept this at the class
34+
# level we would get an error because the class level
35+
# code would be run when this module is imported, and these composed
36+
# classes don't exist yet because their module has not finished
37+
# loading
38+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by import (
39+
FormulaAndFunctionEventQueryGroupBy,
40+
)
41+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_fields import (
42+
FormulaAndFunctionEventQueryGroupByFields,
43+
)
44+
45+
return {
46+
"oneOf": [
47+
[FormulaAndFunctionEventQueryGroupBy],
48+
FormulaAndFunctionEventQueryGroupByFields,
49+
],
50+
}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
2+
# This product includes software developed at Datadog (https://www.datadoghq.com/).
3+
# Copyright 2019-Present Datadog, Inc.
4+
from __future__ import annotations
5+
6+
from typing import List, Union, TYPE_CHECKING
7+
8+
from datadog_api_client.model_utils import (
9+
ModelNormal,
10+
cached_property,
11+
unset,
12+
UnsetType,
13+
)
14+
15+
16+
if TYPE_CHECKING:
17+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_sort import (
18+
FormulaAndFunctionEventQueryGroupBySort,
19+
)
20+
21+
22+
class FormulaAndFunctionEventQueryGroupByFields(ModelNormal):
23+
@cached_property
24+
def openapi_types(_):
25+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_sort import (
26+
FormulaAndFunctionEventQueryGroupBySort,
27+
)
28+
29+
return {
30+
"fields": ([str],),
31+
"limit": (int,),
32+
"sort": (FormulaAndFunctionEventQueryGroupBySort,),
33+
}
34+
35+
attribute_map = {
36+
"fields": "fields",
37+
"limit": "limit",
38+
"sort": "sort",
39+
}
40+
41+
def __init__(
42+
self_,
43+
fields: List[str],
44+
limit: Union[int, UnsetType] = unset,
45+
sort: Union[FormulaAndFunctionEventQueryGroupBySort, UnsetType] = unset,
46+
**kwargs,
47+
):
48+
"""
49+
Flat group by using multiple event facets.
50+
51+
:param fields: List of event facets to group by.
52+
:type fields: [str]
53+
54+
:param limit: Number of groups to return.
55+
:type limit: int, optional
56+
57+
:param sort: Options for sorting group by results.
58+
:type sort: FormulaAndFunctionEventQueryGroupBySort, optional
59+
"""
60+
if limit is not unset:
61+
kwargs["limit"] = limit
62+
if sort is not unset:
63+
kwargs["sort"] = sort
64+
super().__init__(kwargs)
65+
66+
self_.fields = fields

src/datadog_api_client/v1/model/formula_and_function_query_definition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def __init__(self, **kwargs):
3636
:param compute: Compute options.
3737
:type compute: FormulaAndFunctionEventQueryDefinitionCompute
3838
39-
:param group_by: Group by options.
40-
:type group_by: [FormulaAndFunctionEventQueryGroupBy], optional
39+
:param group_by: Group by configuration for an events query. Can be a nested array of facet objects or a flat object with a list of fields.
40+
:type group_by: FormulaAndFunctionEventQueryGroupByConfig, optional
4141
4242
:param indexes: An array of index names to query in the stream. Omit or use `[]` to query all indexes at once.
4343
:type indexes: [str], optional

src/datadog_api_client/v1/models/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,12 @@
154154
FormulaAndFunctionEventQueryDefinitionSearch,
155155
)
156156
from datadog_api_client.v1.model.formula_and_function_event_query_group_by import FormulaAndFunctionEventQueryGroupBy
157+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_config import (
158+
FormulaAndFunctionEventQueryGroupByConfig,
159+
)
160+
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_fields import (
161+
FormulaAndFunctionEventQueryGroupByFields,
162+
)
157163
from datadog_api_client.v1.model.formula_and_function_event_query_group_by_sort import (
158164
FormulaAndFunctionEventQueryGroupBySort,
159165
)
@@ -1283,6 +1289,8 @@
12831289
"FormulaAndFunctionEventQueryDefinitionCompute",
12841290
"FormulaAndFunctionEventQueryDefinitionSearch",
12851291
"FormulaAndFunctionEventQueryGroupBy",
1292+
"FormulaAndFunctionEventQueryGroupByConfig",
1293+
"FormulaAndFunctionEventQueryGroupByFields",
12861294
"FormulaAndFunctionEventQueryGroupBySort",
12871295
"FormulaAndFunctionEventsDataSource",
12881296
"FormulaAndFunctionMetricAggregation",

0 commit comments

Comments
 (0)