Remove groupby_simple_monitor (#2520)

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

Hide file tree

Showing 12 changed files with 20 additions and 25 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:20.142592",
-            "spec_repo_commit": "a458c3a4"
+            "regenerated": "2024-10-09 15:03:02.016472",
+            "spec_repo_commit": "43ae024c"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-09 13:48:20.160684",
-            "spec_repo_commit": "a458c3a4"
+            "regenerated": "2024-10-09 15:03:02.035675",
+            "spec_repo_commit": "43ae024c"
         }
     }
 }
diff --git a/examples/v1/monitors/ValidateExistingMonitor.java b/examples/v1/monitors/ValidateExistingMonitor.java
@@ -35,7 +35,6 @@ public static void main(String[] args) {
                     .enableLogsSample(true)
                     .escalationMessage("the situation has escalated")
                     .evaluationDelay(700L)
-                    .groupbySimpleMonitor(true)
                     .includeTags(true)
                     .locked(false)
                     .newHostDelay(600L)

diff --git a/examples/v1/monitors/ValidateMonitor.java b/examples/v1/monitors/ValidateMonitor.java
@@ -32,7 +32,6 @@ public static void main(String[] args) {
                     .enableLogsSample(true)
                     .escalationMessage("the situation has escalated")
                     .evaluationDelay(700L)
-                    .groupbySimpleMonitor(true)
                     .includeTags(true)
                     .locked(false)
                     .newHostDelay(600L)

diff --git a/examples/v1/monitors/ValidateMonitor_4247196452.java b/examples/v1/monitors/ValidateMonitor_4247196452.java
@@ -33,7 +33,6 @@ public static void main(String[] args) {
                     .escalationMessage("the situation has escalated")
                     .evaluationDelay(700L)
                     .groupRetentionDuration("2d")
-                    .groupbySimpleMonitor(false)
                     .includeTags(true)
                     .locked(false)
                     .newHostDelay(600L)

diff --git a/src/test/resources/cassettes/features/v1/Validate_a_monitor_returns_OK_response.freeze b/src/test/resources/cassettes/features/v1/Validate_a_monitor_returns_OK_response.freeze
@@ -1 +1 @@
-2023-01-18T18:30:59.296Z
+2024-10-09T14:54:54.858Z
diff --git a/src/test/resources/cassettes/features/v1/Validate_a_monitor_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Validate_a_monitor_returns_OK_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"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\\\") > 2\", \"tags\": [\"test:testvalidateamonitorreturnsokresponse1674066659\", \"env:ci\"], \"type\": \"log alert\"}"
+        "json": "{\"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:testvalidateamonitorreturnsokresponse1728485694\", \"env:ci\"], \"type\": \"log alert\"}"
       },
       "headers": {},
       "method": "POST",
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ff464b26-5a52-dc41-bfd8-6aba6b323872"
+    "id": "204c5443-ba93-89bc-72d5-e4f9e3aa9972"
   }
 ]
diff --git a/...resources/cassettes/features/v1/Validate_a_multi_alert_monitor_returns_OK_response.freeze b/...resources/cassettes/features/v1/Validate_a_multi_alert_monitor_returns_OK_response.freeze
@@ -1 +1 @@
-2022-09-30T16:41:33.797Z
+2024-10-09T14:54:55.290Z
diff --git a/...t/resources/cassettes/features/v1/Validate_a_multi_alert_monitor_returns_OK_response.json b/...t/resources/cassettes/features/v1/Validate_a_multi_alert_monitor_returns_OK_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"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\\\") > 2\", \"tags\": [\"test:testvalidateamultialertmonitorreturnsokresponse1664556093\", \"env:ci\"], \"type\": \"log alert\"}"
+        "json": "{\"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:testvalidateamultialertmonitorreturnsokresponse1728485695\", \"env:ci\"], \"type\": \"log alert\"}"
       },
       "headers": {},
       "method": "POST",
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5288984-9c4e-433b-e88c-072aa18bcf71"
+    "id": "aaae5e4d-f109-932b-b7b4-280d7bfa8e79"
   }
 ]
diff --git a/...t/resources/cassettes/features/v1/Validate_an_existing_monitor_returns_OK_response.freeze b/...t/resources/cassettes/features/v1/Validate_an_existing_monitor_returns_OK_response.freeze
@@ -1 +1 @@
-2023-01-18T18:37:20.511Z
+2024-10-09T14:54:55.436Z
diff --git a/...est/resources/cassettes/features/v1/Validate_an_existing_monitor_returns_OK_response.json b/...est/resources/cassettes/features/v1/Validate_an_existing_monitor_returns_OK_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"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\\\") > 2\", \"tags\": [\"test:testvalidateanexistingmonitorreturnsokresponse1674067040\", \"env:ci\"], \"type\": \"log alert\"}"
+        "json": "{\"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:testvalidateanexistingmonitorreturnsokresponse1728485695\", \"env:ci\"], \"type\": \"log alert\"}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "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 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\":\"[email protected]\",\"email\":\"[email protected]\",\"id\":1445416}}\n",
+      "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\":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\":\"[email protected]\",\"email\":\"[email protected]\",\"id\":7557262}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,17 +27,17 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a6398d92-236d-e6af-6e0c-182ccfc97958"
+    "id": "2d7f69c0-82d7-06ae-2adf-774fd2e93129"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"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\\\") > 2\", \"tags\": [\"test:testvalidateanexistingmonitorreturnsokresponse1674067040\", \"env:ci\"], \"type\": \"log alert\"}"
+        "json": "{\"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:testvalidateanexistingmonitorreturnsokresponse1728485695\", \"env:ci\"], \"type\": \"log alert\"}"
       },
       "headers": {},
       "method": "POST",
-      "path": "/api/v1/monitor/108260307/validate",
+      "path": "/api/v1/monitor/155758542/validate",
       "keepAlive": false,
       "secure": true
     },
@@ -57,18 +57,18 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b495ccaf-91c3-89cb-4434-e4eba81e682d"
+    "id": "72438c8d-f745-1041-b074-2f21d93af386"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v1/monitor/108260307",
+      "path": "/api/v1/monitor/155758542",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"deleted_monitor_id\":108260307}\n",
+      "body": "{\"deleted_monitor_id\":155758542}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "446ceaa5-6aae-6e10-9dba-bd3db5f74550"
+    "id": "a5383955-300b-7364-7465-a9bf4e2bf5e4"
   }
 ]
diff --git a/src/test/resources/com/datadog/api/client/v1/api/monitor_payload.json b/src/test/resources/com/datadog/api/client/v1/api/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/src/test/resources/com/datadog/api/client/v1/api/multi_alert_monitor_payload.json b/src/test/resources/com/datadog/api/client/v1/api/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,