From 303fffc00c10238a2c3778575d7bbea152973b48 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Tue, 14 Jan 2020 16:00:31 +0100
Subject: [PATCH 1/9] MON-554 - Add first version of Velero monitors

---
 caas/kubernetes/velero/inputs.tf          | 206 ++++++++++++++++++++++
 caas/kubernetes/velero/modules.tf         |  19 ++
 caas/kubernetes/velero/monitors-velero.tf | 169 ++++++++++++++++++
 caas/kubernetes/velero/outputs.tf         |  24 +++
 4 files changed, 418 insertions(+)
 create mode 100644 caas/kubernetes/velero/inputs.tf
 create mode 100644 caas/kubernetes/velero/modules.tf
 create mode 100644 caas/kubernetes/velero/monitors-velero.tf
 create mode 100644 caas/kubernetes/velero/outputs.tf

diff --git a/caas/kubernetes/velero/inputs.tf b/caas/kubernetes/velero/inputs.tf
new file mode 100644
index 0000000..185744d
--- /dev/null
+++ b/caas/kubernetes/velero/inputs.tf
@@ -0,0 +1,206 @@
+# Datadog global variables
+
+variable "environment" {
+  description = "Architecture environment"
+}
+
+variable "filter_tags_use_defaults" {
+  description = "Use default filter tags convention"
+  default     = "true"
+}
+
+variable "filter_tags_custom" {
+  description = "Tags used for custom filtering when filter_tags_use_defaults is false"
+  default     = "*"
+}
+
+variable "filter_tags_custom_excluded" {
+  description = "Tags excluded for custom filtering when filter_tags_use_defaults is false"
+  default     = ""
+}
+
+variable "filter_tags_scheduled_backup_use_defaults" {
+  description = "Use default filter tags scheduled backup convention"
+  default     = null
+}
+
+variable "filter_tags_scheduled_backup_custom" {
+  description = "Tags used for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false"
+  default     = null
+}
+
+variable "filter_tags_scheduled_backup_custom_excluded" {
+  description = "Tags excluded for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false"
+  default     = null
+}
+
+variable "message" {
+  description = "Message sent when a monitor is triggered"
+}
+
+variable "evaluation_delay" {
+  description = "Delay in seconds for the metric evaluation"
+  default     = 15
+}
+
+variable "new_host_delay" {
+  description = "Delay in seconds before monitor new resource"
+  default     = 300
+}
+
+variable "prefix_slug" {
+  description = "Prefix string to prepend between brackets on every monitors names"
+  default     = ""
+}
+
+variable "notify_no_data" {
+  description = "Will raise no data alert if set to true"
+  default     = true
+}
+
+# Datadog monitors variables
+
+variable "velero_scheduled_backup_missing_monitor_message" {
+  description = "Custom message for Velero scheduled backup missing monitor"
+  type        = string
+  default     = ""
+}
+
+variable "velero_scheduled_backup_missing_monitor_timeframe" {
+  description = "Monitor timeframe for Velero scheduled backup missing monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = string
+  default     = "last_1d"
+}
+
+variable "velero_scheduled_backup_missing_enabled" {
+  description = "Flag to enable Velero scheduled backup missing monitor"
+  type        = string
+  default     = "true"
+}
+
+variable "velero_scheduled_backup_missing_extra_tags" {
+  description = "Extra tags for Velero scheduled backup missing monitor"
+  type        = list(string)
+  default     = []
+}
+
+variable "velero_scheduled_backup_missing_monitor_no_data_timeframe" {
+  description = "No data timeframe in minutes"
+  default     = 1440
+}
+
+variable "velero_backup_failure_monitor_message" {
+  description = "Custom message for Velero backup failure monitor"
+  type        = string
+  default     = ""
+}
+
+variable "velero_backup_failure_monitor_timeframe" {
+  description = "Monitor timeframe for Velero backup failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = string
+  default     = "last_1d"
+}
+
+variable "velero_backup_failure_enabled" {
+  description = "Flag to enable Velero backup failure monitor"
+  type        = string
+  default     = "true"
+}
+
+variable "velero_backup_failure_extra_tags" {
+  description = "Extra tags for Velero backup failure monitor"
+  type        = list(string)
+  default     = []
+}
+
+variable "velero_backup_failure_monitor_no_data_timeframe" {
+  description = "No data timeframe in minutes"
+  default     = 1440
+}
+
+variable "velero_backup_partial_failure_monitor_message" {
+  description = "Custom message for Velero backup partial failure monitor"
+  type        = string
+  default     = ""
+}
+
+variable "velero_backup_partial_failure_monitor_timeframe" {
+  description = "Monitor timeframe for Velero backup partial failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = string
+  default     = "last_1d"
+}
+
+variable "velero_backup_partial_failure_enabled" {
+  description = "Flag to enable Velero backup partial failure monitor"
+  type        = string
+  default     = "true"
+}
+
+variable "velero_backup_partial_failure_extra_tags" {
+  description = "Extra tags for Velero backup partial failure monitor"
+  type        = list(string)
+  default     = []
+}
+
+variable "velero_backup_partial_failure_monitor_no_data_timeframe" {
+  description = "No data timeframe in minutes"
+  default     = 1440
+}
+
+variable "velero_backup_deletion_failure_monitor_message" {
+  description = "Custom message for Velero backup deletion failure monitor"
+  type        = string
+  default     = ""
+}
+
+variable "velero_backup_deletion_failure_monitor_timeframe" {
+  description = "Monitor timeframe for Velero backup deletion failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = string
+  default     = "last_1d"
+}
+
+variable "velero_backup_deletion_failure_enabled" {
+  description = "Flag to enable Velero backup deletion failure monitor"
+  type        = string
+  default     = "true"
+}
+
+variable "velero_backup_deletion_failure_extra_tags" {
+  description = "Extra tags for Velero backup deletion failure monitor"
+  type        = list(string)
+  default     = []
+}
+
+variable "velero_backup_deletion_failure_monitor_no_data_timeframe" {
+  description = "No data timeframe in minutes"
+  default     = 1440
+}
+
+variable "velero_volume_snapshot_failure_monitor_message" {
+  description = "Custom message for Velero volume snapshot failure monitor"
+  type        = string
+  default     = ""
+}
+
+variable "velero_volume_snapshot_failure_monitor_timeframe" {
+  description = "Monitor timeframe for Velero volume snapshot failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = string
+  default     = "last_1d"
+}
+
+variable "velero_volume_snapshot_failure_enabled" {
+  description = "Flag to enable Velero volume snapshot failure monitor"
+  type        = string
+  default     = "true"
+}
+
+variable "velero_volume_snapshot_failure_extra_tags" {
+  description = "Extra tags for Velero volume snapshot failure monitor"
+  type        = list(string)
+  default     = []
+}
+
+variable "velero_volume_snapshot_failure_monitor_no_data_timeframe" {
+  description = "No data timeframe in minutes"
+  default     = 1440
+}
diff --git a/caas/kubernetes/velero/modules.tf b/caas/kubernetes/velero/modules.tf
new file mode 100644
index 0000000..106f227
--- /dev/null
+++ b/caas/kubernetes/velero/modules.tf
@@ -0,0 +1,19 @@
+module "filter-tags" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "velero"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+}
+
+module "filter-tags-scheduled-backup" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "velero"
+  filter_tags_use_defaults    = var.filter_tags_scheduled_backup_use_defaults != null ? var.filter_tags_scheduled_backup_use_defaults : var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_scheduled_backup_custom != null ? var.filter_tags_scheduled_backup_custom : var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_scheduled_backup_custom_excluded != null ? var.filter_tags_scheduled_backup_custom_excluded : var.filter_tags_custom_excluded
+}
diff --git a/caas/kubernetes/velero/monitors-velero.tf b/caas/kubernetes/velero/monitors-velero.tf
new file mode 100644
index 0000000..b341ac5
--- /dev/null
+++ b/caas/kubernetes/velero/monitors-velero.tf
@@ -0,0 +1,169 @@
+resource "datadog_monitor" "velero_scheduled_backup_missing" {
+  count   = var.velero_scheduled_backup_missing_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Velero scheduled backup missing"
+  type    = "query alert"
+  message = coalesce(var.velero_scheduled_backup_missing_monitor_message, var.message)
+
+  query = <<EOQ
+    sum(${var.velero_scheduled_backup_missing_monitor_timeframe}):sum:velero.velero_backup_success_total${module.filter-tags-scheduled-backup.query_alert} by {cluster-name,schedule}.as_count() < 1
+EOQ
+
+  thresholds = {
+    critical = 1
+  }
+
+  evaluation_delay  = var.evaluation_delay
+  new_host_delay    = var.new_host_delay
+  no_data_timeframe = var.velero_scheduled_backup_missing_monitor_no_data_timeframe
+
+  notify_no_data      = var.notify_no_data
+  renotify_interval   = 0
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+
+  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_scheduled_backup_missing_extra_tags)
+
+  lifecycle {
+    ignore_changes = [silenced]
+  }
+}
+
+resource "datadog_monitor" "velero_backup_failure" {
+  count   = var.velero_backup_failure_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Velero backup failure"
+  type    = "query alert"
+  message = coalesce(var.velero_backup_failure_monitor_message, var.message)
+
+  query = <<EOQ
+    sum(${var.velero_backup_failure_monitor_timeframe}):min:velero.velero_backup_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1
+EOQ
+
+  thresholds = {
+    critical = 1
+    warning  = 0
+  }
+
+  evaluation_delay  = var.evaluation_delay
+  new_host_delay    = var.new_host_delay
+  no_data_timeframe = var.velero_backup_failure_monitor_no_data_timeframe
+
+  notify_no_data      = var.notify_no_data
+  renotify_interval   = 0
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+
+  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_failure_extra_tags)
+
+  lifecycle {
+    ignore_changes = [silenced]
+  }
+}
+
+resource "datadog_monitor" "velero_backup_partial_failure" {
+  count   = var.velero_backup_partial_failure_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Velero backup partial failure"
+  type    = "query alert"
+  message = coalesce(var.velero_backup_partial_failure_monitor_message, var.message)
+
+  query = <<EOQ
+    sum(${var.velero_backup_partial_failure_monitor_timeframe}):min:velero.velero_backup_partial_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1
+EOQ
+
+  thresholds = {
+    critical = 1
+    warning  = 0
+  }
+
+  evaluation_delay  = var.evaluation_delay
+  new_host_delay    = var.new_host_delay
+  no_data_timeframe = var.velero_backup_partial_failure_monitor_no_data_timeframe
+
+  notify_no_data      = var.notify_no_data
+  renotify_interval   = 0
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+
+  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_partial_failure_extra_tags)
+
+  lifecycle {
+    ignore_changes = [silenced]
+  }
+}
+
+resource "datadog_monitor" "velero_backup_deletion_failure" {
+  count   = var.velero_backup_deletion_failure_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Velero backup deletion failure"
+  type    = "query alert"
+  message = coalesce(var.velero_backup_deletion_failure_monitor_message, var.message)
+
+  query = <<EOQ
+    sum(${var.velero_backup_deletion_failure_monitor_timeframe}):min:velero.velero_backup_deletion_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1
+EOQ
+
+  thresholds = {
+    critical = 1
+    warning  = 0
+  }
+
+  evaluation_delay  = var.evaluation_delay
+  new_host_delay    = var.new_host_delay
+  no_data_timeframe = var.velero_backup_deletion_failure_monitor_no_data_timeframe
+
+  notify_no_data      = var.notify_no_data
+  renotify_interval   = 0
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+
+  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_deletion_failure_extra_tags)
+
+  lifecycle {
+    ignore_changes = [silenced]
+  }
+}
+
+resource "datadog_monitor" "velero_volume_snapshot_failure" {
+  count   = var.velero_volume_snapshot_failure_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Velero volume snapshot failure"
+  type    = "query alert"
+  message = coalesce(var.velero_volume_snapshot_failure_monitor_message, var.message)
+
+  query = <<EOQ
+    sum(${var.velero_volume_snapshot_failure_monitor_timeframe}):min:velero.velero_volume_snapshot_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1
+EOQ
+
+  thresholds = {
+    critical = 1
+    warning  = 0
+  }
+
+  evaluation_delay  = var.evaluation_delay
+  new_host_delay    = var.new_host_delay
+  no_data_timeframe = var.velero_volume_snapshot_failure_monitor_no_data_timeframe
+
+  notify_no_data      = var.notify_no_data
+  renotify_interval   = 0
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+
+  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_volume_snapshot_failure_extra_tags)
+
+  lifecycle {
+    ignore_changes = [silenced]
+  }
+}
+
diff --git a/caas/kubernetes/velero/outputs.tf b/caas/kubernetes/velero/outputs.tf
new file mode 100644
index 0000000..1534cc9
--- /dev/null
+++ b/caas/kubernetes/velero/outputs.tf
@@ -0,0 +1,24 @@
+output "velero_scheduled_backup_missing_id" {
+  description = "id for monitor velero_scheduled_backup_missing"
+  value       = datadog_monitor.velero_scheduled_backup_missing.*.id
+}
+
+output "velero_backup_failure_id" {
+  description = "id for monitor velero_backup_failure"
+  value       = datadog_monitor.velero_backup_failure.*.id
+}
+
+output "velero_backup_partial_failure_id" {
+  description = "id for monitor velero_backup_partial_failure"
+  value       = datadog_monitor.velero_backup_partial_failure.*.id
+}
+
+output "velero_backup_deletion_failure_id" {
+  description = "id for monitor velero_backup_deletion_failure"
+  value       = datadog_monitor.velero_backup_deletion_failure.*.id
+}
+
+output "velero_volume_snapshot_failure_id" {
+  description = "id for monitor velero_volume_snapshot_failure"
+  value       = datadog_monitor.velero_volume_snapshot_failure.*.id
+}

From 59d6872d35091373e2f4b31fa801d1d3133c4b7e Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Tue, 14 Jan 2020 16:23:43 +0100
Subject: [PATCH 2/9] MON-554 - Fix keep one notify no data parameter

---
 caas/kubernetes/velero/monitors-velero.tf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/caas/kubernetes/velero/monitors-velero.tf b/caas/kubernetes/velero/monitors-velero.tf
index b341ac5..ff5e952 100644
--- a/caas/kubernetes/velero/monitors-velero.tf
+++ b/caas/kubernetes/velero/monitors-velero.tf
@@ -50,7 +50,6 @@ EOQ
   new_host_delay    = var.new_host_delay
   no_data_timeframe = var.velero_backup_failure_monitor_no_data_timeframe
 
-  notify_no_data      = var.notify_no_data
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -84,7 +83,6 @@ EOQ
   new_host_delay    = var.new_host_delay
   no_data_timeframe = var.velero_backup_partial_failure_monitor_no_data_timeframe
 
-  notify_no_data      = var.notify_no_data
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -118,7 +116,6 @@ EOQ
   new_host_delay    = var.new_host_delay
   no_data_timeframe = var.velero_backup_deletion_failure_monitor_no_data_timeframe
 
-  notify_no_data      = var.notify_no_data
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -152,7 +149,6 @@ EOQ
   new_host_delay    = var.new_host_delay
   no_data_timeframe = var.velero_volume_snapshot_failure_monitor_no_data_timeframe
 
-  notify_no_data      = var.notify_no_data
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0

From ab8605fcccd6e53057e03eefd48b269e02499852 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Tue, 14 Jan 2020 16:48:20 +0100
Subject: [PATCH 3/9] MON-554 - Fix with auto_update script

---
 README.md                         |  1 +
 caas/kubernetes/velero/README.md  | 79 +++++++++++++++++++++++++++++++
 caas/kubernetes/velero/outputs.tf | 13 ++---
 3 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 caas/kubernetes/velero/README.md

diff --git a/README.md b/README.md
index c6cf645..9c77a72 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,7 @@ module "datadog-monitors-system-generic" {
 			- [vts](https://github.com/claranet/terraform-datadog-monitors/tree/master/caas/kubernetes/ingress/vts/)
 		- [node](https://github.com/claranet/terraform-datadog-monitors/tree/master/caas/kubernetes/node/)
 		- [pod](https://github.com/claranet/terraform-datadog-monitors/tree/master/caas/kubernetes/pod/)
+		- [velero](https://github.com/claranet/terraform-datadog-monitors/tree/master/caas/kubernetes/velero/)
 		- [workload](https://github.com/claranet/terraform-datadog-monitors/tree/master/caas/kubernetes/workload/)
 - [cloud](https://github.com/claranet/terraform-datadog-monitors/tree/master/cloud/)
 	- [aws](https://github.com/claranet/terraform-datadog-monitors/tree/master/cloud/aws/)
diff --git a/caas/kubernetes/velero/README.md b/caas/kubernetes/velero/README.md
new file mode 100644
index 0000000..e03451f
--- /dev/null
+++ b/caas/kubernetes/velero/README.md
@@ -0,0 +1,79 @@
+# CAAS KUBERNETES VELERO DataDog monitors
+
+## How to use this module
+
+```
+module "datadog-monitors-caas-kubernetes-velero" {
+  source = "claranet/monitors/datadog//caas/kubernetes/velero"
+  version = "{revision}"
+
+  environment = var.environment
+  message     = module.datadog-message-alerting.alerting-message
+}
+
+```
+
+## Purpose
+
+Creates DataDog monitors with the following checks:
+
+- Velero backup deletion failure
+- Velero backup failure
+- Velero backup partial failure
+- Velero scheduled backup missing
+- Velero volume snapshot failure
+
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|:----:|:-----:|:-----:|
+| environment | Architecture environment | string | n/a | yes |
+| evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
+| filter\_tags\_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `"*"` | no |
+| filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter_tags_use_defaults is false | string | `""` | no |
+| filter\_tags\_scheduled\_backup\_custom | Tags used for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false | string | `"null"` | no |
+| filter\_tags\_scheduled\_backup\_custom\_excluded | Tags excluded for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false | string | `"null"` | no |
+| filter\_tags\_scheduled\_backup\_use\_defaults | Use default filter tags scheduled backup convention | string | `"null"` | no |
+| filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no |
+| message | Message sent when a monitor is triggered | string | n/a | yes |
+| new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
+| notify\_no\_data | Will raise no data alert if set to true | string | `"true"` | no |
+| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
+| velero\_backup\_deletion\_failure\_enabled | Flag to enable Velero backup deletion failure monitor | string | `"true"` | no |
+| velero\_backup\_deletion\_failure\_extra\_tags | Extra tags for Velero backup deletion failure monitor | list(string) | `[]` | no |
+| velero\_backup\_deletion\_failure\_monitor\_message | Custom message for Velero backup deletion failure monitor | string | `""` | no |
+| velero\_backup\_deletion\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
+| velero\_backup\_deletion\_failure\_monitor\_timeframe | Monitor timeframe for Velero backup deletion failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
+| velero\_backup\_failure\_enabled | Flag to enable Velero backup failure monitor | string | `"true"` | no |
+| velero\_backup\_failure\_extra\_tags | Extra tags for Velero backup failure monitor | list(string) | `[]` | no |
+| velero\_backup\_failure\_monitor\_message | Custom message for Velero backup failure monitor | string | `""` | no |
+| velero\_backup\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
+| velero\_backup\_failure\_monitor\_timeframe | Monitor timeframe for Velero backup failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
+| velero\_backup\_partial\_failure\_enabled | Flag to enable Velero backup partial failure monitor | string | `"true"` | no |
+| velero\_backup\_partial\_failure\_extra\_tags | Extra tags for Velero backup partial failure monitor | list(string) | `[]` | no |
+| velero\_backup\_partial\_failure\_monitor\_message | Custom message for Velero backup partial failure monitor | string | `""` | no |
+| velero\_backup\_partial\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
+| velero\_backup\_partial\_failure\_monitor\_timeframe | Monitor timeframe for Velero backup partial failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
+| velero\_scheduled\_backup\_missing\_enabled | Flag to enable Velero scheduled backup missing monitor | string | `"true"` | no |
+| velero\_scheduled\_backup\_missing\_extra\_tags | Extra tags for Velero scheduled backup missing monitor | list(string) | `[]` | no |
+| velero\_scheduled\_backup\_missing\_monitor\_message | Custom message for Velero scheduled backup missing monitor | string | `""` | no |
+| velero\_scheduled\_backup\_missing\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
+| velero\_scheduled\_backup\_missing\_monitor\_timeframe | Monitor timeframe for Velero scheduled backup missing monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
+| velero\_volume\_snapshot\_failure\_enabled | Flag to enable Velero volume snapshot failure monitor | string | `"true"` | no |
+| velero\_volume\_snapshot\_failure\_extra\_tags | Extra tags for Velero volume snapshot failure monitor | list(string) | `[]` | no |
+| velero\_volume\_snapshot\_failure\_monitor\_message | Custom message for Velero volume snapshot failure monitor | string | `""` | no |
+| velero\_volume\_snapshot\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
+| velero\_volume\_snapshot\_failure\_monitor\_timeframe | Monitor timeframe for Velero volume snapshot failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| velero\_backup\_deletion\_failure\_id | id for monitor velero_backup_deletion_failure |
+| velero\_backup\_failure\_id | id for monitor velero_backup_failure |
+| velero\_backup\_partial\_failure\_id | id for monitor velero_backup_partial_failure |
+| velero\_scheduled\_backup\_missing\_id | id for monitor velero_scheduled_backup_missing |
+| velero\_volume\_snapshot\_failure\_id | id for monitor velero_volume_snapshot_failure |
+
+## Related documentation
+
diff --git a/caas/kubernetes/velero/outputs.tf b/caas/kubernetes/velero/outputs.tf
index 1534cc9..992a26b 100644
--- a/caas/kubernetes/velero/outputs.tf
+++ b/caas/kubernetes/velero/outputs.tf
@@ -1,6 +1,6 @@
-output "velero_scheduled_backup_missing_id" {
-  description = "id for monitor velero_scheduled_backup_missing"
-  value       = datadog_monitor.velero_scheduled_backup_missing.*.id
+output "velero_backup_deletion_failure_id" {
+  description = "id for monitor velero_backup_deletion_failure"
+  value       = datadog_monitor.velero_backup_deletion_failure.*.id
 }
 
 output "velero_backup_failure_id" {
@@ -13,12 +13,13 @@ output "velero_backup_partial_failure_id" {
   value       = datadog_monitor.velero_backup_partial_failure.*.id
 }
 
-output "velero_backup_deletion_failure_id" {
-  description = "id for monitor velero_backup_deletion_failure"
-  value       = datadog_monitor.velero_backup_deletion_failure.*.id
+output "velero_scheduled_backup_missing_id" {
+  description = "id for monitor velero_scheduled_backup_missing"
+  value       = datadog_monitor.velero_scheduled_backup_missing.*.id
 }
 
 output "velero_volume_snapshot_failure_id" {
   description = "id for monitor velero_volume_snapshot_failure"
   value       = datadog_monitor.velero_volume_snapshot_failure.*.id
 }
+

From fc43f1c2c25b5edc23560bb20b4acd7de7e39abf Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Wed, 15 Jan 2020 10:56:59 +0100
Subject: [PATCH 4/9] MON-554 - Remove unused no_data_timeframe parameter and
 change provider tag

---
 caas/kubernetes/velero/README.md          |  4 ---
 caas/kubernetes/velero/inputs.tf          | 20 -------------
 caas/kubernetes/velero/monitors-velero.tf | 34 +++++++++++------------
 3 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/caas/kubernetes/velero/README.md b/caas/kubernetes/velero/README.md
index e03451f..4e90fd8 100644
--- a/caas/kubernetes/velero/README.md
+++ b/caas/kubernetes/velero/README.md
@@ -42,17 +42,14 @@ Creates DataDog monitors with the following checks:
 | velero\_backup\_deletion\_failure\_enabled | Flag to enable Velero backup deletion failure monitor | string | `"true"` | no |
 | velero\_backup\_deletion\_failure\_extra\_tags | Extra tags for Velero backup deletion failure monitor | list(string) | `[]` | no |
 | velero\_backup\_deletion\_failure\_monitor\_message | Custom message for Velero backup deletion failure monitor | string | `""` | no |
-| velero\_backup\_deletion\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
 | velero\_backup\_deletion\_failure\_monitor\_timeframe | Monitor timeframe for Velero backup deletion failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
 | velero\_backup\_failure\_enabled | Flag to enable Velero backup failure monitor | string | `"true"` | no |
 | velero\_backup\_failure\_extra\_tags | Extra tags for Velero backup failure monitor | list(string) | `[]` | no |
 | velero\_backup\_failure\_monitor\_message | Custom message for Velero backup failure monitor | string | `""` | no |
-| velero\_backup\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
 | velero\_backup\_failure\_monitor\_timeframe | Monitor timeframe for Velero backup failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
 | velero\_backup\_partial\_failure\_enabled | Flag to enable Velero backup partial failure monitor | string | `"true"` | no |
 | velero\_backup\_partial\_failure\_extra\_tags | Extra tags for Velero backup partial failure monitor | list(string) | `[]` | no |
 | velero\_backup\_partial\_failure\_monitor\_message | Custom message for Velero backup partial failure monitor | string | `""` | no |
-| velero\_backup\_partial\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
 | velero\_backup\_partial\_failure\_monitor\_timeframe | Monitor timeframe for Velero backup partial failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
 | velero\_scheduled\_backup\_missing\_enabled | Flag to enable Velero scheduled backup missing monitor | string | `"true"` | no |
 | velero\_scheduled\_backup\_missing\_extra\_tags | Extra tags for Velero scheduled backup missing monitor | list(string) | `[]` | no |
@@ -62,7 +59,6 @@ Creates DataDog monitors with the following checks:
 | velero\_volume\_snapshot\_failure\_enabled | Flag to enable Velero volume snapshot failure monitor | string | `"true"` | no |
 | velero\_volume\_snapshot\_failure\_extra\_tags | Extra tags for Velero volume snapshot failure monitor | list(string) | `[]` | no |
 | velero\_volume\_snapshot\_failure\_monitor\_message | Custom message for Velero volume snapshot failure monitor | string | `""` | no |
-| velero\_volume\_snapshot\_failure\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
 | velero\_volume\_snapshot\_failure\_monitor\_timeframe | Monitor timeframe for Velero volume snapshot failure monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
 
 ## Outputs
diff --git a/caas/kubernetes/velero/inputs.tf b/caas/kubernetes/velero/inputs.tf
index 185744d..d2216cb 100644
--- a/caas/kubernetes/velero/inputs.tf
+++ b/caas/kubernetes/velero/inputs.tf
@@ -113,11 +113,6 @@ variable "velero_backup_failure_extra_tags" {
   default     = []
 }
 
-variable "velero_backup_failure_monitor_no_data_timeframe" {
-  description = "No data timeframe in minutes"
-  default     = 1440
-}
-
 variable "velero_backup_partial_failure_monitor_message" {
   description = "Custom message for Velero backup partial failure monitor"
   type        = string
@@ -142,11 +137,6 @@ variable "velero_backup_partial_failure_extra_tags" {
   default     = []
 }
 
-variable "velero_backup_partial_failure_monitor_no_data_timeframe" {
-  description = "No data timeframe in minutes"
-  default     = 1440
-}
-
 variable "velero_backup_deletion_failure_monitor_message" {
   description = "Custom message for Velero backup deletion failure monitor"
   type        = string
@@ -171,11 +161,6 @@ variable "velero_backup_deletion_failure_extra_tags" {
   default     = []
 }
 
-variable "velero_backup_deletion_failure_monitor_no_data_timeframe" {
-  description = "No data timeframe in minutes"
-  default     = 1440
-}
-
 variable "velero_volume_snapshot_failure_monitor_message" {
   description = "Custom message for Velero volume snapshot failure monitor"
   type        = string
@@ -199,8 +184,3 @@ variable "velero_volume_snapshot_failure_extra_tags" {
   type        = list(string)
   default     = []
 }
-
-variable "velero_volume_snapshot_failure_monitor_no_data_timeframe" {
-  description = "No data timeframe in minutes"
-  default     = 1440
-}
diff --git a/caas/kubernetes/velero/monitors-velero.tf b/caas/kubernetes/velero/monitors-velero.tf
index ff5e952..9617720 100644
--- a/caas/kubernetes/velero/monitors-velero.tf
+++ b/caas/kubernetes/velero/monitors-velero.tf
@@ -24,7 +24,7 @@ EOQ
   locked              = false
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_scheduled_backup_missing_extra_tags)
+  tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_scheduled_backup_missing_extra_tags)
 
   lifecycle {
     ignore_changes = [silenced]
@@ -46,10 +46,10 @@ EOQ
     warning  = 0
   }
 
-  evaluation_delay  = var.evaluation_delay
-  new_host_delay    = var.new_host_delay
-  no_data_timeframe = var.velero_backup_failure_monitor_no_data_timeframe
+  evaluation_delay = var.evaluation_delay
+  new_host_delay   = var.new_host_delay
 
+  notify_no_data      = false
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -57,7 +57,7 @@ EOQ
   locked              = false
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_failure_extra_tags)
+  tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_failure_extra_tags)
 
   lifecycle {
     ignore_changes = [silenced]
@@ -79,10 +79,10 @@ EOQ
     warning  = 0
   }
 
-  evaluation_delay  = var.evaluation_delay
-  new_host_delay    = var.new_host_delay
-  no_data_timeframe = var.velero_backup_partial_failure_monitor_no_data_timeframe
+  evaluation_delay = var.evaluation_delay
+  new_host_delay   = var.new_host_delay
 
+  notify_no_data      = false
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -90,7 +90,7 @@ EOQ
   locked              = false
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_partial_failure_extra_tags)
+  tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_partial_failure_extra_tags)
 
   lifecycle {
     ignore_changes = [silenced]
@@ -112,10 +112,10 @@ EOQ
     warning  = 0
   }
 
-  evaluation_delay  = var.evaluation_delay
-  new_host_delay    = var.new_host_delay
-  no_data_timeframe = var.velero_backup_deletion_failure_monitor_no_data_timeframe
+  evaluation_delay = var.evaluation_delay
+  new_host_delay   = var.new_host_delay
 
+  notify_no_data      = false
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -123,7 +123,7 @@ EOQ
   locked              = false
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_deletion_failure_extra_tags)
+  tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_deletion_failure_extra_tags)
 
   lifecycle {
     ignore_changes = [silenced]
@@ -145,10 +145,10 @@ EOQ
     warning  = 0
   }
 
-  evaluation_delay  = var.evaluation_delay
-  new_host_delay    = var.new_host_delay
-  no_data_timeframe = var.velero_volume_snapshot_failure_monitor_no_data_timeframe
+  evaluation_delay = var.evaluation_delay
+  new_host_delay   = var.new_host_delay
 
+  notify_no_data      = false
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
@@ -156,7 +156,7 @@ EOQ
   locked              = false
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:caas", "provider:prometheus", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_volume_snapshot_failure_extra_tags)
+  tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_volume_snapshot_failure_extra_tags)
 
   lifecycle {
     ignore_changes = [silenced]

From 4728cd41c1dea6136e0f21d0e1186606cb77fe32 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Wed, 15 Jan 2020 14:32:02 +0100
Subject: [PATCH 5/9] MON-554 - Simplify modules filter-tags

---
 caas/kubernetes/velero/README.md  |  3 ---
 caas/kubernetes/velero/inputs.tf  | 15 ---------------
 caas/kubernetes/velero/modules.tf |  7 ++++---
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/caas/kubernetes/velero/README.md b/caas/kubernetes/velero/README.md
index 4e90fd8..774ba4b 100644
--- a/caas/kubernetes/velero/README.md
+++ b/caas/kubernetes/velero/README.md
@@ -31,9 +31,6 @@ Creates DataDog monitors with the following checks:
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
 | filter\_tags\_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `"*"` | no |
 | filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter_tags_use_defaults is false | string | `""` | no |
-| filter\_tags\_scheduled\_backup\_custom | Tags used for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false | string | `"null"` | no |
-| filter\_tags\_scheduled\_backup\_custom\_excluded | Tags excluded for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false | string | `"null"` | no |
-| filter\_tags\_scheduled\_backup\_use\_defaults | Use default filter tags scheduled backup convention | string | `"null"` | no |
 | filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no |
 | message | Message sent when a monitor is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
diff --git a/caas/kubernetes/velero/inputs.tf b/caas/kubernetes/velero/inputs.tf
index d2216cb..2831b2e 100644
--- a/caas/kubernetes/velero/inputs.tf
+++ b/caas/kubernetes/velero/inputs.tf
@@ -19,21 +19,6 @@ variable "filter_tags_custom_excluded" {
   default     = ""
 }
 
-variable "filter_tags_scheduled_backup_use_defaults" {
-  description = "Use default filter tags scheduled backup convention"
-  default     = null
-}
-
-variable "filter_tags_scheduled_backup_custom" {
-  description = "Tags used for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false"
-  default     = null
-}
-
-variable "filter_tags_scheduled_backup_custom_excluded" {
-  description = "Tags excluded for scheduled backup custom filtering when filter_tags_scheduled_backup_use_defaults is false"
-  default     = null
-}
-
 variable "message" {
   description = "Message sent when a monitor is triggered"
 }
diff --git a/caas/kubernetes/velero/modules.tf b/caas/kubernetes/velero/modules.tf
index 106f227..c1cb2b3 100644
--- a/caas/kubernetes/velero/modules.tf
+++ b/caas/kubernetes/velero/modules.tf
@@ -13,7 +13,8 @@ module "filter-tags-scheduled-backup" {
 
   environment                 = var.environment
   resource                    = "velero"
-  filter_tags_use_defaults    = var.filter_tags_scheduled_backup_use_defaults != null ? var.filter_tags_scheduled_backup_use_defaults : var.filter_tags_use_defaults
-  filter_tags_custom          = var.filter_tags_scheduled_backup_custom != null ? var.filter_tags_scheduled_backup_custom : var.filter_tags_custom
-  filter_tags_custom_excluded = var.filter_tags_scheduled_backup_custom_excluded != null ? var.filter_tags_scheduled_backup_custom_excluded : var.filter_tags_custom_excluded
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags_excluded         = ["schedule:"]
 }

From cf0a70296bd0c891fe8cf0c8c1c80dd3aeb70397 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Wed, 15 Jan 2020 14:32:25 +0100
Subject: [PATCH 6/9] MON-554 - Add more information into README

---
 caas/kubernetes/velero/README.md | 62 ++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/caas/kubernetes/velero/README.md b/caas/kubernetes/velero/README.md
index 774ba4b..3647c01 100644
--- a/caas/kubernetes/velero/README.md
+++ b/caas/kubernetes/velero/README.md
@@ -70,3 +70,65 @@ Creates DataDog monitors with the following checks:
 
 ## Related documentation
 
+Documentation for Datadog prometheus intergration: https://docs.datadoghq.com/integrations/prometheus/
+Documentation for Datadog OpenMetrics integration: https://docs.datadoghq.com/integrations/openmetrics/
+Documentation for Datadog autodiscovery: https://docs.datadoghq.com/agent/autodiscovery/clusterchecks/
+
+### How to configure Datadog agent for these monitors ?
+You can configure Datadog agent by autodiscovery pod annotations or by configuration file.
+
+#### Configuration by autodiscovery pod annotations
+Add these annotations to Velero pods:
+
+```
+podAnnotations: {
+  "ad.datadoghq.com/velero.check_names": '["openmetrics"]',
+  "ad.datadoghq.com/velero.init_configs": '[{}]',
+  "ad.datadoghq.com/velero.instances": '[{"prometheus_url": "http://%%host%%:8085/metrics", "namespace": "velero", "metrics": ["velero*"]}]'
+}
+```
+
+#### Configuration by configuration file
+Example of `openmetrics.d/conf.yaml`:
+
+```
+init_config:
+
+instances:
+
+    ## @param prometheus_url - string - required
+    ## The URL where your application metrics are exposed by Prometheus.
+    #
+  - prometheus_url: http://velero.velero.svc.cluster.local:8085/metrics
+
+    ## @param namespace - string - required
+    ## The namespace to be prepended to all metrics.
+    #
+    namespace: "velero"
+
+    ## @param metrics - list of strings - required
+    ## List of metrics to be fetched from the prometheus endpoint, if there's a
+    ## value it'll be renamed. This list should contain at least one metric
+    #
+    metrics:
+      - velero*
+```
+
+### How to monitor multiple schedule witch have different frequencies ?
+
+If you have multiple Velero schedules with different frequencies, you must duplicate this module and disable common monitors in the others instance of module.
+
+```
+module "datadog-monitors-caas-kubernetes-velero" {
+  source = "claranet/monitors/datadog//caas/kubernetes/velero"
+  version = "{revision}"
+
+  environment = var.environment
+  message     = module.datadog-message-alerting.alerting-message
+
+  velero_backup_failure_enabled          = false
+  velero_backup_partial_failure_enabled  = false
+  velero_backup_deletion_failure_enabled = false
+  velero_volume_snapshot_failure_enabled = false
+}
+

From 082a1084b3be4229108e10f1fd2e366ce5aa5087 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Wed, 15 Jan 2020 15:51:14 +0100
Subject: [PATCH 7/9] MON-554 - Change require_full_window parameter to true

---
 caas/kubernetes/velero/monitors-velero.tf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/caas/kubernetes/velero/monitors-velero.tf b/caas/kubernetes/velero/monitors-velero.tf
index 9617720..9a4260c 100644
--- a/caas/kubernetes/velero/monitors-velero.tf
+++ b/caas/kubernetes/velero/monitors-velero.tf
@@ -22,7 +22,7 @@ EOQ
   timeout_h           = 0
   include_tags        = true
   locked              = false
-  require_full_window = false
+  require_full_window = true
 
   tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_scheduled_backup_missing_extra_tags)
 
@@ -55,7 +55,7 @@ EOQ
   timeout_h           = 0
   include_tags        = true
   locked              = false
-  require_full_window = false
+  require_full_window = true
 
   tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_failure_extra_tags)
 
@@ -88,7 +88,7 @@ EOQ
   timeout_h           = 0
   include_tags        = true
   locked              = false
-  require_full_window = false
+  require_full_window = true
 
   tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_partial_failure_extra_tags)
 
@@ -121,7 +121,7 @@ EOQ
   timeout_h           = 0
   include_tags        = true
   locked              = false
-  require_full_window = false
+  require_full_window = true
 
   tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_backup_deletion_failure_extra_tags)
 
@@ -154,7 +154,7 @@ EOQ
   timeout_h           = 0
   include_tags        = true
   locked              = false
-  require_full_window = false
+  require_full_window = true
 
   tags = concat(["env:${var.environment}", "type:caas", "provider:openmetrics", "resource:velero", "team:claranet", "created-by:terraform"], var.velero_volume_snapshot_failure_extra_tags)
 

From fc9510f34bbb61cc942c803f8914a9eb4a72b626 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Fri, 17 Jan 2020 15:58:13 +0100
Subject: [PATCH 8/9] MON-554 - Fix no data timeframe default value

---
 caas/kubernetes/velero/inputs.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caas/kubernetes/velero/inputs.tf b/caas/kubernetes/velero/inputs.tf
index 2831b2e..755cd6a 100644
--- a/caas/kubernetes/velero/inputs.tf
+++ b/caas/kubernetes/velero/inputs.tf
@@ -71,7 +71,7 @@ variable "velero_scheduled_backup_missing_extra_tags" {
 
 variable "velero_scheduled_backup_missing_monitor_no_data_timeframe" {
   description = "No data timeframe in minutes"
-  default     = 1440
+  default     = 2880
 }
 
 variable "velero_backup_failure_monitor_message" {

From 266b93381ed0e11ae561faa58c5511637b172858 Mon Sep 17 00:00:00 2001
From: Jean-Philippe LAINE <jean-philippe.laine@fr.clara.net>
Date: Fri, 17 Jan 2020 16:31:49 +0100
Subject: [PATCH 9/9] MON-554 - Fix with auto_update script

---
 caas/kubernetes/velero/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caas/kubernetes/velero/README.md b/caas/kubernetes/velero/README.md
index 3647c01..c638926 100644
--- a/caas/kubernetes/velero/README.md
+++ b/caas/kubernetes/velero/README.md
@@ -51,7 +51,7 @@ Creates DataDog monitors with the following checks:
 | velero\_scheduled\_backup\_missing\_enabled | Flag to enable Velero scheduled backup missing monitor | string | `"true"` | no |
 | velero\_scheduled\_backup\_missing\_extra\_tags | Extra tags for Velero scheduled backup missing monitor | list(string) | `[]` | no |
 | velero\_scheduled\_backup\_missing\_monitor\_message | Custom message for Velero scheduled backup missing monitor | string | `""` | no |
-| velero\_scheduled\_backup\_missing\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
+| velero\_scheduled\_backup\_missing\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"2880"` | no |
 | velero\_scheduled\_backup\_missing\_monitor\_timeframe | Monitor timeframe for Velero scheduled backup missing monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
 | velero\_volume\_snapshot\_failure\_enabled | Flag to enable Velero volume snapshot failure monitor | string | `"true"` | no |
 | velero\_volume\_snapshot\_failure\_extra\_tags | Extra tags for Velero volume snapshot failure monitor | list(string) | `[]` | no |