Skip to content

Commit 237cd1b

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Add week_to_date and month_to_date to widget livespan (#1768)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent 7efdeda commit 237cd1b

File tree

7 files changed

+31
-14
lines changed

7 files changed

+31
-14
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": "2023-11-17 20:28:38.988410",
8-
"spec_repo_commit": "7fb616ae"
7+
"regenerated": "2023-11-20 19:20:13.651946",
8+
"spec_repo_commit": "55cf29a4"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2023-11-17 20:28:39.002128",
13-
"spec_repo_commit": "7fb616ae"
12+
"regenerated": "2023-11-20 19:20:13.666926",
13+
"spec_repo_commit": "55cf29a4"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20955,6 +20955,8 @@ components:
2095520955
- 1mo
2095620956
- 3mo
2095720957
- 6mo
20958+
- week_to_date
20959+
- month_to_date
2095820960
- 1y
2095920961
- alert
2096020962
example: 5m
@@ -20973,6 +20975,8 @@ components:
2097320975
- PAST_ONE_MONTH
2097420976
- PAST_THREE_MONTHS
2097520977
- PAST_SIX_MONTHS
20978+
- WEEK_TO_DATE
20979+
- MONTH_TO_DATE
2097620980
- PAST_ONE_YEAR
2097720981
- ALERT
2097820982
WidgetMargin:

examples/v1/dashboards/CreateDashboard_1284514532.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
from datadog_api_client.v1.model.widget_formula import WidgetFormula
2222
from datadog_api_client.v1.model.widget_line_type import WidgetLineType
2323
from datadog_api_client.v1.model.widget_line_width import WidgetLineWidth
24+
from datadog_api_client.v1.model.widget_live_span import WidgetLiveSpan
2425
from datadog_api_client.v1.model.widget_request_style import WidgetRequestStyle
2526
from datadog_api_client.v1.model.widget_text_align import WidgetTextAlign
27+
from datadog_api_client.v1.model.widget_time import WidgetTime
2628

2729
body = Dashboard(
2830
title="Example-Dashboard",
@@ -56,6 +58,9 @@
5658
display_type=WidgetDisplayType.BARS,
5759
),
5860
],
61+
time=WidgetTime(
62+
live_span=WidgetLiveSpan.WEEK_TO_DATE,
63+
),
5964
),
6065
),
6166
],

src/datadog_api_client/v1/model/widget_live_span.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class WidgetLiveSpan(ModelSimple):
1616
"""
1717
The available timeframes depend on the widget you are using.
1818
19-
:param value: Must be one of ["1m", "5m", "10m", "15m", "30m", "1h", "4h", "1d", "2d", "1w", "1mo", "3mo", "6mo", "1y", "alert"].
19+
:param value: Must be one of ["1m", "5m", "10m", "15m", "30m", "1h", "4h", "1d", "2d", "1w", "1mo", "3mo", "6mo", "week_to_date", "month_to_date", "1y", "alert"].
2020
:type value: str
2121
"""
2222

@@ -34,6 +34,8 @@ class WidgetLiveSpan(ModelSimple):
3434
"1mo",
3535
"3mo",
3636
"6mo",
37+
"week_to_date",
38+
"month_to_date",
3739
"1y",
3840
"alert",
3941
}
@@ -50,6 +52,8 @@ class WidgetLiveSpan(ModelSimple):
5052
PAST_ONE_MONTH: ClassVar["WidgetLiveSpan"]
5153
PAST_THREE_MONTHS: ClassVar["WidgetLiveSpan"]
5254
PAST_SIX_MONTHS: ClassVar["WidgetLiveSpan"]
55+
WEEK_TO_DATE: ClassVar["WidgetLiveSpan"]
56+
MONTH_TO_DATE: ClassVar["WidgetLiveSpan"]
5357
PAST_ONE_YEAR: ClassVar["WidgetLiveSpan"]
5458
ALERT: ClassVar["WidgetLiveSpan"]
5559

@@ -73,5 +77,7 @@ def openapi_types(_):
7377
WidgetLiveSpan.PAST_ONE_MONTH = WidgetLiveSpan("1mo")
7478
WidgetLiveSpan.PAST_THREE_MONTHS = WidgetLiveSpan("3mo")
7579
WidgetLiveSpan.PAST_SIX_MONTHS = WidgetLiveSpan("6mo")
80+
WidgetLiveSpan.WEEK_TO_DATE = WidgetLiveSpan("week_to_date")
81+
WidgetLiveSpan.MONTH_TO_DATE = WidgetLiveSpan("month_to_date")
7682
WidgetLiveSpan.PAST_ONE_YEAR = WidgetLiveSpan("1y")
7783
WidgetLiveSpan.ALERT = WidgetLiveSpan("alert")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2023-07-11T14:32:45.409Z
1+
2023-11-14T21:39:19.397Z

tests/v1/cassettes/test_scenarios/test_create_a_new_dashboard_with_a_timeseries_widget_using_formulas_and_functions_cloud_cost_query.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
interactions:
22
- request:
3-
body: '{"layout_type":"ordered","title":"Test-Create_a_new_dashboard_with_a_timeseries_widget_using_formulas_and_functions_cloud_cost_query-1689085965","widgets":[{"definition":{"requests":[{"display_type":"bars","formulas":[{"formula":"query1"}],"queries":[{"data_source":"cloud_cost","name":"query1","query":"sum:aws.cost.amortized{*}
4-
by {aws_product}.rollup(sum, monthly)"}],"response_format":"timeseries","style":{"line_type":"solid","line_width":"normal","palette":"dog_classic"}}],"title":"Example
3+
body: '{"layout_type":"ordered","title":"Test-Create_a_new_dashboard_with_a_timeseries_widget_using_formulas_and_functions_cloud_cost_query-1699997959","widgets":[{"definition":{"requests":[{"display_type":"bars","formulas":[{"formula":"query1"}],"queries":[{"data_source":"cloud_cost","name":"query1","query":"sum:aws.cost.amortized{*}
4+
by {aws_product}.rollup(sum, monthly)"}],"response_format":"timeseries","style":{"line_type":"solid","line_width":"normal","palette":"dog_classic"}}],"time":{"live_span":"week_to_date"},"title":"Example
55
Cloud Cost Query","title_align":"left","title_size":"16","type":"timeseries"}}]}'
66
headers:
77
accept:
@@ -12,9 +12,10 @@ interactions:
1212
uri: https://api.datadoghq.com/api/v1/dashboard
1313
response:
1414
body:
15-
string: '{"id":"kka-2iz-3jf","title":"Test-Create_a_new_dashboard_with_a_timeseries_widget_using_formulas_and_functions_cloud_cost_query-1689085965","description":null,"author_handle":"[email protected]","author_name":null,"layout_type":"ordered","url":"/dashboard/kka-2iz-3jf/test-createanewdashboardwithatimeserieswidgetusingformulasandfunctionscloudcostq","is_read_only":false,"template_variables":null,"widgets":[{"definition":{"requests":[{"display_type":"bars","formulas":[{"formula":"query1"}],"queries":[{"data_source":"cloud_cost","name":"query1","query":"sum:aws.cost.amortized{*}
16-
by {aws_product}.rollup(sum, monthly)"}],"response_format":"timeseries","style":{"line_type":"solid","line_width":"normal","palette":"dog_classic"}}],"title":"Example
17-
Cloud Cost Query","title_align":"left","title_size":"16","type":"timeseries"},"id":1004255439340}],"notify_list":null,"created_at":"2023-07-11T14:32:45.564617+00:00","modified_at":"2023-07-11T14:32:45.564617+00:00","restricted_roles":[]}
15+
string: '{"id":"nh3-n9c-wuz","title":"Test-Create_a_new_dashboard_with_a_timeseries_widget_using_formulas_and_functions_cloud_cost_query-1699997959","description":null,"author_handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","author_name":"CI
16+
Account","layout_type":"ordered","url":"/dashboard/nh3-n9c-wuz/test-createanewdashboardwithatimeserieswidgetusingformulasandfunctionscloudcostq","is_read_only":false,"template_variables":null,"widgets":[{"definition":{"requests":[{"display_type":"bars","formulas":[{"formula":"query1"}],"queries":[{"data_source":"cloud_cost","name":"query1","query":"sum:aws.cost.amortized{*}
17+
by {aws_product}.rollup(sum, monthly)"}],"response_format":"timeseries","style":{"line_type":"solid","line_width":"normal","palette":"dog_classic"}}],"time":{"live_span":"week_to_date"},"title":"Example
18+
Cloud Cost Query","title_align":"left","title_size":"16","type":"timeseries"},"id":380165468656457}],"notify_list":null,"created_at":"2023-11-14T21:39:19.798591+00:00","modified_at":"2023-11-14T21:39:19.798591+00:00","restricted_roles":[]}
1819
1920
'
2021
headers:
@@ -29,10 +30,10 @@ interactions:
2930
accept:
3031
- application/json
3132
method: DELETE
32-
uri: https://api.datadoghq.com/api/v1/dashboard/kka-2iz-3jf
33+
uri: https://api.datadoghq.com/api/v1/dashboard/nh3-n9c-wuz
3334
response:
3435
body:
35-
string: '{"deleted_dashboard_id":"kka-2iz-3jf"}
36+
string: '{"deleted_dashboard_id":"nh3-n9c-wuz"}
3637
3738
'
3839
headers:

tests/v1/features/dashboards.feature

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,15 @@ Feature: Dashboards
177177
@team:DataDog/dashboards-backend
178178
Scenario: Create a new dashboard with a timeseries widget using formulas and functions cloud cost query
179179
Given new "CreateDashboard" request
180-
And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "Example Cloud Cost Query", "title_size": "16", "title_align": "left", "type": "timeseries", "requests": [ { "formulas": [ { "formula": "query1" } ], "queries": [ { "data_source": "cloud_cost", "name": "query1", "query": "sum:aws.cost.amortized{*} by {aws_product}.rollup(sum, monthly)" } ], "response_format": "timeseries", "style": { "palette": "dog_classic", "line_type": "solid", "line_width": "normal" }, "display_type": "bars" } ] } } ], "layout_type": "ordered" }
180+
And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "Example Cloud Cost Query", "title_size": "16", "title_align": "left", "type": "timeseries", "requests": [ { "formulas": [ { "formula": "query1" } ], "queries": [ { "data_source": "cloud_cost", "name": "query1", "query": "sum:aws.cost.amortized{*} by {aws_product}.rollup(sum, monthly)" } ], "response_format": "timeseries", "style": { "palette": "dog_classic", "line_type": "solid", "line_width": "normal" }, "display_type": "bars" } ], "time": { "live_span": "week_to_date" } } } ], "layout_type": "ordered" }
181181
When the request is sent
182182
Then the response status is 200 OK
183183
And the response "widgets[0].definition.requests[0].response_format" is equal to "timeseries"
184184
And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "cloud_cost"
185185
And the response "widgets[0].definition.requests[0].queries[0].name" is equal to "query1"
186186
And the response "widgets[0].definition.requests[0].queries[0].query" is equal to "sum:aws.cost.amortized{*} by {aws_product}.rollup(sum, monthly)"
187187
And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "query1"
188+
And the response "widgets[0].definition.time.live_span" is equal to "week_to_date"
188189

189190
@team:DataDog/dashboards-backend
190191
Scenario: Create a new dashboard with alert_graph widget

0 commit comments

Comments
 (0)