diff --git a/middleware/apache/inputs.tf b/middleware/apache/inputs.tf index 7d14445..36beec8 100644 --- a/middleware/apache/inputs.tf +++ b/middleware/apache/inputs.tf @@ -16,13 +16,13 @@ variable "message" { # Apache Middleware specific -variable "apache_process_silenced" { +variable "apache_connect_silenced" { description = "Groups to mute for Apache process monitor" type = "map" default = {} } -variable "apache_process_message" { +variable "apache_connect_message" { description = "Custom message for Apache process monitor" type = "string" default = "" diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf index 4a9d79f..139a052 100644 --- a/middleware/apache/monitors-apache.tf +++ b/middleware/apache/monitors-apache.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "datadog_apache_process" { name = "[${var.environment}] Can't connect to apache vhost status" - message = "${coalesce(var.apache_process_message, var.message)}" + message = "${coalesce(var.apache_connect_message, var.message)}" type = "service check" query = "\"apache.can_connect\".over(\"dd_monitoring:enabled\",\"dd_apache:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()" @@ -22,7 +22,7 @@ resource "datadog_monitor" "datadog_apache_process" { require_full_window = true no_data_timeframe = 20 - silenced = "${var.apache_process_silenced}" + silenced = "${var.apache_connect_silenced}" tags = ["env:${var.environment}", "resource:apache"] } diff --git a/middleware/nginx/inputs.tf b/middleware/nginx/inputs.tf index e8fea80..8ab7f01 100644 --- a/middleware/nginx/inputs.tf +++ b/middleware/nginx/inputs.tf @@ -16,13 +16,13 @@ variable "message" { # Nginx Middleware specific -variable "nginx_process_silenced" { +variable "nginx_connect_silenced" { description = "Groups to mute for Nginx process monitor" type = "map" default = {} } -variable "nginx_process_message" { +variable "nginx_connect_message" { description = "Custom message for Nginx process monitor" type = "string" default = "" diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf index 3b03808..9ab5daf 100644 --- a/middleware/nginx/monitors-nginx.tf +++ b/middleware/nginx/monitors-nginx.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "datadog_nginx_process" { name = "[${var.environment}] Can't connect to nginx vhost status" - message = "${coalesce(var.nginx_process_message, var.message)}" + message = "${coalesce(var.nginx_connect_message, var.message)}" type = "service check" query = "\"nginx.can_connect\".over(\"dd_monitoring:enabled\",\"dd_nginx:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()" @@ -22,7 +22,7 @@ resource "datadog_monitor" "datadog_nginx_process" { require_full_window = true no_data_timeframe = 20 - silenced = "${var.nginx_process_silenced}" + silenced = "${var.nginx_connect_silenced}" tags = ["env:${var.environment}", "resource:nginx"] } diff --git a/middleware/php-fpm/inputs.tf b/middleware/php-fpm/inputs.tf index 83b1efa..49ac556 100644 --- a/middleware/php-fpm/inputs.tf +++ b/middleware/php-fpm/inputs.tf @@ -53,13 +53,13 @@ variable "php_fpm_busy_threshold_critical" { default = 0.9 } -variable "php_fpm_process_silenced" { +variable "php_fpm_connect_silenced" { description = "Groups to mute for PHP FPM process monitor" type = "map" default = {} } -variable "php_fpm_process_message" { +variable "php_fpm_connect_message" { description = "Custom message for PHP FPM process monitor" type = "string" default = "" diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf index aec13b0..52b4a92 100644 --- a/middleware/php-fpm/monitors-fpm.tf +++ b/middleware/php-fpm/monitors-fpm.tf @@ -6,7 +6,7 @@ data "template_file" "filter" { } } -resource "datadog_monitor" "datadog_php_fpm_process_idle" { +resource "datadog_monitor" "datadog_php_fpm_connect_idle" { 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)}" @@ -42,7 +42,7 @@ resource "datadog_monitor" "datadog_php_fpm_process_idle" { resource "datadog_monitor" "datadog_fpm_process" { name = "[${var.environment}] Can't connect to php-fpm" - message = "${coalesce(var.php_fpm_process_message, var.message)}" + message = "${coalesce(var.php_fpm_connect_message, var.message)}" type = "service check" query = "\"php_fpm.can_ping\".over(\"dd_monitoring:enabled\",\"dd_php_fpm:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()" @@ -64,7 +64,7 @@ resource "datadog_monitor" "datadog_fpm_process" { require_full_window = true no_data_timeframe = 20 - silenced = "${var.php_fpm_process_silenced}" + silenced = "${var.php_fpm_connect_silenced}" tags = ["env:${var.environment}", "resource:php-fpm"] }