diff --git a/databases/mysql/README.md b/databases/mysql/README.md index 882c1a1..a111f3c 100644 --- a/databases/mysql/README.md +++ b/databases/mysql/README.md @@ -26,14 +26,18 @@ Inputs | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| delay | Delay in seconds for the metric evaluation | string | `900` | no | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Environment | string | - | yes | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | mysql_connection_threshold_critical | Maximum critical acceptable percent of connections | string | `80` | no | | mysql_connection_threshold_warning | Maximum warning acceptable percent of connections | string | `70` | no | +| mysql_connection_silenced | Groups to mute mysql connection monitor | map | `` | no | +| mysql_connection_message | Custom message for MySQL connection monitor | string | `` | no | | mysql_thread_threshold_critical | Maximum critical acceptable number of threads | string | `500` | no | | mysql_thread_threshold_warning | Maximum warning acceptable number of threads | string | `400` | no | +| mysql_thread_silenced | Groups to mute mysql threads monitor | map | `` | no | +| mysql_thread_message | Custom message for MySQL thread monitor | string | `` | no | | message | Message sent when a monitor is triggered | string | - | yes | Related documentation diff --git a/databases/mysql/mon-mysql.tf b/databases/mysql/mon-mysql.tf index 9ce75cc..0c8b752 100644 --- a/databases/mysql/mon-mysql.tf +++ b/databases/mysql/mon-mysql.tf @@ -6,10 +6,10 @@ data "template_file" "filter" { } } -resource "datadog_monitor" "mysql_connections_15min" { - name = "[${var.environment}] Mysql Connections > {{#is_alert}}{{threshold}}%{{/is_alert}}{{#is_warning}}{{warn_threshold}}%{{/is_warning}} ({{value}}%)" - message = "${var.message}" - type = "query alert" +resource "datadog_monitor" "mysql_connection_too_high" { + name = "[${var.environment}] Mysql Connections {{comparator}} {{#is_alert}}{{threshold}}%{{/is_alert}}{{#is_warning}}{{warn_threshold}}%{{/is_warning}} ({{value}}%)" + message = "${coalesce(var.mysql_connection_message, var.message)}" + type = "metric alert" query = <