From cbfeef8abd7501081b5678a8aa8a0f4eb2e04e02 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 16 Aug 2018 17:09:27 +0200 Subject: [PATCH] MON-159 split evaluation and new host delay into 2 separate variables --- cloud/aws/alb/README.md | 3 +- cloud/aws/alb/inputs.tf | 7 ++- cloud/aws/alb/monitors-alb.tf | 24 ++++---- cloud/aws/apigateway/README.md | 3 +- cloud/aws/apigateway/inputs.tf | 7 ++- cloud/aws/apigateway/monitors-api.tf | 12 ++-- cloud/aws/elasticsearch/README.md | 3 +- cloud/aws/elasticsearch/inputs.tf | 7 ++- .../elasticsearch/monitors-elasticsearch.tf | 12 ++-- cloud/aws/elb/README.md | 3 +- cloud/aws/elb/inputs.tf | 7 ++- cloud/aws/elb/monitors-elb.tf | 24 ++++---- cloud/aws/kinesis-firehose/README.md | 3 +- cloud/aws/kinesis-firehose/inputs.tf | 7 ++- .../monitors-kinesis-firehose.tf | 4 +- cloud/aws/rds/README.md | 3 +- cloud/aws/rds/inputs.tf | 7 ++- cloud/aws/rds/monitors-rds.tf | 8 +-- cloud/aws/vpn/README.md | 3 +- cloud/aws/vpn/inputs.tf | 7 ++- cloud/aws/vpn/monitors-vpn.tf | 4 +- cloud/azure/apimanagement/README.md | 3 +- cloud/azure/apimanagement/inputs.tf | 7 ++- .../monitors-azure-apimanagement.tf | 20 +++---- cloud/azure/app-services/README.md | 3 +- cloud/azure/app-services/inputs.tf | 7 ++- .../app-services/monitors-app_services.tf | 20 +++---- cloud/azure/eventhub/README.md | 3 +- cloud/azure/eventhub/inputs.tf | 7 ++- cloud/azure/eventhub/monitors-eventhub.tf | 12 ++-- cloud/azure/iothubs/README.md | 3 +- cloud/azure/iothubs/inputs.tf | 7 ++- cloud/azure/iothubs/monitors-iothubs.tf | 56 +++++++++---------- cloud/azure/redis/README.md | 3 +- cloud/azure/redis/inputs.tf | 7 ++- cloud/azure/redis/monitors-azure-redis.tf | 16 +++--- cloud/azure/servicebus/README.md | 3 +- cloud/azure/servicebus/inputs.tf | 7 ++- .../azure/servicebus/monitors-service-bus.tf | 4 +- cloud/azure/sql-database/README.md | 3 +- cloud/azure/sql-database/inputs.tf | 7 ++- .../monitors-sql-database-basics.tf | 16 +++--- cloud/azure/storage/README.md | 3 +- cloud/azure/storage/inputs.tf | 7 ++- cloud/azure/storage/monitors-azure-storage.tf | 36 ++++++------ cloud/azure/stream-analytics/README.md | 3 +- cloud/azure/stream-analytics/inputs.tf | 7 ++- .../monitors-stream-analytics.tf | 20 +++---- databases/mongodb/README.md | 3 +- databases/mongodb/inputs.tf | 7 ++- databases/mongodb/monitors-mongo.tf | 16 +++--- middleware/apache/README.md | 3 +- middleware/apache/inputs.tf | 7 ++- middleware/apache/monitors-apache.tf | 2 +- middleware/nginx/README.md | 3 +- middleware/nginx/inputs.tf | 7 ++- middleware/nginx/monitors-nginx.tf | 2 +- middleware/php-fpm/README.md | 3 +- middleware/php-fpm/inputs.tf | 7 ++- middleware/php-fpm/monitors-fpm.tf | 6 +- system/generic/README.md | 3 +- system/generic/inputs.tf | 7 ++- system/generic/monitors-system.tf | 20 +++---- 63 files changed, 335 insertions(+), 209 deletions(-) diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md index 8c7eca9..cfee6da 100644 --- a/cloud/aws/alb/README.md +++ b/cloud/aws/alb/README.md @@ -32,8 +32,8 @@ Creates DataDog monitors with the following checks: | alb_no_healthy_instances_time_aggregator | Monitor aggregator for ALB no healthy instances [available values: min, max or avg] | string | `min` | no | | alb_no_healthy_instances_timeframe | Monitor timeframe for ALB no healthy instances [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | artificial_requests_count | Number of false requests used to mitigate false positive in case of low trafic | string | `5` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | httpcode_alb_4xx_message | Custom message for ALB httpcode 4xx monitor | string | `` | no | @@ -63,6 +63,7 @@ Creates DataDog monitors with the following checks: | latency_time_aggregator | Monitor aggregator for ALB latency [available values: min, max or avg] | string | `min` | no | | latency_timeframe | Monitor timeframe for ALB latency [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 a monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf index 07cb8b3..5c8a964 100644 --- a/cloud/aws/alb/inputs.tf +++ b/cloud/aws/alb/inputs.tf @@ -19,11 +19,16 @@ variable "message" { description = "Message sent when a monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + # Datadog monitors variables variable "alb_no_healthy_instances_silenced" { diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf index 2791d76..32d7769 100644 --- a/cloud/aws/alb/monitors-alb.tf +++ b/cloud/aws/alb/monitors-alb.tf @@ -9,8 +9,8 @@ resource "datadog_monitor" "ALB_no_healthy_instances" { ) < 1 EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { critical = 1 @@ -38,8 +38,8 @@ resource "datadog_monitor" "ALB_latency" { ) > ${var.latency_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { critical = "${var.latency_threshold_critical}" @@ -71,8 +71,8 @@ resource "datadog_monitor" "ALB_httpcode_5xx" { ) > ${var.httpcode_alb_5xx_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { critical = "${var.httpcode_alb_5xx_threshold_critical}" @@ -104,8 +104,8 @@ resource "datadog_monitor" "ALB_httpcode_4xx" { ) > ${var.httpcode_alb_4xx_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { critical = "${var.httpcode_alb_4xx_threshold_critical}" @@ -137,8 +137,8 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" { ) > ${var.httpcode_target_5xx_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { critical = "${var.httpcode_target_5xx_threshold_critical}" @@ -170,8 +170,8 @@ resource "datadog_monitor" "ALB_httpcode_target_4xx" { ) > ${var.httpcode_target_4xx_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { critical = "${var.httpcode_target_4xx_threshold_critical}" diff --git a/cloud/aws/apigateway/README.md b/cloud/aws/apigateway/README.md index a8b462d..f21c281 100644 --- a/cloud/aws/apigateway/README.md +++ b/cloud/aws/apigateway/README.md @@ -25,8 +25,8 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| | artificial_requests_count | Number of false requests used to mitigate false positive in case of low trafic | string | `5` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags | Tags used for filtering | string | `*` | no | | http_4xx_requests_message | Custom message for API Gateway HTTP 4xx requests monitor | string | `` | no | | http_4xx_requests_silenced | Groups to mute for API Gateway HTTP 4xx requests monitor | map | `` | no | @@ -45,6 +45,7 @@ Creates DataDog monitors with the following checks: | latency_time_aggregator | Monitor aggregator for API Gateway latency [available values: min, max or avg] | string | `min` | no | | latency_timeframe | Monitor timeframe for API latency [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 a monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/aws/apigateway/inputs.tf b/cloud/aws/apigateway/inputs.tf index 1430ab5..917490c 100644 --- a/cloud/aws/apigateway/inputs.tf +++ b/cloud/aws/apigateway/inputs.tf @@ -12,11 +12,16 @@ variable "message" { description = "Message sent when a monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + ################################### ### LATENCY VARIABLES ### ################################### diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf index b6bee79..f937691 100644 --- a/cloud/aws/apigateway/monitors-api.tf +++ b/cloud/aws/apigateway/monitors-api.tf @@ -10,8 +10,8 @@ resource "datadog_monitor" "API_Gateway_latency" { ) > ${var.latency_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.latency_threshold_warning}" @@ -44,8 +44,8 @@ resource "datadog_monitor" "API_http_5xx_errors_count" { ) > ${var.http_5xx_requests_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.http_5xx_requests_threshold_warning}" @@ -78,8 +78,8 @@ resource "datadog_monitor" "API_http_4xx_errors_count" { ) > ${var.http_4xx_requests_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.http_4xx_requests_threshold_warning}" diff --git a/cloud/aws/elasticsearch/README.md b/cloud/aws/elasticsearch/README.md index 50e6370..91dfd71 100644 --- a/cloud/aws/elasticsearch/README.md +++ b/cloud/aws/elasticsearch/README.md @@ -30,7 +30,6 @@ Creates DataDog monitors with the following checks: | cpu_threshold_warning | CPU usage in percent (warning threshold) | string | `80` | no | | cpu_time_aggregator | Monitor aggregator for ES cluster cpu [available values: min, max or avg] | string | `min` | no | | cpu_timeframe | Monitor timeframe for ES cluster cpu [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | diskspace_message | Custom message for ES cluster diskspace monitor | string | `` | no | | diskspace_silenced | Groups to mute for ES cluster diskspace monitor | map | `` | no | | diskspace_threshold_critical | Disk free space in percent (critical threshold) | string | `10` | no | @@ -42,9 +41,11 @@ Creates DataDog monitors with the following checks: | es_cluster_status_silenced | Groups to mute for ES cluster status monitor | map | `` | no | | es_cluster_status_timeframe | Monitor timeframe for ES cluster status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_30m` | no | | es_cluster_volume_size | ElasticSearch Domain volume size (in GB) | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/aws/elasticsearch/inputs.tf b/cloud/aws/elasticsearch/inputs.tf index 6f56332..822ad14 100644 --- a/cloud/aws/elasticsearch/inputs.tf +++ b/cloud/aws/elasticsearch/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf index b960e3f..614886b 100644 --- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf +++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf @@ -22,14 +22,14 @@ EOF } notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.es_cluster_status_silenced}" @@ -56,14 +56,14 @@ EOF } notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.diskspace_silenced}" @@ -89,14 +89,14 @@ EOF } notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.cpu_silenced}" diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md index 67957de..883ea99 100644 --- a/cloud/aws/elb/README.md +++ b/cloud/aws/elb/README.md @@ -28,7 +28,6 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| | artificial_requests_count | Number of false requests used to mitigate false positive in case of low trafic | string | `5` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | elb_4xx_message | Custom message for ELB 4xx errors monitor | string | `` | no | | elb_4xx_silenced | Groups to mute for ELB 4xx errors monitor | map | `` | no | | elb_4xx_threshold_critical | loadbalancer 4xx critical threshold in percentage | string | `10` | no | @@ -60,9 +59,11 @@ Creates DataDog monitors with the following checks: | elb_no_healthy_instance_time_aggregator | Monitor aggregator for ELB no healty instance [available values: min or max] | string | `min` | no | | elb_no_healthy_instance_timeframe | Monitor timeframe for ELB no healty instance [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf index b0f2e80..fa13136 100644 --- a/cloud/aws/elb/inputs.tf +++ b/cloud/aws/elb/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + 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 9f3d5dd..9ba0e35 100644 --- a/cloud/aws/elb/monitors-elb.tf +++ b/cloud/aws/elb/monitors-elb.tf @@ -11,14 +11,14 @@ resource "datadog_monitor" "ELB_no_healthy_instances" { type = "metric alert" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.elb_no_healthy_instance_silenced}" @@ -46,14 +46,14 @@ resource "datadog_monitor" "ELB_too_much_4xx" { } notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.elb_4xx_silenced}" @@ -81,14 +81,14 @@ resource "datadog_monitor" "ELB_too_much_5xx" { } notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.elb_5xx_silenced}" @@ -116,14 +116,14 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" { } notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.elb_backend_4xx_silenced}" @@ -151,14 +151,14 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" { } notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.elb_backend_5xx_silenced}" @@ -183,14 +183,14 @@ resource "datadog_monitor" "ELB_backend_latency" { } notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.elb_backend_latency_silenced}" diff --git a/cloud/aws/kinesis-firehose/README.md b/cloud/aws/kinesis-firehose/README.md index c7ac54b..84b9c70 100644 --- a/cloud/aws/kinesis-firehose/README.md +++ b/cloud/aws/kinesis-firehose/README.md @@ -22,14 +22,15 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | incoming_records_message | Custom message for Kinesis Firehorse incoming records monitor | string | `` | no | | incoming_records_silenced | Groups to mute for Kinesis Firehorse incoming records monitor | map | `` | no | | incoming_records_timeframe | Monitor timeframe for incoming records metrics evaluation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/aws/kinesis-firehose/inputs.tf b/cloud/aws/kinesis-firehose/inputs.tf index 831045e..95e7a06 100644 --- a/cloud/aws/kinesis-firehose/inputs.tf +++ b/cloud/aws/kinesis-firehose/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf index fea4f9f..142fd61 100644 --- a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf +++ b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf @@ -16,14 +16,14 @@ resource "datadog_monitor" "firehose_incoming_records" { } notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.incoming_records_silenced}" diff --git a/cloud/aws/rds/README.md b/cloud/aws/rds/README.md index f784bcd..28e0d2e 100644 --- a/cloud/aws/rds/README.md +++ b/cloud/aws/rds/README.md @@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks: | cpu_threshold_warning | CPU usage in percent (warning threshold) | string | `80` | no | | cpu_time_aggregator | Monitor aggregator for RDS CPU usage [available values: min, max or avg] | string | `min` | no | | cpu_timeframe | Monitor timeframe for RDS CPU usage [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | diskspace_message | Custom message for RDS free diskspace monitor | string | `` | no | | diskspace_silenced | Groups to mute for RDS free diskspace monitor | map | `` | no | | diskspace_threshold_critical | Disk free space in percent (critical threshold) | string | `10` | no | @@ -37,9 +36,11 @@ Creates DataDog monitors with the following checks: | diskspace_time_aggregator | Monitor aggregator for RDS free diskspace [available values: min, max or avg] | string | `min` | no | | diskspace_timeframe | Monitor timeframe for RDS free diskspace [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/aws/rds/inputs.tf b/cloud/aws/rds/inputs.tf index 934bc80..a179a49 100644 --- a/cloud/aws/rds/inputs.tf +++ b/cloud/aws/rds/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/aws/rds/monitors-rds.tf b/cloud/aws/rds/monitors-rds.tf index d814336..f563cf0 100644 --- a/cloud/aws/rds/monitors-rds.tf +++ b/cloud/aws/rds/monitors-rds.tf @@ -17,13 +17,13 @@ EOF } notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.cpu_silenced}" @@ -50,13 +50,13 @@ EOF } notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" silenced = "${var.diskspace_silenced}" diff --git a/cloud/aws/vpn/README.md b/cloud/aws/vpn/README.md index 21f3f2a..355c77e 100644 --- a/cloud/aws/vpn/README.md +++ b/cloud/aws/vpn/README.md @@ -22,10 +22,11 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags | Tags used for metrics filtering | string | `*` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | vpn_status_message | Custom message for VPN status monitor | string | `` | no | | vpn_status_silenced | Groups to mute for VPN status monitor | map | `` | no | | vpn_status_time_aggregator | Monitor aggregator for VPN status [available values: min, max or avg] | string | `max` | no | diff --git a/cloud/aws/vpn/inputs.tf b/cloud/aws/vpn/inputs.tf index 7e2b0c7..8afd124 100644 --- a/cloud/aws/vpn/inputs.tf +++ b/cloud/aws/vpn/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/aws/vpn/monitors-vpn.tf b/cloud/aws/vpn/monitors-vpn.tf index db9ed1a..37d5755 100644 --- a/cloud/aws/vpn/monitors-vpn.tf +++ b/cloud/aws/vpn/monitors-vpn.tf @@ -12,8 +12,8 @@ resource "datadog_monitor" "VPN_status" { notify_no_data = true renotify_interval = 0 - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true diff --git a/cloud/azure/apimanagement/README.md b/cloud/azure/apimanagement/README.md index f0b51a9..f2ba253 100644 --- a/cloud/azure/apimanagement/README.md +++ b/cloud/azure/apimanagement/README.md @@ -26,8 +26,8 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | failed_requests_message | Custom message for API Management failed requests monitor | string | `` | no | | failed_requests_silenced | Groups to mute for API Management failed requests monitor | map | `` | no | | failed_requests_threshold_critical | Maximum acceptable percent of failed requests | string | `90` | no | @@ -36,6 +36,7 @@ Creates DataDog monitors with the following checks: | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when a Redis monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | other_requests_message | Custom message for API Management other requests monitor | string | `` | no | | other_requests_silenced | Groups to mute for API Management other requests monitor | map | `` | no | | other_requests_threshold_critical | Maximum acceptable percent of other requests | string | `90` | no | diff --git a/cloud/azure/apimanagement/inputs.tf b/cloud/azure/apimanagement/inputs.tf index 2a19b46..2effcaa 100644 --- a/cloud/azure/apimanagement/inputs.tf +++ b/cloud/azure/apimanagement/inputs.tf @@ -9,11 +9,16 @@ variable "message" { description = "Message sent when a Redis monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf index 8709559..aad2941 100644 --- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf +++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf @@ -15,14 +15,14 @@ resource "datadog_monitor" "apimgt_status" { silenced = "${var.status_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"] } @@ -52,8 +52,8 @@ resource "datadog_monitor" "apimgt_failed_requests" { include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"] @@ -84,8 +84,8 @@ resource "datadog_monitor" "apimgt_other_requests" { include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"] @@ -116,8 +116,8 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" { include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"] @@ -148,8 +148,8 @@ resource "datadog_monitor" "apimgt_successful_requests" { include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"] diff --git a/cloud/azure/app-services/README.md b/cloud/azure/app-services/README.md index 2e97976..6f42f5a 100644 --- a/cloud/azure/app-services/README.md +++ b/cloud/azure/app-services/README.md @@ -26,8 +26,8 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | http_4xx_requests_message | Custom message for App Services 4xx requests monitor | string | `` | no | @@ -52,6 +52,7 @@ Creates DataDog monitors with the following checks: | memory_usage_time_aggregator | Monitor aggregator for App Services memory usage [available values: min, max or avg] | string | `min` | no | | memory_usage_timeframe | Monitor timeframe for App Services memory usage [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 a monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | response_time_message | Custom message for App Services response time monitor | string | `` | no | | response_time_silenced | Groups to mute for App Services response time monitor | map | `` | no | | response_time_threshold_critical | Alerting threshold for response time in seconds | string | `10` | no | diff --git a/cloud/azure/app-services/inputs.tf b/cloud/azure/app-services/inputs.tf index d038d4b..62870c6 100644 --- a/cloud/azure/app-services/inputs.tf +++ b/cloud/azure/app-services/inputs.tf @@ -17,11 +17,16 @@ variable "message" { description = "Message sent when a monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + # Azure App Services specific variables variable "response_time_silenced" { description = "Groups to mute for App Services response time monitor" diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf index d0d2e0f..83cfded 100644 --- a/cloud/azure/app-services/monitors-app_services.tf +++ b/cloud/azure/app-services/monitors-app_services.tf @@ -10,8 +10,8 @@ resource "datadog_monitor" "appservices_response_time" { ) > ${var.response_time_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.response_time_threshold_warning}" @@ -41,8 +41,8 @@ resource "datadog_monitor" "appservices_memory_usage_count" { ) > ${var.memory_usage_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.memory_usage_threshold_warning}" @@ -73,8 +73,8 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" { ) * 100 > ${var.http_5xx_requests_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.http_5xx_requests_threshold_warning}" @@ -105,8 +105,8 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" { ) * 100 > ${var.http_4xx_requests_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.http_4xx_requests_threshold_warning}" @@ -138,8 +138,8 @@ resource "datadog_monitor" "appservices_http_success_status_rate" { ) * 100 < ${var.http_successful_requests_threshold_critical} EOF - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.http_successful_requests_threshold_warning}" diff --git a/cloud/azure/eventhub/README.md b/cloud/azure/eventhub/README.md index 247b298..ef43987 100644 --- a/cloud/azure/eventhub/README.md +++ b/cloud/azure/eventhub/README.md @@ -24,13 +24,13 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | | errors_rate_message | Custom message for Event Hub errors monitor | string | `` | no | | errors_rate_silenced | Groups to mute for Event Hub errors monitor | map | `` | no | | errors_rate_thresold_critical | Errors ratio (percentage) to trigger the critical alert | string | `90` | no | | errors_rate_thresold_warning | Errors ratio (percentage) to trigger a warning alert | string | `50` | no | | errors_rate_timeframe | Monitor timeframe for Event Hub errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | failed_requests_rate_message | Custom message for Event Hub failed requests monitor | string | `` | no | | failed_requests_rate_silenced | Groups to mute for Event Hub failed requests monitor | map | `` | no | | failed_requests_rate_thresold_critical | Failed requests ratio (percentage) to trigger the critical alert | string | `90` | no | @@ -39,6 +39,7 @@ Creates DataDog monitors with the following checks: | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | status_message | Custom message for Event Hub status monitor | string | `` | no | | status_silenced | Groups to mute for Event Hub status monitor | map | `` | no | | status_time_aggregator | Monitor aggregator for Event Hub status [available values: min, max or avg] | string | `max` | no | diff --git a/cloud/azure/eventhub/inputs.tf b/cloud/azure/eventhub/inputs.tf index 5229093..1fccb08 100644 --- a/cloud/azure/eventhub/inputs.tf +++ b/cloud/azure/eventhub/inputs.tf @@ -9,11 +9,16 @@ variable "message" { description = "Message sent when an alert is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf index 6e69429..e357eac 100644 --- a/cloud/azure/eventhub/monitors-eventhub.tf +++ b/cloud/azure/eventhub/monitors-eventhub.tf @@ -13,14 +13,14 @@ resource "datadog_monitor" "eventhub_status" { silenced = "${var.status_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:eventhub", "team:azure", "provider:azure"] } @@ -48,14 +48,14 @@ resource "datadog_monitor" "eventhub_failed_requests" { silenced = "${var.failed_requests_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:eventhub", "team:azure", "provider:azure"] } @@ -88,14 +88,14 @@ resource "datadog_monitor" "eventhub_errors" { silenced = "${var.errors_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:eventhub", "team:azure", "provider:azure"] } diff --git a/cloud/azure/iothubs/README.md b/cloud/azure/iothubs/README.md index c1edbae..53eeee5 100644 --- a/cloud/azure/iothubs/README.md +++ b/cloud/azure/iothubs/README.md @@ -35,13 +35,13 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | dropped_d2c_telemetry_egress_message | Custom message for IoT Hub dropped d2c telemetry monitor | string | `` | no | | dropped_d2c_telemetry_egress_rate_threshold_critical | D2C Telemetry Dropped limit (critical threshold) | string | `90` | no | | dropped_d2c_telemetry_egress_rate_threshold_warning | D2C Telemetry Dropped limit (warning threshold) | string | `50` | no | | dropped_d2c_telemetry_egress_silenced | Groups to mute for IoT Hub dropped d2c telemetry monitor | map | `` | no | | dropped_d2c_telemetry_egress_timeframe | Monitor timeframe for IoT Hub dropped d2c telemetry [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | failed_c2d_methods_rate_message | Custom message for IoT Hub failed c2d method monitor | string | `` | no | | failed_c2d_methods_rate_silenced | Groups to mute for IoT Hub failed c2d methods monitor | map | `` | no | | failed_c2d_methods_rate_threshold_critical | C2D Methods Failed rate limit (critical threshold) | string | `90` | no | @@ -89,6 +89,7 @@ Creates DataDog monitors with the following checks: | invalid_d2c_telemetry_egress_silenced | Groups to mute for IoT Hub invalid d2c telemetry monitor | map | `` | no | | invalid_d2c_telemetry_egress_timeframe | Monitor timeframe for IoT Hub invalid d2c telemetry [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 | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | orphaned_d2c_telemetry_egress_message | Custom message for IoT Hub orphaned d2c telemetry monitor | string | `` | no | | orphaned_d2c_telemetry_egress_rate_threshold_critical | D2C Telemetry Orphaned limit (critical threshold) | string | `90` | no | | orphaned_d2c_telemetry_egress_rate_threshold_warning | D2C Telemetry Orphaned limit (warning threshold) | string | `50` | no | diff --git a/cloud/azure/iothubs/inputs.tf b/cloud/azure/iothubs/inputs.tf index d50ec27..84335e8 100644 --- a/cloud/azure/iothubs/inputs.tf +++ b/cloud/azure/iothubs/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/azure/iothubs/monitors-iothubs.tf b/cloud/azure/iothubs/monitors-iothubs.tf index bb81de9..514bcf2 100644 --- a/cloud/azure/iothubs/monitors-iothubs.tf +++ b/cloud/azure/iothubs/monitors-iothubs.tf @@ -20,14 +20,14 @@ resource "datadog_monitor" "too_many_jobs_failed" { silenced = "${var.failed_jobs_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -54,14 +54,14 @@ resource "datadog_monitor" "too_many_list_jobs_failed" { silenced = "${var.failed_listjobs_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -88,14 +88,14 @@ resource "datadog_monitor" "too_many_query_jobs_failed" { silenced = "${var.failed_queryjobs_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -115,14 +115,14 @@ resource "datadog_monitor" "status" { silenced = "${var.status_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -142,14 +142,14 @@ resource "datadog_monitor" "total_devices" { silenced = "${var.total_devices_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -176,14 +176,14 @@ resource "datadog_monitor" "too_many_c2d_methods_failed" { silenced = "${var.failed_c2d_methods_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -210,14 +210,14 @@ resource "datadog_monitor" "too_many_c2d_twin_read_failed" { silenced = "${var.failed_c2d_twin_read_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -244,14 +244,14 @@ resource "datadog_monitor" "too_many_c2d_twin_update_failed" { silenced = "${var.failed_c2d_twin_update_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -278,14 +278,14 @@ resource "datadog_monitor" "too_many_d2c_twin_read_failed" { silenced = "${var.failed_d2c_twin_read_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -312,14 +312,14 @@ resource "datadog_monitor" "too_many_d2c_twin_update_failed" { silenced = "${var.failed_d2c_twin_update_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -349,14 +349,14 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" { silenced = "${var.dropped_d2c_telemetry_egress_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -386,14 +386,14 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" { silenced = "${var.orphaned_d2c_telemetry_egress_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -423,14 +423,14 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" { silenced = "${var.invalid_d2c_telemetry_egress_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } @@ -451,14 +451,14 @@ resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" { silenced = "${var.too_many_d2c_telemetry_ingress_nosent_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"] } diff --git a/cloud/azure/redis/README.md b/cloud/azure/redis/README.md index 491c6cc..9261315 100644 --- a/cloud/azure/redis/README.md +++ b/cloud/azure/redis/README.md @@ -25,8 +25,8 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | evictedkeys_limit_message | Custom message for Redis evicted keys monitor | string | `` | no | | evictedkeys_limit_silenced | Groups to mute for Redis evicted keys monitor | map | `` | no | | evictedkeys_limit_threshold_critical | Evicted keys limit (critical threshold) | string | `100` | no | @@ -36,6 +36,7 @@ Creates DataDog monitors with the following checks: | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when a Redis monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | percent_processor_time_message | Custom message for Redis processor monitor | string | `` | no | | percent_processor_time_silenced | Groups to mute for Redis processor monitor | map | `` | no | | percent_processor_time_threshold_critical | Processor time percent (critical threshold) | string | `80` | no | diff --git a/cloud/azure/redis/inputs.tf b/cloud/azure/redis/inputs.tf index e006091..136496f 100644 --- a/cloud/azure/redis/inputs.tf +++ b/cloud/azure/redis/inputs.tf @@ -9,11 +9,16 @@ variable "message" { description = "Message sent when a Redis monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf index 7935833..a155c19 100644 --- a/cloud/azure/redis/monitors-azure-redis.tf +++ b/cloud/azure/redis/monitors-azure-redis.tf @@ -13,14 +13,14 @@ resource "datadog_monitor" "status" { silenced = "${var.status_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"] } @@ -45,14 +45,14 @@ EOF silenced = "${var.evictedkeys_limit_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"] } @@ -77,14 +77,14 @@ EOF silenced = "${var.percent_processor_time_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"] } @@ -109,14 +109,14 @@ EOF silenced = "${var.server_load_rate_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"] } diff --git a/cloud/azure/servicebus/README.md b/cloud/azure/servicebus/README.md index c3aa103..1b63bc4 100644 --- a/cloud/azure/servicebus/README.md +++ b/cloud/azure/servicebus/README.md @@ -22,11 +22,12 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | status_message | Custom message for Service Bus status monitor | string | `` | no | | status_silenced | Groups to mute for Service Bus status monitor | map | `` | no | | status_time_aggregator | Monitor aggregator for Service Bus status [available values: min, max or avg] | string | `max` | no | diff --git a/cloud/azure/servicebus/inputs.tf b/cloud/azure/servicebus/inputs.tf index 0987acd..472a7ab 100644 --- a/cloud/azure/servicebus/inputs.tf +++ b/cloud/azure/servicebus/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf index 4741665..03415cd 100644 --- a/cloud/azure/servicebus/monitors-service-bus.tf +++ b/cloud/azure/servicebus/monitors-service-bus.tf @@ -13,14 +13,14 @@ EOF silenced = "${var.status_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:servicebus", "team:azure", "provider:azure"] } diff --git a/cloud/azure/sql-database/README.md b/cloud/azure/sql-database/README.md index b64baf4..4fd93ba 100644 --- a/cloud/azure/sql-database/README.md +++ b/cloud/azure/sql-database/README.md @@ -35,7 +35,6 @@ Creates DataDog monitors with the following checks: | deadlock_silenced | Groups to mute for SQL Deadlock monitor | map | `` | no | | deadlock_threshold_critical | Amount of Deadlocks (critical threshold) | string | `1` | no | | deadlock_timeframe | Monitor timeframe for SQL Deadlock [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | diskspace_message | Custom message for SQL disk space monitor | string | `` | no | | diskspace_silenced | Groups to mute for SQL disk space monitor | map | `` | no | | diskspace_threshold_critical | Disk space used in percent (critical threshold) | string | `90` | no | @@ -49,9 +48,11 @@ Creates DataDog monitors with the following checks: | dtu_time_aggregator | Monitor aggregator for SQL DTU [available values: min, max or avg] | string | `avg` | no | | dtu_timeframe | Monitor timeframe for SQL DTU [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/cloud/azure/sql-database/inputs.tf b/cloud/azure/sql-database/inputs.tf index 38a583a..40b84d2 100644 --- a/cloud/azure/sql-database/inputs.tf +++ b/cloud/azure/sql-database/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/cloud/azure/sql-database/monitors-sql-database-basics.tf b/cloud/azure/sql-database/monitors-sql-database-basics.tf index 1aca9f6..ff289eb 100644 --- a/cloud/azure/sql-database/monitors-sql-database-basics.tf +++ b/cloud/azure/sql-database/monitors-sql-database-basics.tf @@ -17,14 +17,14 @@ resource "datadog_monitor" "sql-database_cpu_90_15min" { silenced = "${var.cpu_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"] } @@ -49,14 +49,14 @@ resource "datadog_monitor" "sql-database_free_space_low" { silenced = "${var.diskspace_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"] } @@ -81,14 +81,14 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" { silenced = "${var.dtu_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"] } @@ -112,14 +112,14 @@ resource "datadog_monitor" "sql-database_deadlocks_count" { silenced = "${var.deadlock_silenced}" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"] } diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md index 46c0510..637436c 100644 --- a/cloud/azure/storage/README.md +++ b/cloud/azure/storage/README.md @@ -48,8 +48,8 @@ Creates DataDog monitors with the following checks: | client_other_error_requests_threshold_warning | Warning regarding acceptable percent of client other error requests for a storage | string | `50` | no | | client_other_error_requests_time_aggregator | Monitor aggregator for Storage other errors [available values: min, max or avg] | string | `min` | no | | client_other_error_requests_timeframe | Monitor timeframe for Storage other errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | latency_message | Custom message for Storage latency monitor | string | `` | no | @@ -65,6 +65,7 @@ Creates DataDog monitors with the following checks: | network_error_requests_threshold_warning | Warning regarding acceptable percent of network error requests for a storage | string | `50` | no | | network_error_requests_time_aggregator | Monitor aggregator for Storage network errors [available values: min, max or avg] | string | `min` | no | | network_error_requests_timeframe | Monitor timeframe for Storage network errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | server_other_error_requests_message | Custom message for Storage server other errors monitor | string | `` | no | | server_other_error_requests_silenced | Groups to mute for Storage server other errors monitor | map | `` | no | | server_other_error_requests_threshold_critical | Maximum acceptable percent of server other error requests for a storage | string | `90` | no | diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf index a2f527f..581618b 100644 --- a/cloud/azure/storage/inputs.tf +++ b/cloud/azure/storage/inputs.tf @@ -9,11 +9,16 @@ variable "message" { description = "Message sent when a Redis monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf index e131133..e9deb58 100644 --- a/cloud/azure/storage/monitors-azure-storage.tf +++ b/cloud/azure/storage/monitors-azure-storage.tf @@ -22,8 +22,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -53,8 +53,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -84,8 +84,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -115,8 +115,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -146,8 +146,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -177,8 +177,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -208,8 +208,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -239,8 +239,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] @@ -270,8 +270,8 @@ EOF include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" - evaluation_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"] diff --git a/cloud/azure/stream-analytics/README.md b/cloud/azure/stream-analytics/README.md index 90f1d9c..0c1f5b8 100644 --- a/cloud/azure/stream-analytics/README.md +++ b/cloud/azure/stream-analytics/README.md @@ -32,8 +32,8 @@ Creates DataDog monitors with the following checks: | conversion_errors_threshold_warning | Conversion errors limit (warning threshold) | string | `0` | no | | conversion_errors_time_aggregator | Monitor aggregator for Stream Analytics conversion errors [available values: min, max or avg] | string | `min` | no | | conversion_errors_timeframe | Monitor timeframe for Stream Analytics conversion errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | failed_function_requests_message | Custom message for Stream Analytics failed requests monitor | string | `` | no | | failed_function_requests_silenced | Groups to mute for Stream Analytics failed requests monitor | map | `` | no | | failed_function_requests_threshold_critical | Failed Function Request rate limit (critical threshold) | string | `10` | no | @@ -42,6 +42,7 @@ Creates DataDog monitors with the following checks: | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when a Redis monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | runtime_errors_message | Custom message for Stream Analytics runtime errors monitor | string | `` | no | | runtime_errors_silenced | Groups to mute for Stream Analytics runtime errors monitor | map | `` | no | | runtime_errors_threshold_critical | Runtime errors limit (critical threshold) | string | `10` | no | diff --git a/cloud/azure/stream-analytics/inputs.tf b/cloud/azure/stream-analytics/inputs.tf index 615783d..afec7f0 100644 --- a/cloud/azure/stream-analytics/inputs.tf +++ b/cloud/azure/stream-analytics/inputs.tf @@ -9,11 +9,16 @@ variable "message" { description = "Message sent when a Redis monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf index e295cad..f2c2170 100644 --- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf +++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf @@ -13,14 +13,14 @@ resource "datadog_monitor" "status" { silenced = "${var.status_silenced}" notify_no_data = true - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = ["env:${var.environment}", "resource:streamanalytics", "team:azure", "provider:azure"] } @@ -38,14 +38,14 @@ resource "datadog_monitor" "su_utilization" { type = "metric alert" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.su_utilization_threshold_warning}" @@ -71,14 +71,14 @@ resource "datadog_monitor" "failed_function_requests" { type = "metric alert" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 60 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.failed_function_requests_threshold_warning}" @@ -103,14 +103,14 @@ resource "datadog_monitor" "conversion_errors" { type = "metric alert" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.conversion_errors_threshold_warning}" @@ -135,14 +135,14 @@ resource "datadog_monitor" "runtime_errors" { type = "metric alert" notify_no_data = false - evaluation_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" renotify_interval = 0 notify_audit = false timeout_h = 1 include_tags = true locked = false require_full_window = false - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" thresholds { warning = "${var.runtime_errors_threshold_warning}" diff --git a/databases/mongodb/README.md b/databases/mongodb/README.md index cabe5bf..0293710 100644 --- a/databases/mongodb/README.md +++ b/databases/mongodb/README.md @@ -25,8 +25,8 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `15` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | @@ -49,6 +49,7 @@ Creates DataDog monitors with the following checks: | mongodb_server_count_message | Custom message for MongoDB server count | string | `` | no | | mongodb_server_count_silenced | Groups to mute for MongoDB server count monitor | map | `` | no | | mongodb_server_count_timeframe | Monitor timeframe for MongoDB wrong server count [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/databases/mongodb/inputs.tf b/databases/mongodb/inputs.tf index 3800ae5..d85a967 100644 --- a/databases/mongodb/inputs.tf +++ b/databases/mongodb/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 15 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/databases/mongodb/monitors-mongo.tf b/databases/mongodb/monitors-mongo.tf index 82726db..7dcef7e 100644 --- a/databases/mongodb/monitors-mongo.tf +++ b/databases/mongodb/monitors-mongo.tf @@ -11,8 +11,8 @@ resource "datadog_monitor" "mongodb_primary" { notify_no_data = true renotify_interval = 0 - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -43,8 +43,8 @@ resource "datadog_monitor" "mongodb_secondary" { notify_no_data = false renotify_interval = 0 - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -74,8 +74,8 @@ resource "datadog_monitor" "mongodb_server_count" { notify_no_data = false renotify_interval = 0 - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -104,8 +104,8 @@ resource "datadog_monitor" "mongodb_replication" { notify_no_data = false renotify_interval = 0 - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true diff --git a/middleware/apache/README.md b/middleware/apache/README.md index f9dae38..0718947 100644 --- a/middleware/apache/README.md +++ b/middleware/apache/README.md @@ -25,11 +25,12 @@ Creates DataDog monitors with the following checks: | apache_connect_message | Custom message for Apache status monitor | string | `` | no | | apache_connect_silenced | Groups to mute for Apache status monitor | map | `` | no | | apache_connect_threshold_critical | Apache status monitor (critical threshold) | string | `1.1754943508222875e-38` | no | -| delay | Delay in seconds for the metric evaluation | string | `15` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/middleware/apache/inputs.tf b/middleware/apache/inputs.tf index 0f30b12..176a509 100644 --- a/middleware/apache/inputs.tf +++ b/middleware/apache/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 15 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf index d134287..58d73cf 100644 --- a/middleware/apache/monitors-apache.tf +++ b/middleware/apache/monitors-apache.tf @@ -14,7 +14,7 @@ resource "datadog_monitor" "datadog_apache_process" { } notify_no_data = true - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 diff --git a/middleware/nginx/README.md b/middleware/nginx/README.md index cbfd72f..180cf9a 100644 --- a/middleware/nginx/README.md +++ b/middleware/nginx/README.md @@ -22,11 +22,12 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `15` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | nginx_connect_message | Custom message for Nginx status monitor | string | `` | no | | nginx_connect_silenced | Groups to mute for Nginx status monitor | map | `` | no | | nginx_connect_threshold_critical | Nginx status monitor (critical threshold) | string | `1.1754943508222875e-38` | no | diff --git a/middleware/nginx/inputs.tf b/middleware/nginx/inputs.tf index d7d4fc1..53ef9ce 100644 --- a/middleware/nginx/inputs.tf +++ b/middleware/nginx/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 15 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf index 4f44be5..7b5605f 100644 --- a/middleware/nginx/monitors-nginx.tf +++ b/middleware/nginx/monitors-nginx.tf @@ -14,7 +14,7 @@ resource "datadog_monitor" "datadog_nginx_process" { } notify_no_data = true - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 diff --git a/middleware/php-fpm/README.md b/middleware/php-fpm/README.md index 0e74dab..0603064 100644 --- a/middleware/php-fpm/README.md +++ b/middleware/php-fpm/README.md @@ -23,11 +23,12 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `15` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | | php_fpm_busy_message | Custom message for PHP FPM busy worker monitor | string | `` | no | | php_fpm_busy_silenced | Groups to mute for PHP FPM busy worker monitor | map | `` | no | | php_fpm_busy_threshold_critical | php fpm busy critical threshold | string | `0.9` | no | diff --git a/middleware/php-fpm/inputs.tf b/middleware/php-fpm/inputs.tf index c35f5dc..b198243 100644 --- a/middleware/php-fpm/inputs.tf +++ b/middleware/php-fpm/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 15 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf index aaf3175..70aa7a0 100644 --- a/middleware/php-fpm/monitors-fpm.tf +++ b/middleware/php-fpm/monitors-fpm.tf @@ -18,8 +18,8 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" { } notify_no_data = true - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -48,7 +48,7 @@ resource "datadog_monitor" "datadog_fpm_process" { } notify_no_data = true - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0 diff --git a/system/generic/README.md b/system/generic/README.md index 1174ef4..541bb45 100644 --- a/system/generic/README.md +++ b/system/generic/README.md @@ -38,8 +38,8 @@ Creates DataDog monitors with the following checks: | cpu_load_threshold_warning | CPU load ratio warning threshold | string | `2` | no | | cpu_load_time_aggregator | Monitor aggregator for CPU load ratio [available values: min, max or avg] | string | `min` | no | | cpu_load_timeframe | Monitor timeframe for CPU load ratio [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | -| delay | Delay in seconds for the metric evaluation | string | `15` | no | | environment | Architecture Environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | free_disk_inodes_message | Custom message for Free disk inodes monitor | string | `` | no | @@ -61,6 +61,7 @@ Creates DataDog monitors with the following checks: | free_memory_time_aggregator | Monitor aggregator for Free memory [available values: min, max or avg] | string | `max` | no | | free_memory_timeframe | Monitor timeframe for Free memory [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 | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | ## Outputs diff --git a/system/generic/inputs.tf b/system/generic/inputs.tf index 2d522ee..4a90e06 100644 --- a/system/generic/inputs.tf +++ b/system/generic/inputs.tf @@ -5,11 +5,16 @@ variable "environment" { } # Global DataDog -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 15 } +variable "new_host_delay" { + description = "Delay in seconds before monitor new resource" + default = 300 +} + variable "message" { description = "Message sent when an alert is triggered" } diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf index 6cf4076..887ca85 100644 --- a/system/generic/monitors-system.tf +++ b/system/generic/monitors-system.tf @@ -18,8 +18,8 @@ resource "datadog_monitor" "datadog_cpu_too_high" { tags = ["env:${var.environment}", "type:system", "resource:cpu"] notify_no_data = true - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -50,8 +50,8 @@ resource "datadog_monitor" "datadog_load_too_high" { tags = ["env:${var.environment}", "type:system", "resource:load"] notify_no_data = true - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -82,8 +82,8 @@ resource "datadog_monitor" "datadog_free_disk_space_too_low" { tags = ["env:${var.environment}", "type:system", "resource:disk"] notify_no_data = true - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -114,8 +114,8 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" { tags = ["env:${var.environment}", "type:system", "resource:disk"] notify_no_data = true - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" notify_audit = false timeout_h = 0 include_tags = true @@ -146,8 +146,8 @@ resource "datadog_monitor" "datadog_free_memory" { tags = ["env:${var.environment}", "type:system", "resource:memory"] notify_no_data = true - evaluation_delay = "${var.delay}" - new_host_delay = "${var.delay}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" renotify_interval = 0 notify_audit = false timeout_h = 0