MON-160 - Php-fpm monitors updated

This commit is contained in:
Alexandre Gaillet 2018-04-27 10:34:15 +02:00 committed by Quentin Manfroi
parent 6276d9364c
commit 01f6dba0d8
3 changed files with 9 additions and 2 deletions

View File

@ -25,8 +25,8 @@ Inputs
| Name | Description | Type | Default | Required | | Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:| |------|-------------|:----:|:-----:|:-----:|
| environment | Architecture Environment | string | - | yes |
| delay | Delay in seconds for the metric evaluation | string | `15` | no | | 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_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 | | 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 |
@ -34,5 +34,6 @@ Inputs
| php_fpm_busy_silenced | Groups to mute for PHP FPM busy worker monitor | map | `<map>` | no | | 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_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_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_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 |

View File

@ -38,6 +38,12 @@ variable "php_fpm_busy_message" {
default = "" 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" { variable "php_fpm_busy_threshold_warning" {
description = "php fpm busy warning threshold" description = "php fpm busy warning threshold"
default = 0.8 default = 0.8

View File

@ -13,7 +13,7 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
type = "metric alert" type = "metric alert"
query = <<EOF 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.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.idle{${data.template_file.filter.rendered}} by {region, host} +
avg:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} ) avg:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} )