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

[mute_first_recovery_notification] add mute first recovery notification to monitor options #1417

Merged
merged 15 commits into from
May 13, 2022
Merged

[mute_first_recovery_notification] add mute first recovery notification to monitor options #1417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d623201
add mute first recovery notification
JoannaYe-Datadog Apr 19, 2022
6705aef
ran make docs
JoannaYe-Datadog Apr 19, 2022
2ed7867
update test to add new attribute
JoannaYe-Datadog Apr 19, 2022
70ec710
update cassettes
JoannaYe-Datadog Apr 19, 2022
fcc7ea6
Merge branch 'master' into joannaye/add-mute-first-recovery-notification
JoannaYe-Datadog Apr 20, 2022
929dae2
update go-client
JoannaYe-Datadog Apr 20, 2022
09b304c
rerun record
JoannaYe-Datadog Apr 21, 2022
26ded15
Update docs/resources/downtime.md
JoannaYe-Datadog May 5, 2022
cfc3a2f
add mute_first_recovery_notification to update
JoannaYe-Datadog May 5, 2022
7776536
make docs
JoannaYe-Datadog May 6, 2022
98659af
Update datadog/resource_datadog_downtime.go
JoannaYe-Datadog May 9, 2022
28a57b4
Merge branch 'master' into joannaye/add-mute-first-recovery-notification
JoannaYe-Datadog May 10, 2022
e1a9a0f
update api client
JoannaYe-Datadog May 10, 2022
1efbdc3
Merge branch 'master' into joannaye/add-mute-first-recovery-notification
skarimo May 13, 2022
f2d8225
make docs
skarimo May 13, 2022
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
Prev Previous commit
Next Next commit
update cassettes
  • Loading branch information
@JoannaYe-Datadog
JoannaYe-Datadog committed Apr 19, 2022
commit 70ec7101987aec70198a12de7d187953dd02ed85
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntimeDates.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.815403-04:00
2022-04-19T16:45:13.488559-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntimeDatesConflict.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.815375-04:00
2022-04-19T16:45:13.481535-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_Basic.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.810415-04:00
2022-04-19T16:45:13.505489-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_BasicMultiScope.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:05:27.534102-04:00
2022-04-19T16:45:13.505461-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_BasicNoRecurrence.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.80989-04:00
2022-04-19T16:45:13.504309-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_BasicUntilDateRecurrence.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.809201-04:00
2022-04-19T16:45:13.504597-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_BasicUntilOccurrencesRecurrence.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.810479-04:00
2022-04-19T16:45:13.515215-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_BasicWithMonitor.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-18T15:52:35.306081-04:00
2022-04-19T16:45:13.50574-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_BasicWithMonitorTags.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-18T15:52:35.30608-04:00
2022-04-19T16:45:13.504056-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_DiffStart.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.810657-04:00
2022-04-19T16:45:13.483598-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_RRule.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:05:29.818246-04:00
2022-04-19T16:45:13.498355-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_TrimWhitespace.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:05:29.735909-04:00
2022-04-19T16:45:13.491781-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_Updated.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:05:29.732308-04:00
2022-04-19T16:45:16.167288-04:00
40 changes: 20 additions & 20 deletions datadog/tests/cassettes/TestAccDatadogDowntime_Updated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 1
interactions:
- request:
body: |
{"end":1735765200,"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","monitor_tags":["service","app:webserver"],"recurrence":{"period":1,"type":"days"},"scope":["*"],"start":1735707600,"timezone":"UTC"}
{"end":1735765200,"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","monitor_tags":["service","app:webserver"],"recurrence":{"period":1,"type":"days"},"scope":["*"],"start":1735707600,"timezone":"UTC"}
form: {}
headers:
Accept:
Expand All @@ -13,7 +13,7 @@ interactions:
url: https://api.datadoghq.com/api/v1/downtime
method: POST
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185587,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":0,"id":1857667260,"updater_id":null}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":false,"created":1650401132,"org_id":321813,"modified":1650401132,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":0,"id":1891100581,"updater_id":null}'
headers:
Content-Type:
- application/json
Expand All @@ -26,10 +26,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185587,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":0,"id":1857667260,"updater_id":null}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":false,"created":1650401132,"org_id":321813,"modified":1650401132,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":0,"id":1891100581,"updater_id":null}'
headers:
Content-Type:
- application/json
Expand All @@ -42,10 +42,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185587,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":0,"id":1857667260,"updater_id":null}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":false,"created":1650401132,"org_id":321813,"modified":1650401132,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":0,"id":1891100581,"updater_id":null}'
headers:
Content-Type:
- application/json
Expand All @@ -58,10 +58,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185587,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":0,"id":1857667260,"updater_id":null}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":false,"created":1650401132,"org_id":321813,"modified":1650401132,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":0,"id":1891100581,"updater_id":null}'
headers:
Content-Type:
- application/json
Expand All @@ -74,10 +74,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185587,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":0,"id":1857667260,"updater_id":null}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":1},"end":1735765200,"monitor_tags":["app:webserver","service"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":false,"created":1650401132,"org_id":321813,"modified":1650401132,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["*"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":0,"id":1891100581,"updater_id":null}'
headers:
Content-Type:
- application/json
Expand All @@ -86,17 +86,17 @@ interactions:
duration: ""
- request:
body: |
{"id":1857667260,"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","monitor_tags":["*"],"recurrence":{"period":3,"type":"days"},"scope":["Updated"],"timezone":"UTC"}
{"id":1891100581,"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","monitor_tags":["*"],"mute_first_recovery_notification":true,"recurrence":{"period":3,"type":"days"},"scope":["Updated"],"timezone":"UTC"}
form: {}
headers:
Accept:
- application/json
Content-Type:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: PUT
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185646,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":2,"id":1857667260,"updater_id":1445416}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":true,"created":1650401132,"org_id":321813,"modified":1650401168,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":2,"id":1891100581,"updater_id":1445416}'
headers:
Content-Type:
- application/json
Expand All @@ -109,10 +109,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185646,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":2,"id":1857667260,"updater_id":1445416}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":true,"created":1650401132,"org_id":321813,"modified":1650401168,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":2,"id":1891100581,"updater_id":1445416}'
headers:
Content-Type:
- application/json
Expand All @@ -125,10 +125,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":null,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185646,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":2,"id":1857667260,"updater_id":1445416}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":null,"monitor_id":null,"mute_first_recovery_notification":true,"created":1650401132,"org_id":321813,"modified":1650401168,"disabled":false,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":2,"id":1891100581,"updater_id":1445416}'
headers:
Content-Type:
- application/json
Expand All @@ -141,7 +141,7 @@ interactions:
headers:
Accept:
- '*/*'
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: DELETE
response:
body: ""
Expand All @@ -155,10 +155,10 @@ interactions:
headers:
Accept:
- application/json
url: https://api.datadoghq.com/api/v1/downtime/1857667260
url: https://api.datadoghq.com/api/v1/downtime/1891100581
method: GET
response:
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":1649185666,"monitor_id":null,"created":1649185587,"org_id":321813,"modified":1649185666,"disabled":true,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1649185529","downtime_type":2,"id":1857667260,"updater_id":1445416}'
body: '{"recurrence":{"until_date":null,"until_occurrences":null,"week_days":null,"type":"days","period":3},"end":1735765200,"monitor_tags":["*"],"child_id":null,"canceled":1650401196,"monitor_id":null,"mute_first_recovery_notification":true,"created":1650401132,"org_id":321813,"modified":1650401196,"disabled":true,"start":1735707600,"creator_id":1445416,"parent_id":null,"timezone":"UTC","active":false,"scope":["Updated"],"message":"tf-TestAccDatadogDowntime_Updated-local-1650401116","downtime_type":2,"id":1891100581,"updater_id":1445416}'
headers:
Content-Type:
- application/json
Expand Down
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDowntime_WeekDayRecurring.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-04-05T15:03:41.812147-04:00
2022-04-19T16:45:13.499249-04:00
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestDatadogDowntime_import.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021-03-12T17:10:18.489325-05:00
2022-04-19T16:45:13.360242-04:00
2 changes: 1 addition & 1 deletion datadog/tests/resource_datadog_downtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ resource "datadog_downtime" "foo" {
period = 3
}

mute_first_recovery_notification: true
mute_first_recovery_notification = true

message = "%s"
monitor_tags = ["*"]
Expand Down