Merged in MON-290-monitors-for-php-fpm (pull request #131)

MON-290 update php busy worker monitor

Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
Approved-by: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Approved-by: Jean-Philippe LAINÉ <jean-philippe.laine@fr.clara.net>
Approved-by: gauthierampe <gauthier.ampe@fr.clara.net>
This commit is contained in:
Quentin Manfroi 2018-08-30 14:15:36 +00:00
commit 447bd42ed1
3 changed files with 9 additions and 9 deletions

View File

@ -33,8 +33,8 @@ Creates DataDog monitors with the following checks:
| php_fpm_busy_extra_tags | Extra tags for PHP FPM busy worker monitor | list | `<list>` | 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 | `<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_threshold_critical | php fpm busy critical threshold | string | `90` | no |
| php_fpm_busy_threshold_warning | php fpm busy warning threshold | string | `80` | no |
| php_fpm_busy_time_aggregator | Monitor aggregator for PHP FPM busy worker [available values: min, max or avg] | string | `avg` | 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_enabled | Flag to enable PHP FPM process monitor | string | `true` | no |

View File

@ -69,12 +69,12 @@ variable "php_fpm_busy_timeframe" {
variable "php_fpm_busy_threshold_warning" {
description = "php fpm busy warning threshold"
default = 0.8
default = 80
}
variable "php_fpm_busy_threshold_critical" {
description = "php fpm busy critical threshold"
default = 0.9
default = 90
}
variable "php_fpm_connect_silenced" {

View File

@ -7,10 +7,10 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
query = <<EOF
${var.php_fpm_busy_time_aggregator}(${var.php_fpm_busy_timeframe}): (
avg:php_fpm.processes.active${module.filter-tags.query_alert} by {region, host} /
( avg:php_fpm.processes.idle${module.filter-tags.query_alert} by {region, host} +
avg:php_fpm.processes.active${module.filter-tags.query_alert} by {region, host} )
) > ${var.php_fpm_busy_threshold_critical}
avg:php_fpm.processes.active${module.filter-tags.query_alert} by {host, pool} /
( avg:php_fpm.processes.idle${module.filter-tags.query_alert} by {host, pool} +
avg:php_fpm.processes.active${module.filter-tags.query_alert} by {host, pool} )
) * 100 > ${var.php_fpm_busy_threshold_critical}
EOF
thresholds {
@ -18,7 +18,7 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
critical = "${var.php_fpm_busy_threshold_critical}"
}
notify_no_data = true
notify_no_data = false
evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
notify_audit = false