MON-386 change space aggregator for sum and fix default function

This commit is contained in:
Quentin Manfroi 2019-01-22 13:22:45 +01:00
parent 74e0f804b7
commit a46abb4a68

View File

@ -4,12 +4,10 @@ resource "datadog_monitor" "nginx_ingress_too_many_5xx" {
message = "${coalesce(var.ingress_5xx_message, var.message)}" message = "${coalesce(var.ingress_5xx_message, var.message)}"
query = <<EOF query = <<EOF
${var.ingress_5xx_time_aggregator}(${var.ingress_5xx_timeframe}): ${var.ingress_5xx_time_aggregator}(${var.ingress_5xx_timeframe}): default(
(default(avg:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-5xx.query_alert} by {upstream,ingress_class}.as_rate(), 0)) sum:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-5xx.query_alert} by {upstream,ingress_class}.as_rate() /
/ (sum:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count})
(default(avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count}, 1)) * 100, 0) > ${var.ingress_5xx_threshold_critical}
* 100
> ${var.ingress_5xx_threshold_critical}
EOF EOF
type = "metric alert" type = "metric alert"
@ -40,12 +38,10 @@ resource "datadog_monitor" "nginx_ingress_too_many_4xx" {
message = "${coalesce(var.ingress_4xx_message, var.message)}" message = "${coalesce(var.ingress_4xx_message, var.message)}"
query = <<EOF query = <<EOF
${var.ingress_4xx_time_aggregator}(${var.ingress_4xx_timeframe}): ${var.ingress_4xx_time_aggregator}(${var.ingress_4xx_timeframe}): default(
(default(avg:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-4xx.query_alert} by {upstream,ingress_class}.as_rate(), 0)) sum:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-4xx.query_alert} by {upstream,ingress_class}.as_rate() /
/ (sum:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count})
(default(avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count}, 1)) * 100, 0) > ${var.ingress_4xx_threshold_critical}
* 100
> ${var.ingress_4xx_threshold_critical}
EOF EOF
type = "metric alert" type = "metric alert"