adjust

database/elasticsearch/README.md

@@ -267,15 +267,15 @@ Creates DataDog monitors with the following checks:
 | <a name="input_slm_snapshot_deletion_failures_message"></a> [slm\_snapshot\_deletion\_failures\_message](#input\_slm\_snapshot\_deletion\_failures\_message) | Custom message for SLM Snapshot deletion failures monitor | `string` | `""` | no |
 | <a name="input_slm_snapshot_deletion_failures_threshold_critical"></a> [slm\_snapshot\_deletion\_failures\_threshold\_critical](#input\_slm\_snapshot\_deletion\_failures\_threshold\_critical) | SLM Snapshot deletion failures critical threshold | `string` | `0` | no |
 | <a name="input_slm_snapshot_deletion_failures_time_aggregator"></a> [slm\_snapshot\_deletion\_failures\_time\_aggregator](#input\_slm\_snapshot\_deletion\_failures\_time\_aggregator) | Time aggregator for SLM Snapshot deletion failures monitor | `string` | `"avg"` | no |
-| <a name="input_slm_snapshot_deletion_failures_timeframe"></a> [slm\_snapshot\_deletion\_failures\_timeframe](#input\_slm\_snapshot\_deletion\_failures\_timeframe) | SLM Snapshot deletion failures timeframe | `string` | `"last_5m"` | no |
-| <a name="input_slm_snapshot_deletion_failures_timeshift"></a> [slm\_snapshot\_deletion\_failures\_timeshift](#input\_slm\_snapshot\_deletion\_failures\_timeshift) | SLM Snapshot deletion failures timeshift | `string` | `"last_1h"` | no |
+| <a name="input_slm_snapshot_deletion_failures_timeframe"></a> [slm\_snapshot\_deletion\_failures\_timeframe](#input\_slm\_snapshot\_deletion\_failures\_timeframe) | SLM Snapshot deletion failures timeframe | `string` | `"last_15m"` | no |
+| <a name="input_slm_snapshot_deletion_failures_timeshift"></a> [slm\_snapshot\_deletion\_failures\_timeshift](#input\_slm\_snapshot\_deletion\_failures\_timeshift) | SLM Snapshot deletion failures timeshift | `string` | `"last_2h"` | no |
 | <a name="input_slm_snapshots_failed_enabled"></a> [slm\_snapshots\_failed\_enabled](#input\_slm\_snapshots\_failed\_enabled) | Flag to enable SLM Snapshots Failed monitor | `string` | `"true"` | no |
 | <a name="input_slm_snapshots_failed_extra_tags"></a> [slm\_snapshots\_failed\_extra\_tags](#input\_slm\_snapshots\_failed\_extra\_tags) | Extra tags for SLM Snapshots Failed monitor | `list(string)` | `[]` | no |
 | <a name="input_slm_snapshots_failed_message"></a> [slm\_snapshots\_failed\_message](#input\_slm\_snapshots\_failed\_message) | Custom message for SLM Snapshots Failed monitor | `string` | `""` | no |
 | <a name="input_slm_snapshots_failed_threshold_critical"></a> [slm\_snapshots\_failed\_threshold\_critical](#input\_slm\_snapshots\_failed\_threshold\_critical) | SLM Snapshots Failed critical threshold | `string` | `0` | no |
 | <a name="input_slm_snapshots_failed_time_aggregator"></a> [slm\_snapshots\_failed\_time\_aggregator](#input\_slm\_snapshots\_failed\_time\_aggregator) | Time aggregator for SLM Snapshots Failed monitor | `string` | `"avg"` | no |
-| <a name="input_slm_snapshots_failed_timeframe"></a> [slm\_snapshots\_failed\_timeframe](#input\_slm\_snapshots\_failed\_timeframe) | SLM Snapshots Failed timeframe | `string` | `"last_5m"` | no |
-| <a name="input_slm_snapshots_failed_timeshift"></a> [slm\_snapshots\_failed\_timeshift](#input\_slm\_snapshots\_failed\_timeshift) | SLM Snapshots Failed timeshift | `string` | `"last_1h"` | no |
+| <a name="input_slm_snapshots_failed_timeframe"></a> [slm\_snapshots\_failed\_timeframe](#input\_slm\_snapshots\_failed\_timeframe) | SLM Snapshots Failed timeframe | `string` | `"last_15m"` | no |
+| <a name="input_slm_snapshots_failed_timeshift"></a> [slm\_snapshots\_failed\_timeshift](#input\_slm\_snapshots\_failed\_timeshift) | SLM Snapshots Failed timeshift | `string` | `"last_2h"` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | Global variables | `list(string)` | <pre>[<br>  "type:database",<br>  "provider:elasticsearch",<br>  "resource:elasticsearch"<br>]</pre> | no |
 | <a name="input_task_time_in_queue_change_enabled"></a> [task\_time\_in\_queue\_change\_enabled](#input\_task\_time\_in\_queue\_change\_enabled) | Flag to enable Cluster Status monitor | `string` | `"true"` | no |
 | <a name="input_task_time_in_queue_change_extra_tags"></a> [task\_time\_in\_queue\_change\_extra\_tags](#input\_task\_time\_in\_queue\_change\_extra\_tags) | Extra tags for Cluster Status monitor | `list(string)` | `[]` | no |

database/elasticsearch/inputs.tf

@@ -1135,13 +1135,13 @@ variable "slm_snapshots_failed_time_aggregator" {
 variable "slm_snapshots_failed_timeframe" {
   description = "SLM Snapshots Failed timeframe"
   type        = string
-  default     = "last_5m"
+  default     = "last_15m"
 }
 
 variable "slm_snapshots_failed_timeshift" {
   description = "SLM Snapshots Failed timeshift"
   type        = string
-  default     = "last_1h"
+  default     = "last_2h"
 }
 
 variable "slm_snapshots_failed_threshold_critical" {
@@ -1181,13 +1181,13 @@ variable "slm_snapshot_deletion_failures_time_aggregator" {
 variable "slm_snapshot_deletion_failures_timeframe" {
   description = "SLM Snapshot deletion failures timeframe"
   type        = string
-  default     = "last_5m"
+  default     = "last_15m"
 }
 
 variable "slm_snapshot_deletion_failures_timeshift" {
   description = "SLM Snapshot deletion failures timeshift"
   type        = string
-  default     = "last_1h"
+  default     = "last_2h"
 }
 
 variable "slm_snapshot_deletion_failures_threshold_critical" {

database/elasticsearch/monitors-elasticsearch.tf

@@ -730,7 +730,7 @@ EOQ
 resource "datadog_monitor" "slm_snapshots_failed" {
   count   = var.slm_snapshots_failed_enabled == "true" ? 1 : 0
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticsearch {{policy}} snapshot failed on {{cluster_name}}"
-  message = "This monitor will be triggered on each failed snapshot according to the timeframe configured, and should be resolved manually ${coalesce(var.slm_snapshots_failed_message, var.message)}"
+  message = "This monitor will be triggered on each failed snapshot according to the timeframe configured, and should be resolved manually.\n${coalesce(var.slm_snapshots_failed_message, var.message)}"
   type    = "query alert"
 
   query = <<EOQ
@@ -761,7 +761,7 @@ EOQ
 resource "datadog_monitor" "slm_snapshot_deletion_failures" {
   count   = var.slm_snapshot_deletion_failures_enabled == "true" ? 1 : 0
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticsearch {{policy}} snapshot deletion failure on {{cluster_name}}"
-  message = "This monitor will be triggered on each failed snapshot according to the timeframe configured, and should be resolved manually ${coalesce(var.slm_snapshot_deletion_failures_message, var.message)}"
+  message = "This monitor will be triggered on each failed snapshot according to the timeframe configured, and should be resolved manually.\n${coalesce(var.slm_snapshot_deletion_failures_message, var.message)}"
   type    = "query alert"
 
   query = <<EOQ