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

MON-96 rename middleware status variables

Browse Source
This commit is contained in:
Quentin Manfroi 2018-03-22 20:36:55 +01:00
parent 50aede5330
commit 999019339c
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/apache/inputs.tf
View File

@ -16,13 +16,13 @@ variable "message" {
# Apache Middleware specific # Apache Middleware specific
variable "apache_process_silenced" { variable "apache_connect_silenced" {
description = "Groups to mute for Apache process monitor" description = "Groups to mute for Apache process monitor"
type = "map" type = "map"
default = {} default = {}
} }
variable "apache_process_message" { variable "apache_connect_message" {
description = "Custom message for Apache process monitor" description = "Custom message for Apache process monitor"
type = "string" type = "string"
default = "" default = ""

4
middleware/apache/monitors-apache.tf
View File

@ -1,6 +1,6 @@
resource "datadog_monitor" "datadog_apache_process" { resource "datadog_monitor" "datadog_apache_process" {
name = "[${var.environment}] Can't connect to apache vhost status" 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" 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()" 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 require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
silenced = "${var.apache_process_silenced}" silenced = "${var.apache_connect_silenced}"
tags = ["env:${var.environment}", "resource:apache"] tags = ["env:${var.environment}", "resource:apache"]
} }

4
middleware/nginx/inputs.tf
View File

@ -16,13 +16,13 @@ variable "message" {
# Nginx Middleware specific # Nginx Middleware specific
variable "nginx_process_silenced" { variable "nginx_connect_silenced" {
description = "Groups to mute for Nginx process monitor" description = "Groups to mute for Nginx process monitor"
type = "map" type = "map"
default = {} default = {}
} }
variable "nginx_process_message" { variable "nginx_connect_message" {
description = "Custom message for Nginx process monitor" description = "Custom message for Nginx process monitor"
type = "string" type = "string"
default = "" default = ""

4
middleware/nginx/monitors-nginx.tf
View File

@ -1,6 +1,6 @@
resource "datadog_monitor" "datadog_nginx_process" { resource "datadog_monitor" "datadog_nginx_process" {
name = "[${var.environment}] Can't connect to nginx vhost status" 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" 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()" 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 require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
silenced = "${var.nginx_process_silenced}" silenced = "${var.nginx_connect_silenced}"
tags = ["env:${var.environment}", "resource:nginx"] tags = ["env:${var.environment}", "resource:nginx"]
} }

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

@ -53,13 +53,13 @@ variable "php_fpm_busy_threshold_critical" {
default = 0.9 default = 0.9
} }
variable "php_fpm_process_silenced" { variable "php_fpm_connect_silenced" {
description = "Groups to mute for PHP FPM process monitor" description = "Groups to mute for PHP FPM process monitor"
type = "map" type = "map"
default = {} default = {}
} }
variable "php_fpm_process_message" { variable "php_fpm_connect_message" {
description = "Custom message for PHP FPM process monitor" description = "Custom message for PHP FPM process monitor"
type = "string" type = "string"
default = "" default = ""

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

@ -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}}" 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)}"
@ -42,7 +42,7 @@ resource "datadog_monitor" "datadog_php_fpm_process_idle" {
resource "datadog_monitor" "datadog_fpm_process" { resource "datadog_monitor" "datadog_fpm_process" {
name = "[${var.environment}] Can't connect to php-fpm" 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" 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()" 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 require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
silenced = "${var.php_fpm_process_silenced}" silenced = "${var.php_fpm_connect_silenced}"
tags = ["env:${var.environment}", "resource:php-fpm"] tags = ["env:${var.environment}", "resource:php-fpm"]
} }