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

Merged in MON-168_fix_service_checks_query_syntax (pull request #82)

Browse Source 
MON-168 fix service checks query syntax

Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
Approved-by: Kevin Pecquet <kevin.pecquet@fr.clara.net>
Approved-by: Patrick Decat <patrick.decat@fr.clara.net>
Approved-by: Jérôme Respaut <shr3ps@gmail.com>
Approved-by: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Approved-by: Boris Rousseau <boris.rousseau@morea.fr>
Approved-by: Adrien Broyere <adrien.broyere@fr.clara.net>
Approved-by: Laurent Piroelle <laurent.piroelle@fr.clara.net>
This commit is contained in:
Quentin Manfroi 2018-05-07 16:04:11 +00:00
commit c6b9bcc911
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ resource "datadog_monitor" "datadog_apache_process" {
type = "service check" type = "service check"
query = <<EOF query = <<EOF
"apache.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status() "apache.can_connect".over("${data.template_file.filter.rendered}").by("host","port").last(6).count_by_status()
EOF EOF
thresholds = { thresholds = {

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

@ -13,7 +13,7 @@ resource "datadog_monitor" "datadog_nginx_process" {
type = "service check" type = "service check"
query = <<EOF query = <<EOF
"nginx.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status() "nginx.can_connect".over("${data.template_file.filter.rendered}").by("host","port").last(6).count_by_status()
EOF EOF
thresholds = { thresholds = {

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

@ -26,8 +26,8 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
} }
notify_no_data = true notify_no_data = true
evaluation_delay = "${var.delay_metric}" evaluation_delay = "${var.delay}"
new_host_delay = "${var.delay_metric}" new_host_delay = "${var.delay}"
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
@ -46,7 +46,7 @@ resource "datadog_monitor" "datadog_fpm_process" {
type = "service check" type = "service check"
query = <<EOF query = <<EOF
"php_fpm.can_ping".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status() "php_fpm.can_ping".over("${data.template_file.filter.rendered}").by("host","port").last(6).count_by_status()
EOF EOF
thresholds = { thresholds = {
@ -56,8 +56,8 @@ resource "datadog_monitor" "datadog_fpm_process" {
} }
notify_no_data = true notify_no_data = true
evaluation_delay = "${var.delay_service}" evaluation_delay = "${var.delay}"
new_host_delay = "${var.delay_service}" new_host_delay = "${var.delay}"
renotify_interval = 0 renotify_interval = 0
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0