From 270812f7c54e79165b3ecdfefbbb8fee2daf024b Mon Sep 17 00:00:00 2001 From: Alexandre Gaillet Date: Mon, 25 Feb 2019 18:11:00 +0100 Subject: [PATCH] MON-402 Fix Active connection monitor --- cloud/azure/mysql/README.md | 95 +++++++++++++++-------------- cloud/azure/mysql/inputs.tf | 26 +++++--- cloud/azure/mysql/monitors-mysql.tf | 16 ++--- cloud/azure/mysql/outputs.tf | 6 +- 4 files changed, 76 insertions(+), 67 deletions(-) diff --git a/cloud/azure/mysql/README.md b/cloud/azure/mysql/README.md index 35cf7fe..582437e 100644 --- a/cloud/azure/mysql/README.md +++ b/cloud/azure/mysql/README.md @@ -8,6 +8,8 @@ module "datadog-monitors-cloud-azure-mysql" { environment = "${var.environment}" message = "${module.datadog-message-alerting.alerting-message}" + + total_connection_limit = "${var.total_connection_limit}" } ``` @@ -17,7 +19,7 @@ module "datadog-monitors-cloud-azure-mysql" { Creates DataDog monitors with the following checks: - Mysql Server CPU usage -- Mysql Server has no connection +- Mysql Server has total connection - Mysql Server IO consumption - Mysql Server memory usage - Mysql Server storage @@ -26,50 +28,51 @@ Creates DataDog monitors with the following checks: | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| -| cpu\_usage\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no | -| cpu\_usage\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no | -| cpu\_usage\_message | Custom message for Mysql CPU monitor | string | `""` | no | -| cpu\_usage\_silenced | Groups to mute for Mysql CPU monitor | map | `{}` | no | -| cpu\_usage\_threshold\_critical | Mysql CPU usage in percent (critical threshold) | string | `"90"` | no | -| cpu\_usage\_threshold\_warning | Mysql CPU usage in percent (warning threshold) | string | `"80"` | no | -| cpu\_usage\_time\_aggregator | Monitor aggregator for Mysql CPU [available values: min, max or avg] | string | `"min"` | no | -| cpu\_usage\_timeframe | Monitor timeframe for Mysql CPU [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no | -| environment | Architecture environment | string | n/a | yes | -| evaluation\_delay | Delay in seconds for the metric evaluation | string | `"900"` | 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 | -| free\_storage\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no | -| free\_storage\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no | -| free\_storage\_message | Custom message for Mysql Free Storage monitor | string | `""` | no | -| free\_storage\_silenced | Groups to mute for Mysql Free Storage monitor | map | `{}` | no | -| free\_storage\_threshold\_critical | Mysql Free Storage remaining in percent (critical threshold) | string | `"10"` | no | -| free\_storage\_threshold\_warning | Mysql Free Storage remaining in percent (warning threshold) | string | `"20"` | no | -| free\_storage\_time\_aggregator | Monitor aggregator for Mysql Free Storage [available values: min, max or avg] | string | `"min"` | no | -| free\_storage\_timeframe | Monitor timeframe for Mysql Free Storage [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no | -| io\_consumption\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no | -| io\_consumption\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no | -| io\_consumption\_message | Custom message for Mysql IO consumption monitor | string | `""` | no | -| io\_consumption\_silenced | Groups to mute for Mysql IO consumption monitor | map | `{}` | no | -| io\_consumption\_threshold\_critical | Mysql IO consumption in percent (critical threshold) | string | `"90"` | no | -| io\_consumption\_threshold\_warning | Mysql IO consumption in percent (warning threshold) | string | `"80"` | no | -| io\_consumption\_time\_aggregator | Monitor aggregator for Mysql IO consumption [available values: min, max or avg] | string | `"min"` | no | -| io\_consumption\_timeframe | Monitor timeframe for Mysql IO consumption [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no | -| memory\_usage\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no | -| memory\_usage\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no | -| memory\_usage\_message | Custom message for Mysql memory monitor | string | `""` | no | -| memory\_usage\_silenced | Groups to mute for Mysql memory monitor | map | `{}` | no | -| memory\_usage\_threshold\_critical | Mysql memory usage in percent (critical threshold) | string | `"90"` | no | -| memory\_usage\_threshold\_warning | Mysql memory usage in percent (warning threshold) | string | `"80"` | no | -| memory\_usage\_time\_aggregator | Monitor aggregator for Mysql memory [available values: min, max or avg] | string | `"min"` | no | -| memory\_usage\_timeframe | Monitor timeframe for Mysql memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no | -| message | Message sent when an alert is triggered | string | n/a | yes | -| new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no | -| no\_connection\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no | -| no\_connection\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no | -| no\_connection\_message | Custom message for Mysql no connection monitor | string | `""` | no | -| no\_connection\_silenced | Groups to mute for Mysql no connection monitor | map | `{}` | no | -| no\_connection\_time\_aggregator | Monitor aggregator for Mysql no connection [available values: min, max or avg] | string | `"min"` | no | -| no\_connection\_timeframe | Monitor timeframe for Mysql no connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no | +| cpu_usage_enabled | Flag to enable Mysql status monitor | string | `true` | no | +| cpu_usage_extra_tags | Extra tags for Mysql status monitor | list | `` | no | +| cpu_usage_message | Custom message for Mysql CPU monitor | string | `` | no | +| cpu_usage_silenced | Groups to mute for Mysql CPU monitor | map | `` | no | +| cpu_usage_threshold_critical | Mysql CPU usage in percent (critical threshold) | string | `90` | no | +| cpu_usage_threshold_warning | Mysql CPU usage in percent (warning threshold) | string | `80` | no | +| cpu_usage_time_aggregator | Monitor aggregator for Mysql CPU [available values: min, max or avg] | string | `min` | no | +| cpu_usage_timeframe | Monitor timeframe for Mysql CPU [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | +| environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | 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 | +| free_storage_enabled | Flag to enable Mysql status monitor | string | `true` | no | +| free_storage_extra_tags | Extra tags for Mysql status monitor | list | `` | no | +| free_storage_message | Custom message for Mysql Free Storage monitor | string | `` | no | +| free_storage_silenced | Groups to mute for Mysql Free Storage monitor | map | `` | no | +| free_storage_threshold_critical | Mysql Free Storage remaining in percent (critical threshold) | string | `10` | no | +| free_storage_threshold_warning | Mysql Free Storage remaining in percent (warning threshold) | string | `20` | no | +| free_storage_time_aggregator | Monitor aggregator for Mysql Free Storage [available values: min, max or avg] | string | `min` | no | +| free_storage_timeframe | Monitor timeframe for Mysql Free Storage [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | +| io_consumption_enabled | Flag to enable Mysql status monitor | string | `true` | no | +| io_consumption_extra_tags | Extra tags for Mysql status monitor | list | `` | no | +| io_consumption_message | Custom message for Mysql IO consumption monitor | string | `` | no | +| io_consumption_silenced | Groups to mute for Mysql IO consumption monitor | map | `` | no | +| io_consumption_threshold_critical | Mysql IO consumption in percent (critical threshold) | string | `90` | no | +| io_consumption_threshold_warning | Mysql IO consumption in percent (warning threshold) | string | `80` | no | +| io_consumption_time_aggregator | Monitor aggregator for Mysql IO consumption [available values: min, max or avg] | string | `min` | no | +| io_consumption_timeframe | Monitor timeframe for Mysql IO consumption [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | +| memory_usage_enabled | Flag to enable Mysql status monitor | string | `true` | no | +| memory_usage_extra_tags | Extra tags for Mysql status monitor | list | `` | no | +| memory_usage_message | Custom message for Mysql memory monitor | string | `` | no | +| memory_usage_silenced | Groups to mute for Mysql memory monitor | map | `` | no | +| memory_usage_threshold_critical | Mysql memory usage in percent (critical threshold) | string | `90` | no | +| memory_usage_threshold_warning | Mysql memory usage in percent (warning threshold) | string | `80` | no | +| memory_usage_time_aggregator | Monitor aggregator for Mysql memory [available values: min, max or avg] | string | `min` | no | +| memory_usage_timeframe | Monitor timeframe for Mysql memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | +| message | Message sent when an alert is triggered | string | - | yes | +| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | +| total_connection_enabled | Flag to enable Mysql status monitor | string | `true` | no | +| total_connection_extra_tags | Extra tags for Mysql status monitor | list | `` | no | +| total_connection_limit | Limit for Mysql total connection [See details : https://docs.microsoft.com/en-us/azure/mysql/concepts-limits] | string | `` | no | +| total_connection_message | Custom message for Mysql total connection monitor | string | `` | no | +| total_connection_silenced | Groups to mute for Mysql total connection monitor | map | `` | no | +| total_connection_time_aggregator | Monitor aggregator for Mysql total connection [available values: min, max or avg] | string | `min` | no | +| total_connection_timeframe | Monitor timeframe for Mysql total connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | ## Outputs @@ -79,7 +82,7 @@ Creates DataDog monitors with the following checks: | mysql\_free\_storage\_id | id for monitor mysql_free_storage | | mysql\_io\_consumption\_id | id for monitor mysql_io_consumption | | mysql\_memory\_usage\_id | id for monitor mysql_memory_usage | -| mysql\_no\_connection\_id | id for monitor mysql_no_connection | +| mysql\_total\_connection\_id | id for monitor mysql_total_connection | ## Related documentation diff --git a/cloud/azure/mysql/inputs.tf b/cloud/azure/mysql/inputs.tf index 403ab71..aa65900 100644 --- a/cloud/azure/mysql/inputs.tf +++ b/cloud/azure/mysql/inputs.tf @@ -76,42 +76,48 @@ variable "cpu_usage_threshold_critical" { default = "90" } -variable "no_connection_silenced" { - description = "Groups to mute for Mysql no connection monitor" +variable "total_connection_silenced" { + description = "Groups to mute for Mysql total connection monitor" type = "map" default = {} } -variable "no_connection_enabled" { +variable "total_connection_enabled" { description = "Flag to enable Mysql status monitor" type = "string" default = "true" } -variable "no_connection_extra_tags" { +variable "total_connection_extra_tags" { description = "Extra tags for Mysql status monitor" type = "list" default = [] } -variable "no_connection_message" { - description = "Custom message for Mysql no connection monitor" +variable "total_connection_message" { + description = "Custom message for Mysql total connection monitor" type = "string" default = "" } -variable "no_connection_time_aggregator" { - description = "Monitor aggregator for Mysql no connection [available values: min, max or avg]" +variable "total_connection_time_aggregator" { + description = "Monitor aggregator for Mysql total connection [available values: min, max or avg]" type = "string" default = "min" } -variable "no_connection_timeframe" { - description = "Monitor timeframe for Mysql no connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" +variable "total_connection_timeframe" { + description = "Monitor timeframe for Mysql total connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" type = "string" default = "last_5m" } +variable "total_connection_limit" { + description = "Limit for Mysql total connection [See details : https://docs.microsoft.com/en-us/azure/mysql/concepts-limits]" + type = "string" + default = "" +} + variable "free_storage_silenced" { description = "Groups to mute for Mysql Free Storage monitor" type = "map" diff --git a/cloud/azure/mysql/monitors-mysql.tf b/cloud/azure/mysql/monitors-mysql.tf index b8554e2..5a0a4d2 100644 --- a/cloud/azure/mysql/monitors-mysql.tf +++ b/cloud/azure/mysql/monitors-mysql.tf @@ -31,20 +31,20 @@ resource "datadog_monitor" "mysql_cpu_usage" { tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform", "${var.cpu_usage_extra_tags}"] } -resource "datadog_monitor" "mysql_no_connection" { - count = "${var.no_connection_enabled ? 1 : 0}" - name = "[${var.environment}] Mysql Server has no connection" - message = "${coalesce(var.no_connection_message, var.message)}" +resource "datadog_monitor" "mysql_total_connection" { + count = "${var.total_connection_enabled ? 1 : 0}" + name = "[${var.environment}] Mysql Server total connection reach 80 percent of the total limit" + message = "${coalesce(var.total_connection_message, var.message)}" query = < (${var.total_connection_limit} * 0.8) EOF type = "metric alert" - silenced = "${var.no_connection_silenced}" + silenced = "${var.total_connection_silenced}" notify_no_data = true evaluation_delay = "${var.evaluation_delay}" @@ -56,7 +56,7 @@ resource "datadog_monitor" "mysql_no_connection" { require_full_window = false new_host_delay = "${var.new_host_delay}" - tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform", "${var.no_connection_extra_tags}"] + tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:mysql", "team:claranet", "created-by:terraform", "${var.total_connection_extra_tags}"] } resource "datadog_monitor" "mysql_free_storage" { diff --git a/cloud/azure/mysql/outputs.tf b/cloud/azure/mysql/outputs.tf index f037a3f..be09ef9 100644 --- a/cloud/azure/mysql/outputs.tf +++ b/cloud/azure/mysql/outputs.tf @@ -3,9 +3,9 @@ output "mysql_cpu_usage_id" { value = "${datadog_monitor.mysql_cpu_usage.*.id}" } -output "mysql_no_connection_id" { - description = "id for monitor mysql_no_connection" - value = "${datadog_monitor.mysql_no_connection.*.id}" +output "mysql_total_connection_id" { + description = "id for monitor mysql_total_connection" + value = "${datadog_monitor.mysql_total_connection.*.id}" } output "mysql_free_storage_id" {