wbyc/terraform-datadog-old-monitors
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MON-290 fix naming

Browse Source
This commit is contained in:
Quentin Manfroi 2018-09-11 16:02:50 +02:00
parent c3ef50e1b9
commit 82175d7205
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/php-fpm/README.md
View File

@ -48,8 +48,8 @@ Creates DataDog monitors with the following checks:
| Name | Description | | Name | Description |
|------|-------------| |------|-------------|
| datadog_fpm_process_id | id for monitor datadog_fpm_process | | php_fpm_connect_id | id for monitor php_fpm_connect |
| datadog_php_fpm_connect_idle_id | id for monitor datadog_php_fpm_connect_idle | | php_fpm_connect_idle_id | id for monitor php_fpm_connect_idle |
## Related documentation ## Related documentation

4
middleware/php-fpm/monitors-fpm.tf
View File

@ -1,4 +1,4 @@
resource "datadog_monitor" "datadog_fpm_process" { resource "datadog_monitor" "php_fpm_connect" {
count = "${var.php_fpm_connect_enabled ? 1 : 0}" count = "${var.php_fpm_connect_enabled ? 1 : 0}"
name = "[${var.environment}] Php-fpm ping url does not respond" name = "[${var.environment}] Php-fpm ping url does not respond"
message = "${coalesce(var.php_fpm_connect_message, var.message)}" 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}"] 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}" 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}}" 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)}" message = "${coalesce(var.php_fpm_busy_message, var.message)}"

12
middleware/php-fpm/outputs.tf
View File

@ -1,9 +1,9 @@
output "datadog_fpm_process_id" { output "php_fpm_connect_id" {
description = "id for monitor datadog_fpm_process" description = "id for monitor php_fpm_connect"
value = "${datadog_monitor.datadog_fpm_process.*.id}" value = "${datadog_monitor.php_fpm_connect.*.id}"
} }
output "datadog_php_fpm_connect_idle_id" { output "php_fpm_connect_idle_id" {
description = "id for monitor datadog_php_fpm_connect_idle" description = "id for monitor php_fpm_connect_idle"
value = "${datadog_monitor.datadog_php_fpm_connect_idle.*.id}" value = "${datadog_monitor.php_fpm_connect_idle.*.id}"
} }