From 76ae98eef2cc85dd413a0108edae9fc231be245d Mon Sep 17 00:00:00 2001 From: Alexandre Gaillet Date: Tue, 26 Feb 2019 10:36:08 +0100 Subject: [PATCH] MON-402 Fix query --- cloud/azure/mysql/README.md | 92 ++++++++++++++--------------- cloud/azure/mysql/monitors-mysql.tf | 4 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/cloud/azure/mysql/README.md b/cloud/azure/mysql/README.md index 582437e..23bbec5 100644 --- a/cloud/azure/mysql/README.md +++ b/cloud/azure/mysql/README.md @@ -19,60 +19,60 @@ module "datadog-monitors-cloud-azure-mysql" { Creates DataDog monitors with the following checks: - Mysql Server CPU usage -- Mysql Server has total connection - Mysql Server IO consumption - Mysql Server memory usage - Mysql Server storage +- Mysql Server total connection reach 80 percent of the total limit ## Inputs | 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 | - | 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 | +| 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 | +| 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 diff --git a/cloud/azure/mysql/monitors-mysql.tf b/cloud/azure/mysql/monitors-mysql.tf index 5a0a4d2..1839c38 100644 --- a/cloud/azure/mysql/monitors-mysql.tf +++ b/cloud/azure/mysql/monitors-mysql.tf @@ -38,8 +38,8 @@ resource "datadog_monitor" "mysql_total_connection" { query = < (${var.total_connection_limit} * 0.8) + avg:azure.dbformysql_servers.active_connections${module.filter-tags.query_alert} by {resource_group,region,name}) / ${var.total_connection_limit} + ) * 100 > 80 EOF type = "metric alert"