diff --git a/.apigentools-info b/.apigentools-info index 297f5e4f13b..b9aa71e373d 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2024-10-09 15:03:02.042923", - "spec_repo_commit": "43ae024c" + "regenerated": "2024-10-09 21:12:06.338711", + "spec_repo_commit": "2911e2a3" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2024-10-09 15:03:02.062476", - "spec_repo_commit": "43ae024c" + "regenerated": "2024-10-09 21:12:06.357461", + "spec_repo_commit": "2911e2a3" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 7c78aee7fd4..e2eb404ab43 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -4189,6 +4189,7 @@ components: - cws_containers_usage - cws_hosts_usage - data_jobs_monitoring_usage + - data_stream_monitoring_usage - dbm_hosts_usage - dbm_queries_usage - error_tracking_usage @@ -4263,6 +4264,7 @@ components: - CWS_CONTAINERS_USAGE - CWS_HOSTS_USAGE - DATA_JOBS_MONITORING_USAGE + - DATA_STREAM_MONITORING_USAGE - DBM_HOSTS_USAGE - DBM_QUERIES_USAGE - ERROR_TRACKING_USAGE @@ -7945,6 +7947,8 @@ components: - cws_hosts_usage - data_jobs_monitoring_usage - data_jobs_monitoring_percentage + - data_stream_monitoring_usage + - data_stream_monitoring_percentage - dbm_hosts_percentage - dbm_hosts_usage - dbm_queries_percentage @@ -8088,6 +8092,8 @@ components: - CWS_HOSTS_USAGE - DATA_JOBS_MONITORING_USAGE - DATA_JOBS_MONITORING_PERCENTAGE + - DATA_STREAM_MONITORING_USAGE + - DATA_STREAM_MONITORING_PERCENTAGE - DBM_HOSTS_PERCENTAGE - DBM_HOSTS_USAGE - DBM_QUERIES_PERCENTAGE @@ -8379,6 +8385,10 @@ components: description: The Data Jobs Monitoring usage by tag(s). format: double type: number + data_stream_monitoring_usage: + description: The Data Stream Monitoring usage by tag(s). + format: double + type: number dbm_hosts_percentage: description: The percentage of Database Monitoring host usage by tag(s). format: double diff --git a/api/datadogV1/model_hourly_usage_attribution_usage_type.go b/api/datadogV1/model_hourly_usage_attribution_usage_type.go index 2b86287a36f..a4d2de64900 100644 --- a/api/datadogV1/model_hourly_usage_attribution_usage_type.go +++ b/api/datadogV1/model_hourly_usage_attribution_usage_type.go @@ -38,6 +38,7 @@ const ( HOURLYUSAGEATTRIBUTIONUSAGETYPE_CWS_CONTAINERS_USAGE HourlyUsageAttributionUsageType = "cws_containers_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_CWS_HOSTS_USAGE HourlyUsageAttributionUsageType = "cws_hosts_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_DATA_JOBS_MONITORING_USAGE HourlyUsageAttributionUsageType = "data_jobs_monitoring_usage" + HOURLYUSAGEATTRIBUTIONUSAGETYPE_DATA_STREAM_MONITORING_USAGE HourlyUsageAttributionUsageType = "data_stream_monitoring_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_DBM_HOSTS_USAGE HourlyUsageAttributionUsageType = "dbm_hosts_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_DBM_QUERIES_USAGE HourlyUsageAttributionUsageType = "dbm_queries_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_ERROR_TRACKING_USAGE HourlyUsageAttributionUsageType = "error_tracking_usage" @@ -113,6 +114,7 @@ var allowedHourlyUsageAttributionUsageTypeEnumValues = []HourlyUsageAttributionU HOURLYUSAGEATTRIBUTIONUSAGETYPE_CWS_CONTAINERS_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_CWS_HOSTS_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_DATA_JOBS_MONITORING_USAGE, + HOURLYUSAGEATTRIBUTIONUSAGETYPE_DATA_STREAM_MONITORING_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_DBM_HOSTS_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_DBM_QUERIES_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_ERROR_TRACKING_USAGE, diff --git a/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go b/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go index e337904009a..a399e9cb31e 100644 --- a/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go +++ b/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go @@ -53,6 +53,8 @@ const ( MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CWS_HOSTS_USAGE MonthlyUsageAttributionSupportedMetrics = "cws_hosts_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_JOBS_MONITORING_USAGE MonthlyUsageAttributionSupportedMetrics = "data_jobs_monitoring_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_JOBS_MONITORING_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "data_jobs_monitoring_percentage" + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_STREAM_MONITORING_USAGE MonthlyUsageAttributionSupportedMetrics = "data_stream_monitoring_usage" + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_STREAM_MONITORING_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "data_stream_monitoring_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DBM_HOSTS_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "dbm_hosts_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DBM_HOSTS_USAGE MonthlyUsageAttributionSupportedMetrics = "dbm_hosts_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DBM_QUERIES_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "dbm_queries_percentage" @@ -197,6 +199,8 @@ var allowedMonthlyUsageAttributionSupportedMetricsEnumValues = []MonthlyUsageAtt MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_CWS_HOSTS_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_JOBS_MONITORING_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_JOBS_MONITORING_PERCENTAGE, + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_STREAM_MONITORING_USAGE, + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DATA_STREAM_MONITORING_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DBM_HOSTS_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DBM_HOSTS_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_DBM_QUERIES_PERCENTAGE, diff --git a/api/datadogV1/model_monthly_usage_attribution_values.go b/api/datadogV1/model_monthly_usage_attribution_values.go index d93bea90d54..75c7bcb3b26 100644 --- a/api/datadogV1/model_monthly_usage_attribution_values.go +++ b/api/datadogV1/model_monthly_usage_attribution_values.go @@ -96,6 +96,8 @@ type MonthlyUsageAttributionValues struct { CwsHostsUsage *float64 `json:"cws_hosts_usage,omitempty"` // The Data Jobs Monitoring usage by tag(s). DataJobsMonitoringUsage *float64 `json:"data_jobs_monitoring_usage,omitempty"` + // The Data Stream Monitoring usage by tag(s). + DataStreamMonitoringUsage *float64 `json:"data_stream_monitoring_usage,omitempty"` // The percentage of Database Monitoring host usage by tag(s). DbmHostsPercentage *float64 `json:"dbm_hosts_percentage,omitempty"` // The Database Monitoring host usage by tag(s). @@ -1514,6 +1516,34 @@ func (o *MonthlyUsageAttributionValues) SetDataJobsMonitoringUsage(v float64) { o.DataJobsMonitoringUsage = &v } +// GetDataStreamMonitoringUsage returns the DataStreamMonitoringUsage field value if set, zero value otherwise. +func (o *MonthlyUsageAttributionValues) GetDataStreamMonitoringUsage() float64 { + if o == nil || o.DataStreamMonitoringUsage == nil { + var ret float64 + return ret + } + return *o.DataStreamMonitoringUsage +} + +// GetDataStreamMonitoringUsageOk returns a tuple with the DataStreamMonitoringUsage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *MonthlyUsageAttributionValues) GetDataStreamMonitoringUsageOk() (*float64, bool) { + if o == nil || o.DataStreamMonitoringUsage == nil { + return nil, false + } + return o.DataStreamMonitoringUsage, true +} + +// HasDataStreamMonitoringUsage returns a boolean if a field has been set. +func (o *MonthlyUsageAttributionValues) HasDataStreamMonitoringUsage() bool { + return o != nil && o.DataStreamMonitoringUsage != nil +} + +// SetDataStreamMonitoringUsage gets a reference to the given float64 and assigns it to the DataStreamMonitoringUsage field. +func (o *MonthlyUsageAttributionValues) SetDataStreamMonitoringUsage(v float64) { + o.DataStreamMonitoringUsage = &v +} + // GetDbmHostsPercentage returns the DbmHostsPercentage field value if set, zero value otherwise. func (o *MonthlyUsageAttributionValues) GetDbmHostsPercentage() float64 { if o == nil || o.DbmHostsPercentage == nil { @@ -4337,6 +4367,9 @@ func (o MonthlyUsageAttributionValues) MarshalJSON() ([]byte, error) { if o.DataJobsMonitoringUsage != nil { toSerialize["data_jobs_monitoring_usage"] = o.DataJobsMonitoringUsage } + if o.DataStreamMonitoringUsage != nil { + toSerialize["data_stream_monitoring_usage"] = o.DataStreamMonitoringUsage + } if o.DbmHostsPercentage != nil { toSerialize["dbm_hosts_percentage"] = o.DbmHostsPercentage } @@ -4678,6 +4711,7 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) CwsHostsPercentage *float64 `json:"cws_hosts_percentage,omitempty"` CwsHostsUsage *float64 `json:"cws_hosts_usage,omitempty"` DataJobsMonitoringUsage *float64 `json:"data_jobs_monitoring_usage,omitempty"` + DataStreamMonitoringUsage *float64 `json:"data_stream_monitoring_usage,omitempty"` DbmHostsPercentage *float64 `json:"dbm_hosts_percentage,omitempty"` DbmHostsUsage *float64 `json:"dbm_hosts_usage,omitempty"` DbmQueriesPercentage *float64 `json:"dbm_queries_percentage,omitempty"` @@ -4780,7 +4814,7 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) } additionalProperties := make(map[string]interface{}) if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil { - datadog.DeleteKeys(additionalProperties, &[]string{"api_percentage", "api_usage", "apm_fargate_percentage", "apm_fargate_usage", "apm_host_percentage", "apm_host_usage", "apm_usm_percentage", "apm_usm_usage", "appsec_fargate_percentage", "appsec_fargate_usage", "appsec_percentage", "appsec_usage", "asm_serverless_traced_invocations_percentage", "asm_serverless_traced_invocations_usage", "browser_percentage", "browser_usage", "ci_pipeline_indexed_spans_percentage", "ci_pipeline_indexed_spans_usage", "ci_test_indexed_spans_percentage", "ci_test_indexed_spans_usage", "ci_visibility_itr_percentage", "ci_visibility_itr_usage", "cloud_siem_percentage", "cloud_siem_usage", "container_excl_agent_percentage", "container_excl_agent_usage", "container_percentage", "container_usage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_event_percentage", "custom_event_usage", "custom_ingested_timeseries_percentage", "custom_ingested_timeseries_usage", "custom_timeseries_percentage", "custom_timeseries_usage", "cws_containers_percentage", "cws_containers_usage", "cws_hosts_percentage", "cws_hosts_usage", "data_jobs_monitoring_usage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "error_tracking_percentage", "error_tracking_usage", "estimated_indexed_logs_percentage", "estimated_indexed_logs_usage", "estimated_indexed_spans_percentage", "estimated_indexed_spans_usage", "estimated_ingested_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_spans_percentage", "estimated_ingested_spans_usage", "estimated_rum_sessions_percentage", "estimated_rum_sessions_usage", "fargate_percentage", "fargate_usage", "functions_percentage", "functions_usage", "incident_management_monthly_active_users_percentage", "incident_management_monthly_active_users_usage", "indexed_spans_percentage", "indexed_spans_usage", "infra_host_percentage", "infra_host_usage", "ingested_logs_bytes_percentage", "ingested_logs_bytes_usage", "ingested_spans_bytes_percentage", "ingested_spans_bytes_usage", "invocations_percentage", "invocations_usage", "lambda_traced_invocations_percentage", "lambda_traced_invocations_usage", "logs_indexed_15day_percentage", "logs_indexed_15day_usage", "logs_indexed_180day_percentage", "logs_indexed_180day_usage", "logs_indexed_1day_percentage", "logs_indexed_1day_usage", "logs_indexed_30day_percentage", "logs_indexed_30day_usage", "logs_indexed_360day_percentage", "logs_indexed_360day_usage", "logs_indexed_3day_percentage", "logs_indexed_3day_usage", "logs_indexed_45day_percentage", "logs_indexed_45day_usage", "logs_indexed_60day_percentage", "logs_indexed_60day_usage", "logs_indexed_7day_percentage", "logs_indexed_7day_usage", "logs_indexed_90day_percentage", "logs_indexed_90day_usage", "logs_indexed_custom_retention_percentage", "logs_indexed_custom_retention_usage", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_percentage", "ndm_netflow_usage", "npm_host_percentage", "npm_host_usage", "obs_pipeline_bytes_percentage", "obs_pipeline_bytes_usage", "obs_pipelines_vcpu_percentage", "obs_pipelines_vcpu_usage", "online_archive_percentage", "online_archive_usage", "profiled_container_percentage", "profiled_container_usage", "profiled_fargate_percentage", "profiled_fargate_usage", "profiled_host_percentage", "profiled_host_usage", "rum_browser_mobile_sessions_percentage", "rum_browser_mobile_sessions_usage", "rum_replay_sessions_percentage", "rum_replay_sessions_usage", "sca_fargate_percentage", "sca_fargate_usage", "sds_scanned_bytes_percentage", "sds_scanned_bytes_usage", "serverless_apps_percentage", "serverless_apps_usage", "siem_analyzed_logs_add_on_percentage", "siem_analyzed_logs_add_on_usage", "siem_ingested_bytes_percentage", "siem_ingested_bytes_usage", "snmp_percentage", "snmp_usage", "universal_service_monitoring_percentage", "universal_service_monitoring_usage", "vuln_management_hosts_percentage", "vuln_management_hosts_usage", "workflow_executions_percentage", "workflow_executions_usage"}) + datadog.DeleteKeys(additionalProperties, &[]string{"api_percentage", "api_usage", "apm_fargate_percentage", "apm_fargate_usage", "apm_host_percentage", "apm_host_usage", "apm_usm_percentage", "apm_usm_usage", "appsec_fargate_percentage", "appsec_fargate_usage", "appsec_percentage", "appsec_usage", "asm_serverless_traced_invocations_percentage", "asm_serverless_traced_invocations_usage", "browser_percentage", "browser_usage", "ci_pipeline_indexed_spans_percentage", "ci_pipeline_indexed_spans_usage", "ci_test_indexed_spans_percentage", "ci_test_indexed_spans_usage", "ci_visibility_itr_percentage", "ci_visibility_itr_usage", "cloud_siem_percentage", "cloud_siem_usage", "container_excl_agent_percentage", "container_excl_agent_usage", "container_percentage", "container_usage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_event_percentage", "custom_event_usage", "custom_ingested_timeseries_percentage", "custom_ingested_timeseries_usage", "custom_timeseries_percentage", "custom_timeseries_usage", "cws_containers_percentage", "cws_containers_usage", "cws_hosts_percentage", "cws_hosts_usage", "data_jobs_monitoring_usage", "data_stream_monitoring_usage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "error_tracking_percentage", "error_tracking_usage", "estimated_indexed_logs_percentage", "estimated_indexed_logs_usage", "estimated_indexed_spans_percentage", "estimated_indexed_spans_usage", "estimated_ingested_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_spans_percentage", "estimated_ingested_spans_usage", "estimated_rum_sessions_percentage", "estimated_rum_sessions_usage", "fargate_percentage", "fargate_usage", "functions_percentage", "functions_usage", "incident_management_monthly_active_users_percentage", "incident_management_monthly_active_users_usage", "indexed_spans_percentage", "indexed_spans_usage", "infra_host_percentage", "infra_host_usage", "ingested_logs_bytes_percentage", "ingested_logs_bytes_usage", "ingested_spans_bytes_percentage", "ingested_spans_bytes_usage", "invocations_percentage", "invocations_usage", "lambda_traced_invocations_percentage", "lambda_traced_invocations_usage", "logs_indexed_15day_percentage", "logs_indexed_15day_usage", "logs_indexed_180day_percentage", "logs_indexed_180day_usage", "logs_indexed_1day_percentage", "logs_indexed_1day_usage", "logs_indexed_30day_percentage", "logs_indexed_30day_usage", "logs_indexed_360day_percentage", "logs_indexed_360day_usage", "logs_indexed_3day_percentage", "logs_indexed_3day_usage", "logs_indexed_45day_percentage", "logs_indexed_45day_usage", "logs_indexed_60day_percentage", "logs_indexed_60day_usage", "logs_indexed_7day_percentage", "logs_indexed_7day_usage", "logs_indexed_90day_percentage", "logs_indexed_90day_usage", "logs_indexed_custom_retention_percentage", "logs_indexed_custom_retention_usage", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_percentage", "ndm_netflow_usage", "npm_host_percentage", "npm_host_usage", "obs_pipeline_bytes_percentage", "obs_pipeline_bytes_usage", "obs_pipelines_vcpu_percentage", "obs_pipelines_vcpu_usage", "online_archive_percentage", "online_archive_usage", "profiled_container_percentage", "profiled_container_usage", "profiled_fargate_percentage", "profiled_fargate_usage", "profiled_host_percentage", "profiled_host_usage", "rum_browser_mobile_sessions_percentage", "rum_browser_mobile_sessions_usage", "rum_replay_sessions_percentage", "rum_replay_sessions_usage", "sca_fargate_percentage", "sca_fargate_usage", "sds_scanned_bytes_percentage", "sds_scanned_bytes_usage", "serverless_apps_percentage", "serverless_apps_usage", "siem_analyzed_logs_add_on_percentage", "siem_analyzed_logs_add_on_usage", "siem_ingested_bytes_percentage", "siem_ingested_bytes_usage", "snmp_percentage", "snmp_usage", "universal_service_monitoring_percentage", "universal_service_monitoring_usage", "vuln_management_hosts_percentage", "vuln_management_hosts_usage", "workflow_executions_percentage", "workflow_executions_usage"}) } else { return err } @@ -4827,6 +4861,7 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) o.CwsHostsPercentage = all.CwsHostsPercentage o.CwsHostsUsage = all.CwsHostsUsage o.DataJobsMonitoringUsage = all.DataJobsMonitoringUsage + o.DataStreamMonitoringUsage = all.DataStreamMonitoringUsage o.DbmHostsPercentage = all.DbmHostsPercentage o.DbmHostsUsage = all.DbmHostsUsage o.DbmQueriesPercentage = all.DbmQueriesPercentage diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.freeze index ea1f2ccb9fb..10586eb5e93 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.freeze @@ -1 +1 @@ -2023-01-18T18:37:16.146Z \ No newline at end of file +2024-10-09T20:53:32.194Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.yaml index 239d83c749a..029d2455cda 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_graph_widget.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Create_a_new_dashboard_with_alert_graph_widget-1674067036","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:testcreateanewdashboardwithalertgraphwidget1674067036","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Create_a_new_dashboard_with_alert_graph_widget-1728507212","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:testcreateanewdashboardwithalertgraphwidget1728507212","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":108260299,"org_id":321813,"type":"log alert","name":"Test-Create_a_new_dashboard_with_alert_graph_widget-1674067036","message":"some - message Notify: @hipchat-channel","tags":["test:testcreateanewdashboardwithalertgraphwidget1674067036","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786506,"org_id":321813,"type":"log alert","name":"Test-Create_a_new_dashboard_with_alert_graph_widget-1728507212","message":"some + message Notify: @hipchat-channel","tags":["test:testcreateanewdashboardwithalertgraphwidget1728507212","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":1674067036000,"created":"2023-01-18T18:37:16.358564+00:00","modified":"2023-01-18T18:37:16.358564+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507212000,"created":"2024-10-09T20:53:32.454886+00:00","modified":"2024-10-09T20:53:32.454886+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -28,7 +28,7 @@ interactions: status: 200 OK - request: body: | - {"description":"","is_read_only":false,"layout_type":"free","notify_list":[],"template_variables":[],"title":"Test-Create_a_new_dashboard_with_alert_graph_widget-1674067036","widgets":[{"definition":{"alert_id":"108260299","time":{},"title":"","title_align":"left","title_size":"16","type":"alert_graph","viz_type":"timeseries"},"layout":{"height":15,"width":47,"x":0,"y":0}}]} + {"description":"","is_read_only":false,"layout_type":"free","notify_list":[],"template_variables":[],"title":"Test-Create_a_new_dashboard_with_alert_graph_widget-1728507212","widgets":[{"definition":{"alert_id":"155786506","time":{},"title":"","title_align":"left","title_size":"16","type":"alert_graph","viz_type":"timeseries"},"layout":{"height":15,"width":47,"x":0,"y":0}}]} form: {} headers: Accept: @@ -39,7 +39,8 @@ interactions: method: POST url: https://api.datadoghq.com/api/v1/dashboard response: - body: '{"notify_list":[],"description":"","restricted_roles":[],"author_name":null,"template_variables":[],"is_read_only":false,"id":"tvp-85z-v2d","title":"Test-Create_a_new_dashboard_with_alert_graph_widget-1674067036","url":"/dashboard/tvp-85z-v2d/test-createanewdashboardwithalertgraphwidget-1674067036","created_at":"2023-01-18T18:37:16.495648+00:00","modified_at":"2023-01-18T18:37:16.495648+00:00","author_handle":"frog@datadoghq.com","widgets":[{"definition":{"title_size":"16","viz_type":"timeseries","title":"","title_align":"left","alert_id":"108260299","time":{},"type":"alert_graph"},"layout":{"y":0,"width":47,"x":0,"height":15},"id":236119153104762}],"layout_type":"free"} + body: '{"id":"ndb-w8a-cyf","title":"Test-Create_a_new_dashboard_with_alert_graph_widget-1728507212","description":"","author_handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","author_name":"CI + Account","layout_type":"free","url":"/dashboard/ndb-w8a-cyf/test-createanewdashboardwithalertgraphwidget-1728507212","is_read_only":false,"template_variables":[],"widgets":[{"definition":{"alert_id":"155786506","time":{},"title":"","title_align":"left","title_size":"16","type":"alert_graph","viz_type":"timeseries"},"layout":{"height":15,"width":47,"x":0,"y":0},"id":1106982827787537}],"notify_list":[],"created_at":"2024-10-09T20:53:32.728119+00:00","modified_at":"2024-10-09T20:53:32.728119+00:00","restricted_roles":[]} ' code: 200 @@ -56,9 +57,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/dashboard/tvp-85z-v2d + url: https://api.datadoghq.com/api/v1/dashboard/ndb-w8a-cyf response: - body: '{"deleted_dashboard_id":"tvp-85z-v2d"} + body: '{"deleted_dashboard_id":"ndb-w8a-cyf"} ' code: 200 @@ -75,9 +76,9 @@ interactions: - application/json id: 3 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260299 + url: https://api.datadoghq.com/api/v1/monitor/155786506 response: - body: '{"deleted_monitor_id":108260299} + body: '{"deleted_monitor_id":155786506} ' code: 200 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.freeze index 80f12ae0484..751aee548f3 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.freeze @@ -1 +1 @@ -2023-01-18T18:37:16.878Z \ No newline at end of file +2024-10-09T20:53:33.396Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.yaml index dfc2de1293e..0b7aae36bb2 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Dashboards/Scenario_Create_a_new_dashboard_with_alert_value_widget.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Create_a_new_dashboard_with_alert_value_widget-1674067036","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:testcreateanewdashboardwithalertvaluewidget1674067036","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Create_a_new_dashboard_with_alert_value_widget-1728507213","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:testcreateanewdashboardwithalertvaluewidget1728507213","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":108260300,"org_id":321813,"type":"log alert","name":"Test-Create_a_new_dashboard_with_alert_value_widget-1674067036","message":"some - message Notify: @hipchat-channel","tags":["test:testcreateanewdashboardwithalertvaluewidget1674067036","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786507,"org_id":321813,"type":"log alert","name":"Test-Create_a_new_dashboard_with_alert_value_widget-1728507213","message":"some + message Notify: @hipchat-channel","tags":["test:testcreateanewdashboardwithalertvaluewidget1728507213","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":1674067037000,"created":"2023-01-18T18:37:17.013180+00:00","modified":"2023-01-18T18:37:17.013180+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507213000,"created":"2024-10-09T20:53:33.630174+00:00","modified":"2024-10-09T20:53:33.630174+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -28,7 +28,7 @@ interactions: status: 200 OK - request: body: | - {"description":"","is_read_only":false,"layout_type":"free","notify_list":[],"template_variables":[],"title":"Test-Create_a_new_dashboard_with_alert_value_widget-1674067036","widgets":[{"definition":{"alert_id":"108260300","precision":2,"text_align":"left","title":"","title_align":"left","title_size":"16","type":"alert_value","unit":"auto"},"layout":{"height":8,"width":15,"x":0,"y":0}}]} + {"description":"","is_read_only":false,"layout_type":"free","notify_list":[],"template_variables":[],"title":"Test-Create_a_new_dashboard_with_alert_value_widget-1728507213","widgets":[{"definition":{"alert_id":"155786507","precision":2,"text_align":"left","title":"","title_align":"left","title_size":"16","type":"alert_value","unit":"auto"},"layout":{"height":8,"width":15,"x":0,"y":0}}]} form: {} headers: Accept: @@ -39,7 +39,8 @@ interactions: method: POST url: https://api.datadoghq.com/api/v1/dashboard response: - body: '{"notify_list":[],"description":"","restricted_roles":[],"author_name":null,"template_variables":[],"is_read_only":false,"id":"ess-8yc-y8y","title":"Test-Create_a_new_dashboard_with_alert_value_widget-1674067036","url":"/dashboard/ess-8yc-y8y/test-createanewdashboardwithalertvaluewidget-1674067036","created_at":"2023-01-18T18:37:17.145823+00:00","modified_at":"2023-01-18T18:37:17.145823+00:00","author_handle":"frog@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"","title_align":"left","text_align":"left","precision":2,"alert_id":"108260300","type":"alert_value","unit":"auto"},"layout":{"y":0,"width":15,"x":0,"height":8},"id":3516493079797108}],"layout_type":"free"} + body: '{"id":"zyh-bcs-p2g","title":"Test-Create_a_new_dashboard_with_alert_value_widget-1728507213","description":"","author_handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","author_name":"CI + Account","layout_type":"free","url":"/dashboard/zyh-bcs-p2g/test-createanewdashboardwithalertvaluewidget-1728507213","is_read_only":false,"template_variables":[],"widgets":[{"definition":{"alert_id":"155786507","precision":2,"text_align":"left","title":"","title_align":"left","title_size":"16","type":"alert_value","unit":"auto"},"layout":{"height":8,"width":15,"x":0,"y":0},"id":8421671923897395}],"notify_list":[],"created_at":"2024-10-09T20:53:33.901847+00:00","modified_at":"2024-10-09T20:53:33.901847+00:00","restricted_roles":[]} ' code: 200 @@ -56,9 +57,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/dashboard/ess-8yc-y8y + url: https://api.datadoghq.com/api/v1/dashboard/zyh-bcs-p2g response: - body: '{"deleted_dashboard_id":"ess-8yc-y8y"} + body: '{"deleted_dashboard_id":"zyh-bcs-p2g"} ' code: 200 @@ -75,9 +76,9 @@ interactions: - application/json id: 3 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260300 + url: https://api.datadoghq.com/api/v1/monitor/155786507 response: - body: '{"deleted_monitor_id":108260300} + body: '{"deleted_monitor_id":155786507} ' code: 200 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.freeze index 53b28bc7837..c802e8c68f6 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.freeze @@ -1 +1 @@ -2023-01-18T18:37:17.507Z \ No newline at end of file +2024-10-09T20:53:34.558Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.yaml index a566a736bdf..126d2c802cc 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Downtimes/Scenario_Schedule_a_monitor_downtime_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Schedule_a_monitor_downtime_returns_OK_response-1674067037","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:testscheduleamonitordowntimereturnsokresponse1674067037","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Schedule_a_monitor_downtime_returns_OK_response-1728507214","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:testscheduleamonitordowntimereturnsokresponse1728507214","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":108260301,"org_id":321813,"type":"log alert","name":"Test-Schedule_a_monitor_downtime_returns_OK_response-1674067037","message":"some - message Notify: @hipchat-channel","tags":["test:testscheduleamonitordowntimereturnsokresponse1674067037","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786509,"org_id":321813,"type":"log alert","name":"Test-Schedule_a_monitor_downtime_returns_OK_response-1728507214","message":"some + message Notify: @hipchat-channel","tags":["test:testscheduleamonitordowntimereturnsokresponse1728507214","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":1674067037000,"created":"2023-01-18T18:37:17.701290+00:00","modified":"2023-01-18T18:37:17.701290+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507214000,"created":"2024-10-09T20:53:34.777003+00:00","modified":"2024-10-09T20:53:34.777003+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -28,7 +28,7 @@ interactions: status: 200 OK - request: body: | - {"message":"Test-Schedule_a_monitor_downtime_returns_OK_response-1674067037","monitor_id":108260301,"scope":["test:testscheduleamonitordowntimereturnsokresponse1674067037"],"start":1674067037,"timezone":"Etc/UTC"} + {"message":"Test-Schedule_a_monitor_downtime_returns_OK_response-1728507214","monitor_id":155786509,"scope":["test:testscheduleamonitordowntimereturnsokresponse1728507214"],"start":1728507214,"timezone":"Etc/UTC"} form: {} headers: Accept: @@ -39,7 +39,8 @@ interactions: method: POST url: https://api.datadoghq.com/api/v1/downtime response: - body: '{"id":2598558218,"monitor_id":108260301,"org_id":321813,"start":1674067037,"end":null,"canceled":null,"created":1674067037,"modified":1674067037,"message":"Test-Schedule_a_monitor_downtime_returns_OK_response-1674067037","active":true,"disabled":false,"recurrence":null,"timezone":"Etc/UTC","parent_id":null,"child_id":null,"creator_id":1445416,"updater_id":null,"downtime_type":2,"monitor_tags":["*"],"mute_first_recovery_notification":false,"scope":["test:testscheduleamonitordowntimereturnsokresponse1674067037"]} + body: '{"id":4428880565,"monitor_id":155786509,"org_id":321813,"start":1728507214,"end":null,"canceled":null,"created":1728507215,"modified":1728507215,"message":"Test-Schedule_a_monitor_downtime_returns_OK_response-1728507214","active":true,"disabled":false,"recurrence":null,"timezone":"Etc/UTC","parent_id":null,"child_id":null,"creator_id":2320499,"updater_id":null,"downtime_type":2,"status":"active","monitor_tags":["*"],"mute_first_recovery_notification":false,"notify_end_types":["expired"],"notify_end_states":["alert","no + data","warn"],"uuid":"4b3c7082-dc63-4e0a-9985-7e18e22d03a4","scope":["test:testscheduleamonitordowntimereturnsokresponse1728507214"]} ' code: 200 @@ -56,7 +57,7 @@ interactions: - '*/*' id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/downtime/2598558218 + url: https://api.datadoghq.com/api/v1/downtime/4428880565 response: body: '' code: 204 @@ -73,9 +74,9 @@ interactions: - application/json id: 3 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260301 + url: https://api.datadoghq.com/api/v1/monitor/155786509 response: - body: '{"deleted_monitor_id":108260301} + body: '{"deleted_monitor_id":155786509} ' code: 200 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.freeze index bdefbfef17b..dab434e85ad 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.freeze @@ -1 +1 @@ -2023-01-18T18:37:18.314Z \ No newline at end of file +2024-10-09T20:53:35.924Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.yaml index 93b15b33c6a..e39d237979d 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Check_if_a_monitor_can_be_deleted_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Check_if_a_monitor_can_be_deleted_returns_OK_response-1674067038","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:testcheckifamonitorcanbedeletedreturnsokresponse1674067038","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Check_if_a_monitor_can_be_deleted_returns_OK_response-1728507215","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:testcheckifamonitorcanbedeletedreturnsokresponse1728507215","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":108260302,"org_id":321813,"type":"log alert","name":"Test-Check_if_a_monitor_can_be_deleted_returns_OK_response-1674067038","message":"some - message Notify: @hipchat-channel","tags":["test:testcheckifamonitorcanbedeletedreturnsokresponse1674067038","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786512,"org_id":321813,"type":"log alert","name":"Test-Check_if_a_monitor_can_be_deleted_returns_OK_response-1728507215","message":"some + message Notify: @hipchat-channel","tags":["test:testcheckifamonitorcanbedeletedreturnsokresponse1728507215","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":1674067038000,"created":"2023-01-18T18:37:18.431658+00:00","modified":"2023-01-18T18:37:18.431658+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507216000,"created":"2024-10-09T20:53:36.156656+00:00","modified":"2024-10-09T20:53:36.156656+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -34,9 +34,9 @@ interactions: - application/json id: 1 method: GET - url: https://api.datadoghq.com/api/v1/monitor/can_delete?monitor_ids=108260302 + url: https://api.datadoghq.com/api/v1/monitor/can_delete?monitor_ids=155786512 response: - body: '{"data":{"ok":[108260302]},"errors":null} + body: '{"data":{"ok":[155786512]},"errors":null} ' code: 200 @@ -53,9 +53,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260302 + url: https://api.datadoghq.com/api/v1/monitor/155786512 response: - body: '{"deleted_monitor_id":108260302} + body: '{"deleted_monitor_id":155786512} ' code: 200 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.freeze index 06daabc8188..9438bebf854 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.freeze @@ -1 +1 @@ -2023-01-18T18:37:18.880Z \ No newline at end of file +2024-10-09T20:53:37.420Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.yaml index 4464c04b8dd..a337d2485df 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Delete_a_monitor_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Delete_a_monitor_returns_OK_response-1674067038","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:testdeleteamonitorreturnsokresponse1674067038","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Delete_a_monitor_returns_OK_response-1728507217","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:testdeleteamonitorreturnsokresponse1728507217","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":108260303,"org_id":321813,"type":"log alert","name":"Test-Delete_a_monitor_returns_OK_response-1674067038","message":"some - message Notify: @hipchat-channel","tags":["test:testdeleteamonitorreturnsokresponse1674067038","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786515,"org_id":321813,"type":"log alert","name":"Test-Delete_a_monitor_returns_OK_response-1728507217","message":"some + message Notify: @hipchat-channel","tags":["test:testdeleteamonitorreturnsokresponse1728507217","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":1674067039000,"created":"2023-01-18T18:37:19.000343+00:00","modified":"2023-01-18T18:37:19.000343+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507217000,"created":"2024-10-09T20:53:37.674692+00:00","modified":"2024-10-09T20:53:37.674692+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -34,9 +34,9 @@ interactions: - application/json id: 1 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260303 + url: https://api.datadoghq.com/api/v1/monitor/155786515 response: - body: '{"deleted_monitor_id":108260303} + body: '{"deleted_monitor_id":155786515} ' code: 200 @@ -53,7 +53,7 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260303 + url: https://api.datadoghq.com/api/v1/monitor/155786515 response: body: '{"errors":["Monitor not found"]}' code: 404 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.freeze index 981d358e3a1..337e79c2d11 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.freeze @@ -1 +1 @@ -2024-06-20T19:37:04.361Z \ No newline at end of file +2024-10-09T20:53:38.164Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.yaml index 70720210694..7de900c2e17 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Edit_a_monitor_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Edit_a_monitor_returns_OK_response-1718912224","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:testeditamonitorreturnsokresponse1718912224","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Edit_a_monitor_returns_OK_response-1728507218","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:testeditamonitorreturnsokresponse1728507218","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":147580793,"org_id":237503,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1718912224","message":"some - message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1718912224","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786516,"org_id":321813,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1728507218","message":"some + message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1728507218","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":1718912224000,"created":"2024-06-20T19:37:04.686145+00:00","modified":"2024-06-20T19:37:04.686145+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No - Data","creator":{"name":"Carl Martensen","handle":"carl.martensen@datadoghq.com","email":"carl.martensen@datadoghq.com","id":1078685}} + 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.0,"warning":1.0},"timeout_h":24,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507218000,"created":"2024-10-09T20:53:38.434962+00:00","modified":"2024-10-09T20:53:38.434962+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -28,7 +28,7 @@ interactions: status: 200 OK - request: body: | - {"name":"Test-Edit_a_monitor_returns_OK_response-1718912224-updated","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2,"warning":null},"timeout_h":null},"priority":null} + {"name":"Test-Edit_a_monitor_returns_OK_response-1728507218-updated","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2,"warning":null},"timeout_h":null},"priority":null} form: {} headers: Accept: @@ -37,12 +37,12 @@ interactions: - application/json id: 1 method: PUT - url: https://api.datadoghq.com/api/v1/monitor/147580793 + url: https://api.datadoghq.com/api/v1/monitor/155786516 response: - body: '{"id":147580793,"org_id":237503,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1718912224-updated","message":"some - message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1718912224","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786516,"org_id":321813,"type":"log alert","name":"Test-Edit_a_monitor_returns_OK_response-1728507218-updated","message":"some + message Notify: @hipchat-channel","tags":["test:testeditamonitorreturnsokresponse1728507218","env:ci"],"query":"logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") - > 2","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2.0},"timeout_h":null,"notify_no_data":false,"notify_audit":false,"include_tags":true,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1718912224000,"created":"2024-06-20T19:37:04.686145+00:00","modified":"2024-06-20T19:37:05.129654+00:00","deleted":null,"restricted_roles":null,"priority":null,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + > 2","options":{"evaluation_delay":null,"new_group_delay":600,"new_host_delay":null,"renotify_interval":null,"thresholds":{"critical":2.0},"timeout_h":null,"notify_no_data":false,"notify_audit":false,"include_tags":true,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507218000,"created":"2024-10-09T20:53:38.434962+00:00","modified":"2024-10-09T20:53:38.801652+00:00","deleted":null,"restricted_roles":null,"priority":null,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No Data"} ' @@ -60,9 +60,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/147580793 + url: https://api.datadoghq.com/api/v1/monitor/155786516 response: - body: '{"deleted_monitor_id":147580793} + body: '{"deleted_monitor_id":155786516} ' code: 200 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.freeze index ec45a2b566b..1b37cb9dc60 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.freeze @@ -1 +1 @@ -2023-05-22T17:02:26.784Z \ No newline at end of file +2024-10-09T20:53:39.219Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.yaml index 193c9c0037a..40ed151a195 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Get_a_monitors_details_returns_OK_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Get_a_monitor_s_details_returns_OK_response-1684774946","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:testgetamonitorsdetailsreturnsokresponse1684774946","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Get_a_monitor_s_details_returns_OK_response-1728507219","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:testgetamonitorsdetailsreturnsokresponse1728507219","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":119735290,"org_id":321813,"type":"log alert","name":"Test-Get_a_monitor_s_details_returns_OK_response-1684774946","message":"some - message Notify: @hipchat-channel","tags":["test:testgetamonitorsdetailsreturnsokresponse1684774946","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786517,"org_id":321813,"type":"log alert","name":"Test-Get_a_monitor_s_details_returns_OK_response-1728507219","message":"some + message Notify: @hipchat-channel","tags":["test:testgetamonitorsdetailsreturnsokresponse1728507219","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":1684774946000,"created":"2023-05-22T17:02:26.996650+00:00","modified":"2023-05-22T17:02:26.996650+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507219000,"created":"2024-10-09T20:53:39.470524+00:00","modified":"2024-10-09T20:53:39.470524+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -34,14 +34,14 @@ interactions: - application/json id: 1 method: GET - url: https://api.datadoghq.com/api/v1/monitor/119735290?with_downtimes=true + url: https://api.datadoghq.com/api/v1/monitor/155786517?with_downtimes=true response: - body: '{"id":119735290,"org_id":321813,"type":"log alert","name":"Test-Get_a_monitor_s_details_returns_OK_response-1684774946","message":"some - message Notify: @hipchat-channel","tags":["test:testgetamonitorsdetailsreturnsokresponse1684774946","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786517,"org_id":321813,"type":"log alert","name":"Test-Get_a_monitor_s_details_returns_OK_response-1728507219","message":"some + message Notify: @hipchat-channel","tags":["test:testgetamonitorsdetailsreturnsokresponse1728507219","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":1684774946000,"created":"2023-05-22T17:02:26.996650+00:00","modified":"2023-05-22T17:02:26.996650+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},"matching_downtimes":[]} + 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.0,"warning":1.0},"timeout_h":24,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507219000,"created":"2024-10-09T20:53:39.470524+00:00","modified":"2024-10-09T20:53:39.470524+00:00","deleted":null,"restricted_roles":null,"priority":3,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","email":"team-intg-tools-libs-spam@datadoghq.com","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","id":2320499},"matching_downtimes":[]} ' code: 200 @@ -58,9 +58,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/119735290 + url: https://api.datadoghq.com/api/v1/monitor/155786517 response: - body: '{"deleted_monitor_id":119735290} + body: '{"deleted_monitor_id":155786517} ' code: 200 diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.freeze b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.freeze index c29a2d2e979..5ed47cf0356 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.freeze +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.freeze @@ -1 +1 @@ -2023-01-18T18:37:20.085Z \ No newline at end of file +2024-10-09T20:53:40.075Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.yaml b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.yaml index e00e3a97fd2..57b5f5604ed 100644 --- a/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.yaml +++ b/tests/scenarios/cassettes/TestScenarios/v1/Feature_Monitors/Scenario_Validate_an_existing_monitor_returns_Invalid_JSON_response.yaml @@ -1,7 +1,7 @@ interactions: - request: body: | - {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_Invalid_JSON_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:testvalidateanexistingmonitorreturnsinvalidjsonresponse1674067040","env:ci"],"type":"log alert"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_Invalid_JSON_response-1728507220","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:testvalidateanexistingmonitorreturnsinvalidjsonresponse1728507220","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":108260306,"org_id":321813,"type":"log alert","name":"Test-Validate_an_existing_monitor_returns_Invalid_JSON_response-1674067040","message":"some - message Notify: @hipchat-channel","tags":["test:testvalidateanexistingmonitorreturnsinvalidjsonresponse1674067040","env:ci"],"query":"logs(\"service:foo + body: '{"id":155786518,"org_id":321813,"type":"log alert","name":"Test-Validate_an_existing_monitor_returns_Invalid_JSON_response-1728507220","message":"some + message Notify: @hipchat-channel","tags":["test:testvalidateanexistingmonitorreturnsinvalidjsonresponse1728507220","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.200427+00:00","modified":"2023-01-18T18:37:20.200427+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,"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,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507220000,"created":"2024-10-09T20:53:40.309071+00:00","modified":"2024-10-09T20:53:40.309071+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' code: 200 @@ -37,7 +37,7 @@ interactions: - application/json id: 1 method: POST - url: https://api.datadoghq.com/api/v1/monitor/108260306/validate + url: https://api.datadoghq.com/api/v1/monitor/155786518/validate response: body: '{"errors":["The value provided for parameter ''query'' is invalid: invalid operator specified: "]}' @@ -55,9 +55,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/108260306 + url: https://api.datadoghq.com/api/v1/monitor/155786518 response: - body: '{"deleted_monitor_id":108260306} + body: '{"deleted_monitor_id":155786518} ' code: 200 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 dc14445dd32..6db649bc892 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 @@ -2024-10-09T14:54:55.436Z \ No newline at end of file +2024-10-09T20:53:40.982Z \ 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 6f524b7e0af..b504466076c 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-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"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_OK_response-1728507220","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:testvalidateanexistingmonitorreturnsokresponse1728507220","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":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 + body: '{"id":155786521,"org_id":321813,"type":"log alert","name":"Test-Validate_an_existing_monitor_returns_OK_response-1728507220","message":"some + message Notify: @hipchat-channel","tags":["test:testvalidateanexistingmonitorreturnsokresponse1728507220","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":"anika.maskara@datadoghq.com","email":"anika.maskara@datadoghq.com","id":7557262}} + 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.0,"warning":1.0},"timeout_h":24,"groupby_simple_monitor":false,"silenced":{}},"multi":true,"created_at":1728507221000,"created":"2024-10-09T20:53:41.210821+00:00","modified":"2024-10-09T20:53:41.210821+00:00","deleted":null,"restricted_roles":null,"priority":3,"restriction_policy":null,"overall_state_modified":null,"overall_state":"No + Data","creator":{"name":"CI Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com","id":2320499}} ' 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-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"} + {"message":"some message Notify: @hipchat-channel","name":"Test-Validate_an_existing_monitor_returns_OK_response-1728507220","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:testvalidateanexistingmonitorreturnsokresponse1728507220","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/155758542/validate + url: https://api.datadoghq.com/api/v1/monitor/155786521/validate response: body: '{} @@ -56,9 +56,9 @@ interactions: - application/json id: 2 method: DELETE - url: https://api.datadoghq.com/api/v1/monitor/155758542 + url: https://api.datadoghq.com/api/v1/monitor/155786521 response: - body: '{"deleted_monitor_id":155758542} + body: '{"deleted_monitor_id":155786521} ' code: 200 diff --git a/tests/scenarios/features/v1/given.json b/tests/scenarios/features/v1/given.json index 4b7ae56d5b4..c4f7aa6976d 100644 --- a/tests/scenarios/features/v1/given.json +++ b/tests/scenarios/features/v1/given.json @@ -166,7 +166,7 @@ "parameters": [ { "name": "body", - "value": "{\n \"name\": \"{{ unique }}\",\n \"type\": \"log alert\",\n \"query\": \"logs(\\\"service:foo AND type:error\\\").index(\\\"main\\\").rollup(\\\"count\\\").by(\\\"source\\\").last(\\\"5m\\\") > 2\",\n \"message\": \"some message Notify: @hipchat-channel\",\n \"tags\": [\"test:{{ unique_lower_alnum }}\", \"env:ci\"],\n \"priority\": 3,\n \"options\": {\n \"enable_logs_sample\": true,\n \"escalation_message\": \"the situation has escalated\",\n \"evaluation_delay\": 700,\n \"groupby_simple_monitor\": true,\n \"include_tags\": true,\n \"locked\": false,\n \"new_host_delay\": 600,\n \"no_data_timeframe\": null,\n \"notify_audit\": false,\n \"notify_no_data\": false,\n \"on_missing_data\": \"show_and_notify_no_data\",\n \"notification_preset_name\": \"hide_handles\",\n \"renotify_interval\": 60,\n \"require_full_window\": true,\n \"timeout_h\": 24,\n \"thresholds\": { \"critical\": 2, \"warning\": 1 }\n }\n}\n" + "value": "{\n \"name\": \"{{ unique }}\",\n \"type\": \"log alert\",\n \"query\": \"logs(\\\"service:foo AND type:error\\\").index(\\\"main\\\").rollup(\\\"count\\\").by(\\\"source\\\").last(\\\"5m\\\") > 2\",\n \"message\": \"some message Notify: @hipchat-channel\",\n \"tags\": [\"test:{{ unique_lower_alnum }}\", \"env:ci\"],\n \"priority\": 3,\n \"options\": {\n \"enable_logs_sample\": true,\n \"escalation_message\": \"the situation has escalated\",\n \"evaluation_delay\": 700,\n \"include_tags\": true,\n \"locked\": false,\n \"new_host_delay\": 600,\n \"no_data_timeframe\": null,\n \"notify_audit\": false,\n \"notify_no_data\": false,\n \"on_missing_data\": \"show_and_notify_no_data\",\n \"notification_preset_name\": \"hide_handles\",\n \"renotify_interval\": 60,\n \"require_full_window\": true,\n \"timeout_h\": 24,\n \"thresholds\": { \"critical\": 2, \"warning\": 1 }\n }\n}\n" } ], "step": "there is a valid \"monitor\" in the system",