Remove groupby_simple_monitor (#2729)

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

Hide file tree

Showing 12 changed files with 18 additions and 23 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: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"
  }
  }
 }
diff --git 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
@@ -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
@@ -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/.../TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.freeze b/.../TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.freeze
@@ -1 +1 @@
-2023-01-18T18:30:59.296Z
+2024-10-09T14:54:54.858Z
diff --git a/...es/TestScenarios/v1/Feature_Monitors/Scenario_Validate_a_monitor_returns_OK_response.yaml b/...es/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/...os/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.freeze b/...os/v1/Feature_Monitors/Scenario_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/...rios/v1/Feature_Monitors/Scenario_Validate_a_multi-alert_monitor_returns_OK_response.yaml b/...rios/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/...rios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.freeze b/...rios/v1/Feature_Monitors/Scenario_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/...narios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_OK_response.yaml b/...narios/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
@@ -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
@@ -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,