wbyc/terraform-datadog-old-monitors
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MON-530_Fix_RDS_replica_lag_monitors_name' into 'master'

Browse Source 
MON-530: Fix monitor name (use ms instead of %)

Closes MON-530

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!138
This commit is contained in:
Quentin Manfroi 2019-11-14 17:49:04 +01:00
commit 6de25c6ce8
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf
View File

@ -1,7 +1,7 @@
### RDS Aurora Mysql Replica Lag monitor ### ### RDS Aurora Mysql Replica Lag monitor ###
resource "datadog_monitor" "rds_aurora_mysql_replica_lag" { resource "datadog_monitor" "rds_aurora_mysql_replica_lag" {
count = var.aurora_replicalag_enabled == "true" ? 1 : 0 count = var.aurora_replicalag_enabled == "true" ? 1 : 0
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora Mysql replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}%){{/is_warning}}" name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora Mysql replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}ms){{/is_warning}}"
message = coalesce(var.aurora_replicalag_message, var.message) message = coalesce(var.aurora_replicalag_message, var.message)
type = "query alert" type = "query alert"
@ -31,4 +31,3 @@ EOQ
ignore_changes = ["silenced"] ignore_changes = ["silenced"]
} }
} }

3
cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf
View File

@ -1,7 +1,7 @@
### RDS Aurora Postgresql Replica Lag monitor ### ### RDS Aurora Postgresql Replica Lag monitor ###
resource "datadog_monitor" "rds_aurora_postgresql_replica_lag" { resource "datadog_monitor" "rds_aurora_postgresql_replica_lag" {
count = var.aurora_replicalag_enabled == "true" ? 1 : 0 count = var.aurora_replicalag_enabled == "true" ? 1 : 0
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora PostgreSQL replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}%){{/is_warning}}" name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora PostgreSQL replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}ms){{/is_warning}}"
message = coalesce(var.aurora_replicalag_message, var.message) message = coalesce(var.aurora_replicalag_message, var.message)
type = "query alert" type = "query alert"
@ -31,4 +31,3 @@ EOQ
ignore_changes = ["silenced"] ignore_changes = ["silenced"]
} }
} }

3
cloud/aws/rds/common/monitors-rds-common.tf
View File

@ -70,7 +70,7 @@ EOQ
### RDS Replica Lag monitor ### ### RDS Replica Lag monitor ###
resource "datadog_monitor" "rds_replica_lag" { resource "datadog_monitor" "rds_replica_lag" {
count = var.replicalag_enabled == "true" ? 1 : 0 count = var.replicalag_enabled == "true" ? 1 : 0
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}%){{/is_warning}}" name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}ms){{/is_warning}}"
message = coalesce(var.replicalag_message, var.message) message = coalesce(var.replicalag_message, var.message)
type = "query alert" type = "query alert"
@ -100,4 +100,3 @@ EOQ
ignore_changes = ["silenced"] ignore_changes = ["silenced"]
} }
} }