diff --git a/middleware/php-fpm/README.md b/middleware/php-fpm/README.md index 85b6e3e..49d63eb 100644 --- a/middleware/php-fpm/README.md +++ b/middleware/php-fpm/README.md @@ -30,6 +30,7 @@ Inputs | 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 | +| php_fpm_busy_aggregator | Monitor aggregator for PHP FPM busy worker [available values: min, max, sum or avg] | string | `avg` | 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 b88d5f5..d9946c0 100644 --- a/middleware/php-fpm/inputs.tf +++ b/middleware/php-fpm/inputs.tf @@ -38,6 +38,12 @@ variable "php_fpm_busy_message" { default = "" } +variable "php_fpm_busy_aggregator" { + description = "Monitor aggregator for PHP FPM busy worker [available values: min, max, sum or avg]" + type = "string" + default = "avg" +} + variable "php_fpm_busy_timeframe" { description = "Monitor timeframe for PHP FPM busy worker [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" type = "string" diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf index f0d9e90..51e8ec0 100644 --- a/middleware/php-fpm/monitors-fpm.tf +++ b/middleware/php-fpm/monitors-fpm.tf @@ -13,10 +13,10 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" { type = "metric alert" query = < ${var.php_fpm_busy_threshold_critical} EOF