MON-248 new tag convention and extra tag and disable feature

This commit is contained in:
Quentin Manfroi 2018-08-30 18:10:34 +02:00
parent cf09393abb
commit 0433c7dabc
2 changed files with 14 additions and 9 deletions

View File

@ -41,6 +41,18 @@ variable "ingress_5xx_silenced" {
default = {} default = {}
} }
variable "ingress_5xx_enabled" {
description = "Flag to enable Ingress 5xx errors monitor"
type = "string"
default = "true"
}
variable "ingress_5xx_extra_tags" {
description = "Extra tags for Ingress 5xx errors monitor"
type = "list"
default = []
}
variable "ingress_5xx_message" { variable "ingress_5xx_message" {
description = "Message sent when an alert is triggered" description = "Message sent when an alert is triggered"
default = "" default = ""

View File

@ -1,12 +1,5 @@
data "template_file" "filter" {
template = "$${filter}"
vars {
filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_k8s_ingress:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
}
}
resource "datadog_monitor" "Nginx_ingress_too_many_5xx" { resource "datadog_monitor" "Nginx_ingress_too_many_5xx" {
count = "${var.ingress_5xx_enabled ? 1 : 0}"
name = "[${var.environment}] [${var.team}] Nginx Ingress 5xx errors too high for {{ingress_class.name}} on {{upstream.name}} {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" name = "[${var.environment}] [${var.team}] Nginx Ingress 5xx errors too high for {{ingress_class.name}} on {{upstream.name}} {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
message = "${coalesce(var.ingress_5xx_message, var.message)}" message = "${coalesce(var.ingress_5xx_message, var.message)}"
@ -38,5 +31,5 @@ resource "datadog_monitor" "Nginx_ingress_too_many_5xx" {
silenced = "${var.ingress_5xx_silenced}" silenced = "${var.ingress_5xx_silenced}"
tags = ["env:${var.environment}", "resource:ingress", "team:${var.team}", "provider:k8s"] tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:nginx-ingress-controller", "team:claranet", "created-by:terraform", "${var.ingress_5xx_extra_tags}"]
} }