From 01f6dba0d8e5112bf0da7e32435ca5279e7d715a Mon Sep 17 00:00:00 2001
From: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Date: Fri, 27 Apr 2018 10:34:15 +0200
Subject: [PATCH] MON-160 - Php-fpm monitors updated

---
 middleware/php-fpm/README.md       | 3 ++-
 middleware/php-fpm/inputs.tf       | 6 ++++++
 middleware/php-fpm/monitors-fpm.tf | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/middleware/php-fpm/README.md b/middleware/php-fpm/README.md
index 0782c56..85b6e3e 100644
--- a/middleware/php-fpm/README.md
+++ b/middleware/php-fpm/README.md
@@ -25,8 +25,8 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| environment | Architecture Environment | string | - | yes |
 | delay | Delay in seconds for the metric evaluation | string | `15` | 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 |
 | message | Message sent when an alert is triggered | string | - | yes |
@@ -34,5 +34,6 @@ Inputs
 | php_fpm_busy_silenced | Groups to mute for PHP FPM busy worker monitor | map | `<map>` | no |
 | 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_busy_timeframe | 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`] | string | `last_10m` | 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 |
diff --git a/middleware/php-fpm/inputs.tf b/middleware/php-fpm/inputs.tf
index 858574b..b88d5f5 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_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"
+  default     = "last_10m"
+}
+
 variable "php_fpm_busy_threshold_warning" {
   description = "php fpm busy warning threshold"
   default     = 0.8
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index a939c95..f0d9e90 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -13,7 +13,7 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
   type = "metric alert"
 
   query = <<EOF
-    avg(last_10m): (
+    avg(${var.php_fpm_busy_timeframe}): (
       avg:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} /
       ( avg:php_fpm.processes.idle{${data.template_file.filter.rendered}} by {region, host} +
        avg:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} )