From fc43f1c2c25b5edc23560bb20b4acd7de7e39abf Mon Sep 17 00:00:00 2001 From: Jean-Philippe LAINE Date: Wed, 15 Jan 2020 10:56:59 +0100 Subject: [PATCH] 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]