MON-96 fix all delay naming and default value

cloud/aws/elasticsearch/README.md

@@ -33,7 +33,7 @@ Inputs
 | cpu_silenced | Groups to mute for ES cluster cpu monitor | map | `<map>` | no |
 | cpu_threshold_critical | CPU usage in percent (critical threshold) | string | `90` | no |
 | cpu_threshold_warning | CPU usage in percent (warning threshold) | string | `80` | no |
-| delay | Delay in seconds for the metric evaluation | string | `600` | 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 | `<map>` | no |
 | diskspace_threshold_critical | Disk free space in percent (critical threshold) | string | `10` | no |

cloud/aws/elasticsearch/inputs.tf

@@ -7,7 +7,7 @@ variable "environment" {
 # Global DataDog
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "message" {

cloud/aws/elb/README.md

@@ -54,7 +54,7 @@ Inputs
 | elb_no_healthy_instance_message | Custom message for ELB no healty instance monitor | string | `` | no |
 | elb_no_healthy_instance_silenced | Groups to mute for ELB no healty instance monitor | map | `<map>` | no |
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| 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 |

cloud/aws/elb/inputs.tf

@@ -5,9 +5,9 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "message" {

cloud/aws/elb/monitors-elb.tf

@@ -19,14 +19,14 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
   type = "metric alert"
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.elb_no_healthy_instance_silenced}"
@@ -55,14 +55,14 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.elb_4xx_silenced}"
@@ -91,14 +91,14 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.elb_5xx_silenced}"
@@ -127,14 +127,14 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.elb_backend_4xx_silenced}"
@@ -163,14 +163,14 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.elb_backend_5xx_silenced}"
@@ -196,14 +196,14 @@ resource "datadog_monitor" "ELB_backend_latency" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.elb_backend_latency_silenced}"

cloud/aws/rds/README.md

@@ -34,7 +34,7 @@ Inputs
 | diskspace_threshold_critical | Disk free space in percent (critical threshold) | string | `10` | no |
 | diskspace_threshold_warning | Disk free space in percent (warning threshold) | string | `20` | no |
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| 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 |

cloud/aws/rds/inputs.tf

@@ -5,9 +5,9 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "message" {

cloud/aws/rds/monitors-rds.tf

@@ -25,13 +25,13 @@ EOF
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.cpu_silenced}"
@@ -59,13 +59,13 @@ EOF
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.evaluation_delay}"
+  new_host_delay      = "${var.delay}"
   no_data_timeframe   = 20
 
   silenced = "${var.diskspace_silenced}"

cloud/aws/vpn/README.md

@@ -25,7 +25,7 @@ Inputs
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| 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 |

cloud/aws/vpn/inputs.tf

@@ -5,9 +5,9 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "message" {

cloud/aws/vpn/monitors-vpn.tf

@@ -20,8 +20,8 @@ resource "datadog_monitor" "VPN_status" {
 
   notify_no_data      = true
   renotify_interval   = 0
-  evaluation_delay    = "${var.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true

cloud/azure/README.md

@@ -69,7 +69,7 @@ Inputs
 | appservices_response_time_silenced | Groups to mute for App Services response time monitor | map | `<map>` | no |
 | appservices_response_time_threshold_critical | Alerting threshold for response time in seconds | string | `10` | no |
 | appservices_response_time_threshold_warning | Warning threshold for response time in seconds | string | `5` | no |
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | eventhub_errors_rate_message | Custom message for Event Hub errors monitor | string | `` | no |
 | eventhub_errors_rate_silenced | Groups to mute for Event Hub errors monitor | map | `<map>` | no |

cloud/azure/apimanagement/README.md

@@ -27,7 +27,7 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | 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 | `<map>` | no |

cloud/azure/apimanagement/inputs.tf

@@ -11,7 +11,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "filter_tags_use_defaults" {

cloud/azure/app-services/README.md

@@ -28,7 +28,7 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | 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 |

cloud/azure/app-services/inputs.tf

@@ -19,7 +19,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 # Azure App Services specific variables

cloud/azure/eventhub/README.md

@@ -27,7 +27,7 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| 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 | `<map>` | no |

cloud/azure/eventhub/inputs.tf

@@ -11,7 +11,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "filter_tags_use_defaults" {

cloud/azure/inputs.tf

@@ -10,7 +10,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "filter_tags_use_defaults" {

cloud/azure/iothubs/README.md

@@ -38,7 +38,7 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| 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 |

cloud/azure/iothubs/inputs.tf

@@ -7,7 +7,7 @@ variable "environment" {
 # Global DataDog
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "message" {

cloud/azure/redis/README.md

@@ -27,7 +27,7 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | evictedkeys_limit_message | Custom message for Redis evicted keys monitor | string | `` | no |
 | evictedkeys_limit_silenced | Groups to mute for Redis evicted keys monitor | map | `<map>` | no |

cloud/azure/redis/inputs.tf

@@ -11,7 +11,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "filter_tags_use_defaults" {

cloud/azure/sql-database/README.md

@@ -34,7 +34,7 @@ Inputs
 | deadlock_message | Custom message for SQL Deadlock monitor | string | `` | no |
 | deadlock_silenced | Groups to mute for SQL Deadlock monitor | map | `<map>` | no |
 | deadlock_threshold_critical | Amount of Deadlocks (critical threshold) | string | `1` | no |
-| delay | Delay in seconds for the metric evaluation | string | `600` | 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 | `<map>` | no |
 | diskspace_threshold_critical | Disk space used in percent (critical threshold) | string | `90` | no |

cloud/azure/sql-database/inputs.tf

@@ -7,7 +7,7 @@ variable "environment" {
 # Global DataDog
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "message" {

cloud/azure/storage/README.md

@@ -44,7 +44,7 @@ Inputs
 | client_other_error_requests_silenced | Groups to mute for Storage other errors monitor | map | `<map>` | no |
 | client_other_error_requests_threshold_critical | Maximum acceptable percent of client other error requests for a storage | string | `90` | no |
 | client_other_error_requests_threshold_warning | Warning regarding acceptable percent of client other error requests for a storage | string | `50` | no |
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | 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 |

cloud/azure/storage/inputs.tf

@@ -11,7 +11,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "filter_tags_use_defaults" {

cloud/azure/stream-analytics/README.md

@@ -23,7 +23,7 @@ Inputs
 | conversion_errors_silenced | Groups to mute for Stream Analytics conversion errors monitor | map | `<map>` | no |
 | conversion_errors_threshold_critical | Conversion errors limit (critical threshold) | string | `10` | no |
 | conversion_errors_threshold_warning | Conversion errors limit (warning threshold) | string | `0` | no |
-| delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | 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 | `<map>` | no |

cloud/azure/stream-analytics/inputs.tf

@@ -11,7 +11,7 @@ variable "message" {
 
 variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 900
 }
 
 variable "filter_tags_use_defaults" {

databases/mongodb/README.md

@@ -75,7 +75,7 @@ Inputs
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no |
+| 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 |

databases/mongodb/inputs.tf

@@ -5,7 +5,7 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
   default     = 15
 }

databases/mongodb/monitors-mongo.tf

@@ -20,8 +20,8 @@ resource "datadog_monitor" "mongodb_replicaset_state" {
 
   notify_no_data      = true
   renotify_interval   = 0
-  evaluation_delay    = "${var.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true

inputs.tf

@@ -1,98 +0,0 @@
-variable "hno_escalation_group" {}
-variable "ho_escalation_group" {}
-
-variable env {}
-variable region {}
-
-##linux
-variable "dd_system" {
-  default = "disabled"
-}
-
-variable "linux_basics_config" {
-  type = "map"
-
-  default = {
-    notify_no_data = false
-    delay          = 900
-  }
-}
-
-variable "dd_custom_cpu" {
-  type = "map"
-
-  default = {
-    status = "disabled"
-  }
-}
-
-#cpu threshold
-
-variable "cpu_5_critical" {
-  default = 95
-}
-
-variable "cpu_15_critical" {
-  default = 80
-}
-
-## RDS
-variable "dd_aws_rds" {
-  default = "disabled"
-}
-
-variable "rds_config" {
-  type = "map"
-
-  default = {
-    notify_no_data = false
-    delay          = 900
-  }
-}
-
-variable "rds_cpu_threshold" {
-  type = "map"
-
-  default = {
-    warning  = 80
-    critical = 90
-  }
-}
-
-variable "rds_mem_threshold" {
-  default = {
-    warning  = 20
-    critical = 10
-  }
-}
-
-##apache nginx php
-variable "dd_nginx" {
-  default = "disabled"
-}
-
-variable "dd_php_fpm" {
-  default = "disabled"
-}
-
-variable "dd_apache" {
-  default = "disabled"
-}
-
-variable "apache_nginx_fpm_config" {
-  type = "map"
-
-  default = {
-    notify_no_data = false
-    delay          = 900
-  }
-}
-
-variable "php_fpm_busy_threshold" {
-  type = "map"
-
-  default = {
-    warning  = 0.8
-    critical = 0.9
-  }
-}

middleware/apache/README.md

@@ -17,7 +17,7 @@ Purpose
 -------
 Creates a DataDog monitors with the following checks :
 
-* Apache process
+* Apache connect
 
 Inputs
 ------
@@ -26,8 +26,8 @@ Inputs
 |------|-------------|:----:|:-----:|:-----:|
 | apache_connect_message | Custom message for Apache process monitor | string | `` | no |
 | apache_connect_silenced | Groups to mute for Apache process monitor | map | `<map>` | 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 |
+| message | Message sent when an alert is triggered | string | - | yes |

middleware/apache/inputs.tf

@@ -5,7 +5,7 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
   default     = 15
 }

middleware/apache/monitors-apache.tf

@@ -23,8 +23,8 @@ resource "datadog_monitor" "datadog_apache_process" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0

middleware/nginx/README.md

@@ -17,7 +17,7 @@ Purpose
 -------
 Creates a DataDog monitors with the following checks :
 
-* Nginx process
+* Nginx connect
 
 Inputs
 ------
@@ -25,9 +25,9 @@ Inputs
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no |
+| 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 |
 | nginx_connect_message | Custom message for Nginx process monitor | string | `` | no |
-| nginx_connect_silenced | Groups to mute for Nginx process monitor | map | `<map>` | no |
+| nginx_connect_silenced | Groups to mute for Nginx process monitor | map | `<map>` | no |

middleware/nginx/inputs.tf

@@ -5,7 +5,7 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
   default     = 15
 }

middleware/nginx/monitors-nginx.tf

@@ -23,8 +23,8 @@ resource "datadog_monitor" "datadog_nginx_process" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0

middleware/php-fpm/README.md

@@ -17,7 +17,7 @@ Purpose
 -------
 Creates a DataDog monitors with the following checks :
 
-* PHP FPM process
+* PHP FPM connect
 * PHP FPM load
 
 Inputs
@@ -26,8 +26,7 @@ Inputs
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay_metric | Delay in seconds for the metric evaluation | string | `600` | no |
-| evaluation_delay_service | Delay in seconds for the metric evaluation | string | `15` | no |
+| 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 |
@@ -36,4 +35,4 @@ Inputs
 | php_fpm_busy_threshold_critical | php fpm busy critical threshold | string | `0.9` | no |
 | php_fpm_busy_threshold_warning | php fpm busy warning threshold | string | `0.8` | no |
 | php_fpm_connect_message | Custom message for PHP FPM process monitor | string | `` | no |
-| php_fpm_connect_silenced | Groups to mute for PHP FPM process monitor | map | `<map>` | no |
+| php_fpm_connect_silenced | Groups to mute for PHP FPM process monitor | map | `<map>` | no |

middleware/php-fpm/inputs.tf

@@ -5,16 +5,11 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay_service" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
   default     = 15
 }
 
-variable "evaluation_delay_metric" {
-  description = "Delay in seconds for the metric evaluation"
-  default     = 600
-}
-
 variable "message" {
   description = "Message sent when an alert is triggered"
 }

middleware/php-fpm/monitors-fpm.tf

@@ -26,8 +26,8 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay_metric}"
-  new_host_delay      = "${var.evaluation_delay_metric}"
+  evaluation_delay    = "${var.delay_metric}"
+  new_host_delay      = "${var.delay_metric}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
@@ -57,8 +57,8 @@ resource "datadog_monitor" "datadog_fpm_process" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay_service}"
-  new_host_delay      = "${var.evaluation_delay_service}"
+  evaluation_delay    = "${var.delay_service}"
+  new_host_delay      = "${var.delay_service}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0

system/generic/README.md

@@ -30,7 +30,7 @@ Inputs
 | cpu_high_threshold_warning | CPU high warning threshold | string | `80` | no |
 | cpu_high_timeframe | CPU high timeframe | string | `last_5m` | no |
 | environment | Architecture Environment | string | - | yes |
-| evaluation_delay | Delay in seconds for the metric evaluation | string | `600` | no |
+| 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 |

system/generic/inputs.tf

@@ -5,9 +5,9 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "evaluation_delay" {
+variable "delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 600
+  default     = 15
 }
 
 variable "message" {

system/generic/monitors-system.tf

@@ -26,8 +26,8 @@ resource "datadog_monitor" "datadog_cpu_too_high" {
   tags = ["env:${var.environment}", "type:system", "resource:cpu"]
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
@@ -59,8 +59,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.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
@@ -92,8 +92,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.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
@@ -125,8 +125,8 @@ resource "datadog_monitor" "datadog_free_memory" {
   tags = ["env:${var.environment}", "type:system", "resource:memory"]
 
   notify_no_data      = true
-  evaluation_delay    = "${var.evaluation_delay}"
-  new_host_delay      = "${var.evaluation_delay}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0