MON-554 - Simplify modules filter-tags

This commit is contained in:
Jean-Philippe LAINE 2020-01-15 14:32:02 +01:00
parent fc43f1c2c2
commit 4728cd41c1
3 changed files with 4 additions and 21 deletions

View File

@ -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 |

View File

@ -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"
}

View File

@ -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:"]
}