Remove groupby_simple_monitor (#2203)

Co-authored-by: ci.datadog-api-spec <[email protected]>
DataDog · Oct 9, 2024 · 3a5f865 · 3a5f865
1 parent e9df6eb
commit 3a5f865
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 30 deletions.
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-09 13:48:31.125396",
-            "spec_repo_commit": "a458c3a4"
+            "regenerated": "2024-10-09 15:03:03.678250",
+            "spec_repo_commit": "43ae024c"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-09 13:48:31.266147",
-            "spec_repo_commit": "a458c3a4"
+            "regenerated": "2024-10-09 15:03:03.695757",
+            "spec_repo_commit": "43ae024c"
         }
     }
 }
diff --git a/examples/v1/monitors/ValidateExistingMonitor.py b/examples/v1/monitors/ValidateExistingMonitor.py
@@ -29,7 +29,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/examples/v1/monitors/ValidateMonitor.py b/examples/v1/monitors/ValidateMonitor.py
@@ -25,7 +25,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/examples/v1/monitors/ValidateMonitor_4247196452.py b/examples/v1/monitors/ValidateMonitor_4247196452.py
@@ -25,7 +25,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,

diff --git a/tests/v1/cassettes/test_scenarios/test_validate_a_monitor_returns_ok_response.frozen b/tests/v1/cassettes/test_scenarios/test_validate_a_monitor_returns_ok_response.frozen
@@ -1 +1 @@
-2023-01-18T18:30:59.296Z
+2024-10-09T14:54:54.858Z
diff --git a/tests/v1/cassettes/test_scenarios/test_validate_a_monitor_returns_ok_response.yaml b/tests/v1/cassettes/test_scenarios/test_validate_a_monitor_returns_ok_response.yaml
@@ -1,9 +1,9 @@
 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
+    body: '{"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\")
-      > 2","tags":["test:testvalidateamonitorreturnsokresponse1674066659","env:ci"],"type":"log
+      > 2","tags":["test:testvalidateamonitorreturnsokresponse1728485694","env:ci"],"type":"log
       alert"}'
     headers:
       accept:

diff --git a/...v1/cassettes/test_scenarios/test_validate_a_multialert_monitor_returns_ok_response.frozen b/...v1/cassettes/test_scenarios/test_validate_a_multialert_monitor_returns_ok_response.frozen
@@ -1 +1 @@
-2022-09-30T16:41:33.797Z
+2024-10-09T14:54:55.290Z
diff --git a/...s/v1/cassettes/test_scenarios/test_validate_a_multialert_monitor_returns_ok_response.yaml b/...s/v1/cassettes/test_scenarios/test_validate_a_multialert_monitor_returns_ok_response.yaml
@@ -1,9 +1,9 @@
 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
+    body: '{"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\")
-      > 2","tags":["test:testvalidateamultialertmonitorreturnsokresponse1664556093","env:ci"],"type":"log
+      > 2","tags":["test:testvalidateamultialertmonitorreturnsokresponse1728485695","env:ci"],"type":"log
       alert"}'
     headers:
       accept:

diff --git a/.../v1/cassettes/test_scenarios/test_validate_an_existing_monitor_returns_ok_response.frozen b/.../v1/cassettes/test_scenarios/test_validate_an_existing_monitor_returns_ok_response.frozen
@@ -1 +1 @@
-2023-01-18T18:37:20.511Z
+2024-10-09T14:54:55.436Z
diff --git a/tests/v1/cassettes/test_scenarios/test_validate_an_existing_monitor_returns_ok_response.yaml b/tests/v1/cassettes/test_scenarios/test_validate_an_existing_monitor_returns_ok_response.yaml
@@ -1,9 +1,9 @@
 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
+    body: '{"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\")
-      > 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1674067040","env:ci"],"type":"log
+      > 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1728485695","env:ci"],"type":"log
       alert"}'
     headers:
       accept:
@@ -14,12 +14,12 @@ interactions:
     uri: https://api.datadoghq.com/api/v1/monitor
   response:
     body:
-      string: '{"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
+      string: '{"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}}
 
         '
     headers:
@@ -29,18 +29,18 @@ interactions:
       code: 200
       message: 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
+    body: '{"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\")
-      > 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1674067040","env:ci"],"type":"log
+      > 2","tags":["test:testvalidateanexistingmonitorreturnsokresponse1728485695","env:ci"],"type":"log
       alert"}'
     headers:
       accept:
       - application/json
       content-type:
       - application/json
     method: POST
-    uri: https://api.datadoghq.com/api/v1/monitor/108260307/validate
+    uri: https://api.datadoghq.com/api/v1/monitor/155758542/validate
   response:
     body:
       string: '{}
@@ -58,10 +58,10 @@ interactions:
       accept:
       - application/json
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/monitor/108260307
+    uri: https://api.datadoghq.com/api/v1/monitor/155758542
   response:
     body:
-      string: '{"deleted_monitor_id":108260307}
+      string: '{"deleted_monitor_id":155758542}
 
         '
     headers:

diff --git a/tests/v1/features/monitor_payload.json b/tests/v1/features/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/v1/features/multi_alert_monitor_payload.json b/tests/v1/features/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,