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

MON-191 - Space aggregator hard coded for mongodb, php-fpm and systemd monitors

Browse Source
This commit is contained in:
Alexandre Gaillet 2018-05-23 11:13:01 +02:00
parent 6300ed87e8
commit 9a26a51284
9 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/mongodb/README.md
View File

@ -79,7 +79,7 @@ Inputs
| filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
| filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
| message | Message sent when an alert is triggered | string | - | yes | | message | Message sent when an alert is triggered | string | - | yes |
| mongodb_replicaset_aggregator | Monitor aggregator for Mongodb replicaset [available values: min, max, sum or avg] | string | `avg` | no | | mongodb_replicaset_time_aggregator | Monitor aggregator for Mongodb replicaset [available values: min, max or avg] | string | `avg` | no |
| mongodb_replicaset_message | Custom message for Mongodb replicaset monitor | string | `` | no | | mongodb_replicaset_message | Custom message for Mongodb replicaset monitor | string | `` | no |
| mongodb_replicaset_silenced | Groups to mute for Mongodb replicaset monitor | map | `<map>` | no | | mongodb_replicaset_silenced | Groups to mute for Mongodb replicaset monitor | map | `<map>` | no |
| mongodb_replicaset_timeframe | Monitor timeframe for Mongodb replicaset [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | mongodb_replicaset_timeframe | Monitor timeframe for Mongodb replicaset [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |

4
databases/mongodb/inputs.tf
View File

@ -36,8 +36,8 @@ variable "mongodb_replicaset_message" {
default = "" default = ""
} }
variable "mongodb_replicaset_aggregator" { variable "mongodb_replicaset_time_aggregator" {
description = "Monitor aggregator for Mongodb replicaset [available values: min, max, sum or avg]" description = "Monitor aggregator for Mongodb replicaset [available values: min, max or avg]"
type = "string" type = "string"
default = "avg" default = "avg"
} }

4
databases/mongodb/monitors-mongo.tf
View File

@ -11,8 +11,8 @@ resource "datadog_monitor" "mongodb_replicaset_state" {
message = "${coalesce(var.mongodb_replicaset_message, var.message)}" message = "${coalesce(var.mongodb_replicaset_message, var.message)}"
query = <<EOF query = <<EOF
${var.mongodb_replicaset_aggregator}(${var.mongodb_replicaset_timeframe}): ( ${var.mongodb_replicaset_time_aggregator}(${var.mongodb_replicaset_timeframe}): (
${var.mongodb_replicaset_aggregator}:mongodb.replset.health{${data.template_file.filter.rendered}} by {region,replset_name} avg:mongodb.replset.health{${data.template_file.filter.rendered}} by {region,replset_name}
) < 1 ) < 1
EOF EOF

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

@ -30,7 +30,7 @@ Inputs
| filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
| filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
| message | Message sent when an alert is triggered | string | - | yes | | message | Message sent when an alert is triggered | string | - | yes |
| php_fpm_busy_aggregator | Monitor aggregator for PHP FPM busy worker [available values: min, max, sum or avg] | string | `avg` | no | | php_fpm_busy_time_aggregator | Monitor aggregator for PHP FPM busy worker [available values: min, max or avg] | string | `avg` | no |
| php_fpm_busy_message | Custom message for PHP FPM busy worker monitor | string | `` | no | | php_fpm_busy_message | Custom message for PHP FPM busy worker monitor | string | `` | no |
| php_fpm_busy_silenced | Groups to mute for PHP FPM busy worker monitor | map | `<map>` | no | | php_fpm_busy_silenced | Groups to mute for PHP FPM busy worker monitor | map | `<map>` | no |
| php_fpm_busy_threshold_critical | php fpm busy critical threshold | string | `0.9` | no | | php_fpm_busy_threshold_critical | php fpm busy critical threshold | string | `0.9` | no |

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

@ -38,8 +38,8 @@ variable "php_fpm_busy_message" {
default = "" default = ""
} }
variable "php_fpm_busy_aggregator" { variable "php_fpm_busy_time_aggregator" {
description = "Monitor aggregator for PHP FPM busy worker [available values: min, max, sum or avg]" description = "Monitor aggregator for PHP FPM busy worker [available values: min, max or avg]"
type = "string" type = "string"
default = "avg" default = "avg"
} }

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

@ -13,10 +13,10 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
type = "metric alert" type = "metric alert"
query = <<EOF query = <<EOF
${var.php_fpm_busy_aggregator}(${var.php_fpm_busy_timeframe}): ( ${var.php_fpm_busy_time_aggregator}(${var.php_fpm_busy_timeframe}): (
${var.php_fpm_busy_aggregator}:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} / avg:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} /
( ${var.php_fpm_busy_aggregator}:php_fpm.processes.idle{${data.template_file.filter.rendered}} by {region, host} + ( avg:php_fpm.processes.idle{${data.template_file.filter.rendered}} by {region, host} +
${var.php_fpm_busy_aggregator}:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} ) avg:php_fpm.processes.active{${data.template_file.filter.rendered}} by {region, host} )
) > ${var.php_fpm_busy_threshold_critical} ) > ${var.php_fpm_busy_threshold_critical}
EOF EOF

10
system/generic/README.md
View File

@ -28,13 +28,13 @@ Inputs
| Name | Description | Type | Default | Required | | Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:| |------|-------------|:----:|:-----:|:-----:|
| cpu_high_aggregator | Monitor aggregator for CPU high [available values: min, max, sum or avg] | string | `min` | no | | cpu_high_time_aggregator | Monitor aggregator for CPU high [available values: min, max or avg] | string | `min` | no |
| cpu_high_message | Custom message for CPU high monitor | string | `` | no | | cpu_high_message | Custom message for CPU high monitor | string | `` | no |
| cpu_high_silenced | Groups to mute for CPU high monitor | map | `<map>` | no | | cpu_high_silenced | Groups to mute for CPU high monitor | map | `<map>` | no |
| cpu_high_threshold_critical | CPU high critical threshold | string | `95` | no | | cpu_high_threshold_critical | CPU high critical threshold | string | `95` | no |
| cpu_high_threshold_warning | CPU high warning threshold | string | `80` | no | | cpu_high_threshold_warning | CPU high warning threshold | string | `80` | no |
| cpu_high_timeframe | Monitor timeframe for CPU high [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | cpu_high_timeframe | Monitor timeframe for CPU high [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
| cpu_load_aggregator | Monitor aggregator for CPU load ratio [available values: min, max, sum or avg] | string | `min` | no | | cpu_load_time_aggregator | Monitor aggregator for CPU load ratio [available values: min, max or avg] | string | `min` | no |
| cpu_load_message | Custom message for CPU load ratio monitor | string | `` | no | | cpu_load_message | Custom message for CPU load ratio monitor | string | `` | no |
| cpu_load_silenced | Groups to mute for CPU load ratio monitor | map | `<map>` | no | | cpu_load_silenced | Groups to mute for CPU load ratio monitor | map | `<map>` | no |
| cpu_load_threshold_critical | CPU load ratio critical threshold | string | `4` | no | | cpu_load_threshold_critical | CPU load ratio critical threshold | string | `4` | no |
@ -44,19 +44,19 @@ Inputs
| environment | Architecture Environment | string | - | yes | | environment | Architecture Environment | string | - | yes |
| filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
| filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
| free_disk_inodes_aggregator | Monitor aggregator for Free disk inodes [available values: min, max, sum or avg] | string | `min` | no | | free_disk_inodes_time_aggregator | Monitor aggregator for Free disk inodes [available values: min, max or avg] | string | `min` | no |
| free_disk_inodes_message | Custom message for Free disk inodes monitor | string | `` | no | | free_disk_inodes_message | Custom message for Free disk inodes monitor | string | `` | no |
| free_disk_inodes_silenced | Groups to mute for Free disk inodes monitor | map | `<map>` | no | | free_disk_inodes_silenced | Groups to mute for Free disk inodes monitor | map | `<map>` | no |
| free_disk_inodes_threshold_critical | Free disk space critical threshold | string | `5` | no | | free_disk_inodes_threshold_critical | Free disk space critical threshold | string | `5` | no |
| free_disk_inodes_threshold_warning | Free disk space warning threshold | string | `10` | no | | free_disk_inodes_threshold_warning | Free disk space warning threshold | string | `10` | no |
| free_disk_inodes_timeframe | Monitor timeframe for Free disk inodes [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | free_disk_inodes_timeframe | Monitor timeframe for Free disk inodes [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
| free_disk_space_aggregator | Monitor aggregator for Free diskspace [available values: min, max, sum or avg] | string | `min` | no | | free_disk_space_time_aggregator | Monitor aggregator for Free diskspace [available values: min, max or avg] | string | `min` | no |
| free_disk_space_message | Custom message for Free diskspace monitor | string | `` | no | | free_disk_space_message | Custom message for Free diskspace monitor | string | `` | no |
| free_disk_space_silenced | Groups to mute for Free diskspace monitor | map | `<map>` | no | | free_disk_space_silenced | Groups to mute for Free diskspace monitor | map | `<map>` | no |
| free_disk_space_threshold_critical | Free disk space critical threshold | string | `5` | no | | free_disk_space_threshold_critical | Free disk space critical threshold | string | `5` | no |
| free_disk_space_threshold_warning | Free disk space warning threshold | string | `10` | no | | free_disk_space_threshold_warning | Free disk space warning threshold | string | `10` | no |
| free_disk_space_timeframe | Monitor timeframe for Free diskspace [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | free_disk_space_timeframe | Monitor timeframe for Free diskspace [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
| free_memory_aggregator | Monitor aggregator for Free memory [available values: min, max, sum or avg] | string | `min` | no | | free_memory_time_aggregator | Monitor aggregator for Free memory [available values: min, max or avg] | string | `min` | no |
| free_memory_message | Custom message for Free memory monitor | string | - | yes | | free_memory_message | Custom message for Free memory monitor | string | - | yes |
| free_memory_silenced | Groups to mute for Free memory monitor | map | `<map>` | no | | free_memory_silenced | Groups to mute for Free memory monitor | map | `<map>` | no |
| free_memory_threshold_critical | Free disk space critical threshold | string | `5` | no | | free_memory_threshold_critical | Free disk space critical threshold | string | `5` | no |

20
system/generic/inputs.tf
View File

@ -38,8 +38,8 @@ variable "cpu_high_message" {
default = "" default = ""
} }
variable "cpu_high_aggregator" { variable "cpu_high_time_aggregator" {
description = "Monitor aggregator for CPU high [available values: min, max, sum or avg]" description = "Monitor aggregator for CPU high [available values: min, max or avg]"
type = "string" type = "string"
default = "min" default = "min"
} }
@ -72,8 +72,8 @@ variable "cpu_load_message" {
default = "" default = ""
} }
variable "cpu_load_aggregator" { variable "cpu_load_time_aggregator" {
description = "Monitor aggregator for CPU load ratio [available values: min, max, sum or avg]" description = "Monitor aggregator for CPU load ratio [available values: min, max or avg]"
type = "string" type = "string"
default = "min" default = "min"
} }
@ -106,8 +106,8 @@ variable "free_disk_space_message" {
default = "" default = ""
} }
variable "free_disk_space_aggregator" { variable "free_disk_space_time_aggregator" {
description = "Monitor aggregator for Free diskspace [available values: min, max, sum or avg]" description = "Monitor aggregator for Free diskspace [available values: min, max or avg]"
type = "string" type = "string"
default = "min" default = "min"
} }
@ -140,8 +140,8 @@ variable "free_disk_inodes_message" {
default = "" default = ""
} }
variable "free_disk_inodes_aggregator" { variable "free_disk_inodes_time_aggregator" {
description = "Monitor aggregator for Free disk inodes [available values: min, max, sum or avg]" description = "Monitor aggregator for Free disk inodes [available values: min, max or avg]"
type = "string" type = "string"
default = "min" default = "min"
} }
@ -173,8 +173,8 @@ variable "free_memory_message" {
type = "string" type = "string"
} }
variable "free_memory_aggregator" { variable "free_memory_time_aggregator" {
description = "Monitor aggregator for Free memory [available values: min, max, sum or avg]" description = "Monitor aggregator for Free memory [available values: min, max or avg]"
type = "string" type = "string"
default = "min" default = "min"
} }

26
system/generic/monitors-system.tf
View File

@ -11,7 +11,7 @@ resource "datadog_monitor" "datadog_cpu_too_high" {
message = "${coalesce(var.cpu_high_message, var.message)}" message = "${coalesce(var.cpu_high_message, var.message)}"
query = <<EOF query = <<EOF
${var.cpu_high_aggregator}(${var.cpu_high_timeframe}): ( ${var.cpu_high_time_aggregator}(${var.cpu_high_timeframe}): (
100 - avg:system.cpu.idle{${data.template_file.filter.rendered}} by {region,host} 100 - avg:system.cpu.idle{${data.template_file.filter.rendered}} by {region,host}
) > ${var.cpu_high_threshold_critical} ) > ${var.cpu_high_threshold_critical}
EOF EOF
@ -42,9 +42,9 @@ resource "datadog_monitor" "datadog_load_too_high" {
message = "${coalesce(var.cpu_load_message, var.message)}" message = "${coalesce(var.cpu_load_message, var.message)}"
query = <<EOF query = <<EOF
${var.cpu_load_aggregator}(${var.cpu_load_timeframe}): ( ${var.cpu_load_time_aggregator}(${var.cpu_load_timeframe}): (
${var.cpu_load_aggregator}:system.load.5{${data.template_file.filter.rendered}} by {region,host} / avg:system.load.5{${data.template_file.filter.rendered}} by {region,host} /
${var.cpu_load_aggregator}:system.core.count{${data.template_file.filter.rendered}} by {region,host} avg:system.core.count{${data.template_file.filter.rendered}} by {region,host}
) > ${var.cpu_load_threshold_critical} ) > ${var.cpu_load_threshold_critical}
EOF EOF
@ -74,9 +74,9 @@ resource "datadog_monitor" "datadog_free_disk_space_too_low" {
message = "${coalesce(var.free_disk_space_message, var.message)}" message = "${coalesce(var.free_disk_space_message, var.message)}"
query = <<EOF query = <<EOF
${var.free_disk_space_aggregator}(${var.free_disk_space_timeframe}): ( ${var.free_disk_space_time_aggregator}(${var.free_disk_space_timeframe}): (
${var.free_disk_space_aggregator}:system.disk.free{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} / avg:system.disk.free{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} /
${var.free_disk_space_aggregator}:system.disk.total{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} * 100 avg:system.disk.total{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} * 100
) < ${var.free_disk_space_threshold_critical} ) < ${var.free_disk_space_threshold_critical}
EOF EOF
@ -106,9 +106,9 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" {
message = "${coalesce(var.free_disk_inodes_message, var.message)}" message = "${coalesce(var.free_disk_inodes_message, var.message)}"
query = <<EOF query = <<EOF
${var.free_disk_inodes_aggregator}(${var.free_disk_inodes_timeframe}): ( ${var.free_disk_inodes_time_aggregator}(${var.free_disk_inodes_timeframe}): (
${var.free_disk_inodes_aggregator}:system.fs.inodes.free{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} / avg:system.fs.inodes.free{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} /
${var.free_disk_inodes_aggregator}:system.fs.inodes.total{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} * 100 avg:system.fs.inodes.total{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} * 100
) < ${var.free_disk_inodes_threshold_critical} ) < ${var.free_disk_inodes_threshold_critical}
EOF EOF
@ -138,9 +138,9 @@ resource "datadog_monitor" "datadog_free_memory" {
message = "${var.free_memory_message}" message = "${var.free_memory_message}"
query = <<EOF query = <<EOF
${var.free_memory_aggregator}(${var.free_memory_timeframe}): ( ${var.free_memory_time_aggregator}(${var.free_memory_timeframe}): (
${var.free_memory_aggregator}:system.mem.free{${data.template_file.filter.rendered}} by {region,host} / avg:system.mem.free{${data.template_file.filter.rendered}} by {region,host} /
${var.free_memory_aggregator}:system.mem.total{${data.template_file.filter.rendered}} by {region,host} * 100 avg:system.mem.total{${data.template_file.filter.rendered}} by {region,host} * 100
) < ${var.free_memory_threshold_critical} ) < ${var.free_memory_threshold_critical}
EOF EOF