From b42950b86b0fab8cf86dcf4b3cc16e2473c24a92 Mon Sep 17 00:00:00 2001 From: "api-clients-generation-pipeline[bot]" <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:19:15 +0000 Subject: [PATCH] Remove groupby_simple_monitor (#2729) Co-authored-by: ci.datadog-api-spec --- .apigentools-info | 8 ++++---- .../v1/monitors/ValidateExistingMonitor.go | 1 - examples/v1/monitors/ValidateMonitor.go | 1 - .../v1/monitors/ValidateMonitor_4247196452.go | 1 - ...lidate_a_monitor_returns_OK_response.freeze | 2 +- ...Validate_a_monitor_returns_OK_response.yaml | 2 +- ...ti-alert_monitor_returns_OK_response.freeze | 2 +- ...ulti-alert_monitor_returns_OK_response.yaml | 2 +- ...existing_monitor_returns_OK_response.freeze | 2 +- ...n_existing_monitor_returns_OK_response.yaml | 18 +++++++++--------- .../scenarios/features/v1/monitor_payload.json | 1 - .../v1/multi_alert_monitor_payload.json | 1 - 12 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index 8f3fb58c0d8..297f5e4f13b 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2024-10-09 13:48:21.308483", - "spec_repo_commit": "a458c3a4" + "regenerated": "2024-10-09 15:03:02.042923", + "spec_repo_commit": "43ae024c" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2024-10-09 13:48:21.333227", - "spec_repo_commit": "a458c3a4" + "regenerated": "2024-10-09 15:03:02.062476", + "spec_repo_commit": "43ae024c" } } } \ No newline at end of file diff --git a/examples/v1/monitors/ValidateExistingMonitor.go b/examples/v1/monitors/ValidateExistingMonitor.go index d650c09573d..aadefa90ec2 100644 --- a/examples/v1/monitors/ValidateExistingMonitor.go +++ b/examples/v1/monitors/ValidateExistingMonitor.go @@ -31,7 +31,6 @@ func main() { EnableLogsSample: datadog.PtrBool(true), EscalationMessage: datadog.PtrString("the situation has escalated"), EvaluationDelay: *datadog.NewNullableInt64(datadog.PtrInt64(700)), - GroupbySimpleMonitor: datadog.PtrBool(true), IncludeTags: datadog.PtrBool(true), Locked: datadog.PtrBool(false), NewHostDelay: *datadog.NewNullableInt64(datadog.PtrInt64(600)), diff --git a/examples/v1/monitors/ValidateMonitor.go b/examples/v1/monitors/ValidateMonitor.go index 1af67152430..a1265e00384 100644 --- a/examples/v1/monitors/ValidateMonitor.go +++ b/examples/v1/monitors/ValidateMonitor.go @@ -27,7 +27,6 @@ func main() { EnableLogsSample: datadog.PtrBool(true), EscalationMessage: datadog.PtrString("the situation has escalated"), EvaluationDelay: *datadog.NewNullableInt64(datadog.PtrInt64(700)), - GroupbySimpleMonitor: datadog.PtrBool(true), IncludeTags: datadog.PtrBool(true), Locked: datadog.PtrBool(false), NewHostDelay: *datadog.NewNullableInt64(datadog.PtrInt64(600)), diff --git a/examples/v1/monitors/ValidateMonitor_4247196452.go b/examples/v1/monitors/ValidateMonitor_4247196452.go index 3aa9c17ad87..474e7b16fa8 100644 --- a/examples/v1/monitors/ValidateMonitor_4247196452.go +++ b/examples/v1/monitors/ValidateMonitor_4247196452.go @@ -28,7 +28,6 @@ func main() { EscalationMessage: datadog.PtrString("the situation has escalated"), EvaluationDelay: *datadog.NewNullableInt64(datadog.PtrInt64(700)), GroupRetentionDuration: datadog.PtrString("2d"), - GroupbySimpleMonitor: datadog.PtrBool(false), IncludeTags: datadog.PtrBool(true), Locked: datadog.PtrBool(false), NewHostDelay: *datadog.NewNullableInt64(datadog.PtrInt64(600)), diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.freeze index ba443398366..c010310b324 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.freeze @@ -1 +1 @@ -2023-01-18T18:30:59.296Z \ No newline at end of file +2024-10-09T14:54:54.858Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.yaml index ed29bbff488..c126a69ed2f 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_a_monitor_returns_OK_response-1674066659","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") \u003e 2","tags":["test:testvalidateamonitorreturnsokresponse1674066659","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_a_monitor_returns_OK_response-1728485694","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") \u003e 2","tags":["test:testvalidateamonitorreturnsokresponse1728485694","env:ci"],"type":"log alert"} form: {} headers: Accept: diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.freeze index d48e3459d6c..3569fa0eb80 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.freeze @@ -1 +1 @@ -2022-09-30T16:41:33.797Z \ No newline at end of file +2024-10-09T14:54:55.290Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.yaml index d029305ff14..87974f3ee65 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_a_multi_alert_monitor_returns_OK_response-1664556093","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"group_retention_duration":"2d","groupby_simple_monitor":false,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notify_audit":false,"notify_by":["status"],"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source,status\").last(\"5m\") \u003e 2","tags":["test:testvalidateamultialertmonitorreturnsokresponse1664556093","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_a_multi_alert_monitor_returns_OK_response-1728485695","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"group_retention_duration":"2d","include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notify_audit":false,"notify_by":["status"],"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source,status\").last(\"5m\") \u003e 2","tags":["test:testvalidateamultialertmonitorreturnsokresponse1728485695","env:ci"],"type":"log alert"} form: {} headers: Accept: diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.freeze index 472fcff7494..dc14445dd32 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.freeze @@ -1 +1 @@ -2023-01-18T18:37:20.511Z \ No newline at end of file +2024-10-09T14:54:55.436Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.yaml index 79fb359ae11..6f524b7e0af 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_OK_response-1674067040","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") \u003e 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1674067040","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_OK_response-1728485695","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") \u003e 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1728485695","env:ci"],"type":"log alert"} form: {} headers: Accept: @@ -12,12 +12,12 @@ interactions: method: POST url: https://api.datadoghq.com/api/v1/monitor response: - body: '{"id":108260307,"org_id":321813,"type":"log alert","name":"Test-Validate_an_existing_monitor_returns_OK_response-1674067040","message":"some - message Notify: @hipchat-channel","tags":["test:testvalidateanexistingmonitorreturnsokresponse1674067040","env:ci"],"query":"logs(\"service:foo + body: '{"id":155758542,"org_id":321813,"type":"log alert","name":"Test-Validate_an_existing_monitor_returns_OK_response-1728485695","message":"some + message Notify: @hipchat-channel","tags":["test:testvalidateanexistingmonitorreturnsokresponse1728485695","env:ci"],"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") > 2","options":{"enable_logs_sample":true,"escalation_message":"the situation - has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2.0,"warning":1.0},"timeout_h":24,"silenced":{}},"multi":true,"created_at":1674067040000,"created":"2023-01-18T18:37:20.717952+00:00","modified":"2023-01-18T18:37:20.717952+00:00","deleted":null,"restricted_roles":null,"priority":3,"overall_state_modified":null,"overall_state":"No - Data","creator":{"name":null,"handle":"frog@datadoghq.com","email":"frog@datadoghq.com","id":1445416}} + has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2.0,"warning":1.0},"timeout_h":24,"silenced":{}},"multi":true,"created_at":1728485695000,"created":"2024-10-09T14:54:55.594487+00:00","modified":"2024-10-09T14:54:55.594487+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"Anika Maskara","handle":"anika.maskara@datadoghq.com","email":"anika.maskara@datadoghq.com","id":7557262}} ' code: 200 @@ -28,7 +28,7 @@ interactions: status: 200 OK - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_OK_response-1674067040","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"groupby_simple_monitor":true,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") \u003e 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1674067040","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_OK_response-1728485695","options":{"enable_logs_sample":true,"escalation_message":"the situation has escalated","evaluation_delay":700,"include_tags":true,"locked":false,"new_host_delay":600,"no_data_timeframe":null,"notification_preset_name":"hide_handles","notify_audit":false,"notify_no_data":false,"on_missing_data":"show_and_notify_no_data","renotify_interval":60,"require_full_window":true,"thresholds":{"critical":2,"warning":1},"timeout_h":24},"priority":3,"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") \u003e 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1728485695","env:ci"],"type":"log alert"} form: {} headers: Accept: @@ -37,7 +37,7 @@ interactions: - application/json id: 1 method: POST - url: https://api.datadoghq.com/api/v1/monitor/108260307/validate + url: https://api.datadoghq.com/api/v1/monitor/155758542/validate response: body: '{} @@ -56,9 +56,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260307 + url: https://api.datadoghq.com/api/v1/monitor/155758542 response: - body: '{"deleted_monitor_id":108260307} + body: '{"deleted_monitor_id":155758542} ' code: 200 diff --git a/tests/scenarios/features/v1/monitor_payload.json b/tests/scenarios/features/v1/monitor_payload.json index f17fbd01f82..f69d62b77d7 100644 --- a/tests/scenarios/features/v1/monitor_payload.json +++ b/tests/scenarios/features/v1/monitor_payload.json @@ -9,7 +9,6 @@ "enable_logs_sample": true, "escalation_message": "the situation has escalated", "evaluation_delay": 700, - "groupby_simple_monitor": true, "include_tags": true, "locked": false, "new_host_delay": 600, diff --git a/tests/scenarios/features/v1/multi_alert_monitor_payload.json b/tests/scenarios/features/v1/multi_alert_monitor_payload.json index a0eb80488e5..960530c276f 100644 --- a/tests/scenarios/features/v1/multi_alert_monitor_payload.json +++ b/tests/scenarios/features/v1/multi_alert_monitor_payload.json @@ -10,7 +10,6 @@ "escalation_message": "the situation has escalated", "evaluation_delay": 700, "group_retention_duration": "2d", - "groupby_simple_monitor": false, "include_tags": true, "locked": false, "new_host_delay": 600,