diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md index de2486a..d7ec1d5 100644 --- a/caas/kubernetes/ark/README.md +++ b/caas/kubernetes/ark/README.md @@ -35,6 +35,7 @@ Creates DataDog monitors with the following checks: | 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 | +| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | ## Outputs diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf index c3c0af8..e390964 100644 --- a/caas/kubernetes/ark/inputs.tf +++ b/caas/kubernetes/ark/inputs.tf @@ -33,6 +33,11 @@ variable "new_host_delay" { default = 300 } +variable "prefix_slug" { + description = "Prefix string to prepend between brackets on every monitors names" + default = "" +} + # Datadog monitors variables variable "ark_schedules_monitor_message" { diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf index a0279f3..38f30bd 100644 --- a/caas/kubernetes/ark/monitors-ark.tf +++ b/caas/kubernetes/ark/monitors-ark.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "ark_schedules_monitor" { count = "${var.ark_schedules_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] Ark backup failed" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Ark backup failed" type = "metric alert" message = "${coalesce(var.ark_schedules_monitor_message, var.message)}" diff --git a/caas/kubernetes/cluster/README.md b/caas/kubernetes/cluster/README.md index a095cdb..465dfca 100644 --- a/caas/kubernetes/cluster/README.md +++ b/caas/kubernetes/cluster/README.md @@ -34,6 +34,7 @@ Creates DataDog monitors with the following checks: | 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 | +| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | ## Outputs diff --git a/caas/kubernetes/cluster/inputs.tf b/caas/kubernetes/cluster/inputs.tf index 82bc78d..ee2e84e 100644 --- a/caas/kubernetes/cluster/inputs.tf +++ b/caas/kubernetes/cluster/inputs.tf @@ -33,6 +33,11 @@ variable "new_host_delay" { default = 300 } +variable "prefix_slug" { + description = "Prefix string to prepend between brackets on every monitors names" + default = "" +} + # Datadog monitors variables variable "apiserver_silenced" { diff --git a/caas/kubernetes/cluster/monitors-k8s-cluster.tf b/caas/kubernetes/cluster/monitors-k8s-cluster.tf index 4450a86..6f8a55c 100644 --- a/caas/kubernetes/cluster/monitors-k8s-cluster.tf +++ b/caas/kubernetes/cluster/monitors-k8s-cluster.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "apiserver" { count = "${var.apiserver_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] Kubernetes API server does not respond" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes API server does not respond" message = "${coalesce(var.apiserver_message, var.message)}" type = "service check" diff --git a/caas/kubernetes/ingress/vts/README.md b/caas/kubernetes/ingress/vts/README.md index 5dd91a4..65ac6fa 100644 --- a/caas/kubernetes/ingress/vts/README.md +++ b/caas/kubernetes/ingress/vts/README.md @@ -47,6 +47,7 @@ Creates DataDog monitors with the following checks: | ingress\_5xx\_timeframe | Monitor timeframe for Ingress 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no | | message | Message sent when an alert is triggered | string | n/a | yes | | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no | +| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | ## Outputs diff --git a/caas/kubernetes/ingress/vts/inputs.tf b/caas/kubernetes/ingress/vts/inputs.tf index b6652ce..f3de8ba 100644 --- a/caas/kubernetes/ingress/vts/inputs.tf +++ b/caas/kubernetes/ingress/vts/inputs.tf @@ -15,6 +15,11 @@ variable "new_host_delay" { default = 300 } +variable "prefix_slug" { + description = "Prefix string to prepend between brackets on every monitors names" + default = "" +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/caas/kubernetes/ingress/vts/monitors-ingress.tf b/caas/kubernetes/ingress/vts/monitors-ingress.tf index e170360..b5d944b 100644 --- a/caas/kubernetes/ingress/vts/monitors-ingress.tf +++ b/caas/kubernetes/ingress/vts/monitors-ingress.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "nginx_ingress_too_many_5xx" { count = "${var.ingress_5xx_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] Nginx Ingress 5xx errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Nginx Ingress 5xx errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" message = "${coalesce(var.ingress_5xx_message, var.message)}" query = <=". No alert was triggered without that. */ resource "datadog_monitor" "es_cluster_status" { count = "${var.es_cluster_status_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] ElasticSearch cluster status is not green" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ElasticSearch cluster status is not green" message = "${coalesce(var.es_cluster_status_message, var.message)}" type = "metric alert" @@ -40,7 +40,7 @@ resource "datadog_monitor" "es_cluster_status" { ### Elasticsearch cluster free storage space monitor ### resource "datadog_monitor" "es_free_space_low" { count = "${var.diskspace_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] ElasticSearch cluster free storage space {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ElasticSearch cluster free storage space {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" message = "${coalesce(var.diskspace_message, var.message)}" type = "metric alert" @@ -75,7 +75,7 @@ resource "datadog_monitor" "es_free_space_low" { ### Elasticsearch cluster CPU monitor ### resource "datadog_monitor" "es_cpu_90_15min" { count = "${var.cpu_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] ElasticSearch cluster CPU high {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ElasticSearch cluster CPU high {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" message = "${coalesce(var.cpu_message, var.message)}" type = "metric alert" diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md index 6774b3d..eba6782 100644 --- a/cloud/aws/elb/README.md +++ b/cloud/aws/elb/README.md @@ -77,6 +77,7 @@ Creates DataDog monitors with the following checks: | filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no | | message | Message sent when an alert is triggered | string | n/a | yes | | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no | +| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | ## Outputs diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf index 5b8a181..6efb0cf 100644 --- a/cloud/aws/elb/inputs.tf +++ b/cloud/aws/elb/inputs.tf @@ -15,6 +15,11 @@ variable "new_host_delay" { default = 300 } +variable "prefix_slug" { + description = "Prefix string to prepend between brackets on every monitors names" + default = "" +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf index 0b84d42..119dbc1 100644 --- a/cloud/aws/elb/monitors-elb.tf +++ b/cloud/aws/elb/monitors-elb.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "ELB_no_healthy_instances" { count = "${var.elb_no_healthy_instance_enabled == "true" ? 1 : 0}" - name = "[${var.environment}] ELB healthy instances {{#is_alert}}is at 0{{/is_alert}}{{#is_warning}}is at {{value}}%{{/is_warning}}" + name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ELB healthy instances {{#is_alert}}is at 0{{/is_alert}}{{#is_warning}}is at {{value}}%{{/is_warning}}" message = "${coalesce(var.elb_no_healthy_instance_message, var.message)}" query = <