Merge branch 'MON-330-fix-grouping-and-counter-on-azur' into 'master'

Resolve MON-330 "Fix grouping and counter on azur"

Closes MON-330

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!36
This commit is contained in:
Quentin Manfroi 2019-04-16 11:08:54 +02:00
commit 6cb4de6e34

View File

@ -64,8 +64,8 @@ resource "datadog_monitor" "service_bus_user_errors" {
query = <<EOF query = <<EOF
${var.user_errors_time_aggregator}(${var.user_errors_timeframe}): ( ${var.user_errors_time_aggregator}(${var.user_errors_timeframe}): (
default(avg:azure.servicebus_namespaces.user_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) / default(avg:azure.servicebus_namespaces.user_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name,entityname}, 0) /
default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1) default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name,entityname}, 1)
) * 100 > ${var.user_errors_threshold_critical} ) * 100 > ${var.user_errors_threshold_critical}
EOF EOF
@ -99,8 +99,8 @@ resource "datadog_monitor" "service_bus_server_errors" {
query = <<EOF query = <<EOF
${var.server_errors_time_aggregator}(${var.server_errors_timeframe}): ( ${var.server_errors_time_aggregator}(${var.server_errors_timeframe}): (
default(avg:azure.servicebus_namespaces.server_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) / default(avg:azure.servicebus_namespaces.server_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name,entityname}, 0) /
default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1) default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name,entityname}, 1)
) * 100 > ${var.server_errors_threshold_critical} ) * 100 > ${var.server_errors_threshold_critical}
EOF EOF