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

Merge branch 'MON-430-azure-app-service-instance-dimension' into 'master'

Browse Source 
MON-430 Add instance dimension to App Services monitors

Closes MON-430

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!34
This commit is contained in:
Quentin Manfroi 2019-04-16 11:08:10 +02:00
commit 62c2fa96a6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cloud/azure/app-services/monitors-app_services.tf
View File

@ -7,7 +7,7 @@ resource "datadog_monitor" "appservices_response_time" {
query = <<EOF query = <<EOF
${var.response_time_time_aggregator}(${var.response_time_timeframe}): ( ${var.response_time_time_aggregator}(${var.response_time_timeframe}): (
default(avg:azure.app_services.average_response_time${module.filter-tags.query_alert} by {resource_group,region,name}, 0) default(avg:azure.app_services.average_response_time${module.filter-tags.query_alert} by {resource_group,region,name,instance}, 0)
) > ${var.response_time_threshold_critical} ) > ${var.response_time_threshold_critical}
EOF EOF
@ -39,7 +39,7 @@ resource "datadog_monitor" "appservices_memory_usage_count" {
query = <<EOF query = <<EOF
${var.memory_usage_time_aggregator}(${var.memory_usage_timeframe}): ( ${var.memory_usage_time_aggregator}(${var.memory_usage_timeframe}): (
avg:azure.app_services.memory_working_set${module.filter-tags.query_alert} by {resource_group,region,name} avg:azure.app_services.memory_working_set${module.filter-tags.query_alert} by {resource_group,region,name,instance}
) > ${var.memory_usage_threshold_critical} ) > ${var.memory_usage_threshold_critical}
EOF EOF
@ -71,8 +71,8 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" {
query = <<EOF query = <<EOF
${var.http_5xx_requests_time_aggregator}(${var.http_5xx_requests_timeframe}): ( ${var.http_5xx_requests_time_aggregator}(${var.http_5xx_requests_timeframe}): (
default(avg:azure.app_services.http5xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) / default(avg:azure.app_services.http5xx${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 0) /
default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1) default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 1)
) * 100 > ${var.http_5xx_requests_threshold_critical} ) * 100 > ${var.http_5xx_requests_threshold_critical}
EOF EOF
@ -104,8 +104,8 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" {
query = <<EOF query = <<EOF
${var.http_4xx_requests_time_aggregator}(${var.http_4xx_requests_timeframe}): ( ${var.http_4xx_requests_time_aggregator}(${var.http_4xx_requests_timeframe}): (
default(avg:azure.app_services.http4xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) / default(avg:azure.app_services.http4xx${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 0) /
default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1) default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 1)
) * 100 > ${var.http_4xx_requests_threshold_critical} ) * 100 > ${var.http_4xx_requests_threshold_critical}
EOF EOF
@ -138,9 +138,9 @@ resource "datadog_monitor" "appservices_http_success_status_rate" {
query = <<EOF query = <<EOF
${var.http_successful_requests_time_aggregator}(${var.http_successful_requests_timeframe}): ${var.http_successful_requests_time_aggregator}(${var.http_successful_requests_timeframe}):
default( ( default( (
(default(avg:azure.app_services.http2xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) + (default(avg:azure.app_services.http2xx${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 0) +
default(avg:azure.app_services.http3xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) ) / default(avg:azure.app_services.http3xx${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 0) ) /
default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(), 0)
) * 100, 100) < ${var.http_successful_requests_threshold_critical} ) * 100, 100) < ${var.http_successful_requests_threshold_critical}
EOF EOF

4
cloud/azure/serverfarms/monitors-azure-serverfarms.tf
View File

@ -33,7 +33,7 @@ resource "datadog_monitor" "cpu_percentage" {
query = <<EOF query = <<EOF
${var.cpu_percentage_time_aggregator}(${var.cpu_percentage_timeframe}): ( ${var.cpu_percentage_time_aggregator}(${var.cpu_percentage_timeframe}): (
avg:azure.web_serverfarms.cpu_percentage${module.filter-tags.query_alert} by {resource_group,region,name} avg:azure.web_serverfarms.cpu_percentage${module.filter-tags.query_alert} by {resource_group,region,name,instance}
) > ${var.cpu_percentage_threshold_critical} ) > ${var.cpu_percentage_threshold_critical}
EOF EOF
@ -66,7 +66,7 @@ resource "datadog_monitor" "memory_percentage" {
query = <<EOF query = <<EOF
${var.memory_percentage_time_aggregator}(${var.memory_percentage_timeframe}): ( ${var.memory_percentage_time_aggregator}(${var.memory_percentage_timeframe}): (
avg:azure.web_serverfarms.memory_percentage${module.filter-tags.query_alert} by {resource_group,region,name} avg:azure.web_serverfarms.memory_percentage${module.filter-tags.query_alert} by {resource_group,region,name,instance}
) > ${var.memory_percentage_threshold_critical} ) > ${var.memory_percentage_threshold_critical}
EOF EOF