diff --git a/middleware/php-fpm/README.md b/middleware/php-fpm/README.md index 4b4ab24..f7b5a38 100644 --- a/middleware/php-fpm/README.md +++ b/middleware/php-fpm/README.md @@ -48,8 +48,8 @@ Creates DataDog monitors with the following checks: | Name | Description | |------|-------------| -| datadog_fpm_process_id | id for monitor datadog_fpm_process | -| datadog_php_fpm_connect_idle_id | id for monitor datadog_php_fpm_connect_idle | +| php_fpm_connect_id | id for monitor php_fpm_connect | +| php_fpm_connect_idle_id | id for monitor php_fpm_connect_idle | ## Related documentation diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf index 15ce0d1..50facf9 100644 --- a/middleware/php-fpm/monitors-fpm.tf +++ b/middleware/php-fpm/monitors-fpm.tf @@ -1,4 +1,4 @@ -resource "datadog_monitor" "datadog_fpm_process" { +resource "datadog_monitor" "php_fpm_connect" { count = "${var.php_fpm_connect_enabled ? 1 : 0}" name = "[${var.environment}] Php-fpm ping url does not respond" message = "${coalesce(var.php_fpm_connect_message, var.message)}" @@ -29,7 +29,7 @@ resource "datadog_monitor" "datadog_fpm_process" { tags = ["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform", "${var.php_fpm_connect_extra_tags}"] } -resource "datadog_monitor" "datadog_php_fpm_connect_idle" { +resource "datadog_monitor" "php_fpm_connect_idle" { count = "${var.php_fpm_busy_enabled ? 1 : 0}" name = "[${var.environment}] Php-fpm busy worker {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" message = "${coalesce(var.php_fpm_busy_message, var.message)}" diff --git a/middleware/php-fpm/outputs.tf b/middleware/php-fpm/outputs.tf index f70420c..5aa48d2 100644 --- a/middleware/php-fpm/outputs.tf +++ b/middleware/php-fpm/outputs.tf @@ -1,9 +1,9 @@ -output "datadog_fpm_process_id" { - description = "id for monitor datadog_fpm_process" - value = "${datadog_monitor.datadog_fpm_process.*.id}" +output "php_fpm_connect_id" { + description = "id for monitor php_fpm_connect" + value = "${datadog_monitor.php_fpm_connect.*.id}" } -output "datadog_php_fpm_connect_idle_id" { - description = "id for monitor datadog_php_fpm_connect_idle" - value = "${datadog_monitor.datadog_php_fpm_connect_idle.*.id}" +output "php_fpm_connect_idle_id" { + description = "id for monitor php_fpm_connect_idle" + value = "${datadog_monitor.php_fpm_connect_idle.*.id}" }