MON-246 - auto_updated.sh applied

cloud/azure/mysql/README.md

@@ -18,16 +18,16 @@ Creates DataDog monitors with the following checks:
 
 - Mysql Server CPU usage is high
 - Mysql Server has no connection
-- Mysql Server storage is running low
 - Mysql Server IO consumption is high
 - Mysql Server memory usage is high
+- Mysql Server storage is running low
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | cpu_usage_message | Custom message for Mysql CPU monitor | string | `` | no |
-| cpu_usage_silenced | Groups to mute for Mysql CPU monitor | map | `<map>` | 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 |
@@ -37,26 +37,26 @@ Creates DataDog monitors with the following checks:
 | 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_message | Custom message for Mysql Free Storage monitor | string | `` | no |
-| free_storage_silenced | Groups to mute for Mysql Free Storage monitor | map | `<map>` | 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_message | Custom message for Mysql IO consumption monitor | string | `` | no |
-| io_consumption_silenced | Groups to mute for Mysql IO consumption monitor | map | `<map>` | 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_message | Custom message for Mysql memory monitor | string | `` | no |
-| memory_usage_silenced | Groups to mute for Mysql memory monitor | map | `<map>` | 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 a Redis monitor is triggered | string | - | yes |
 | no_connection_message | Custom message for Mysql no connection monitor | string | `` | no |
-| no_connection_silenced | Groups to mute for Mysql no connection monitor | map | `<map>` | 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 |
 

cloud/azure/mysql/modules.tf

@@ -0,0 +1,8 @@
+module "filter-tags" {
+  source = "../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "mysql"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+}

cloud/azure/mysql/outputs.tf

@@ -1,24 +1,24 @@
 output "mysql_cpu_usage_id" {
   description = "id for monitor mysql_cpu_usage"
-  value       = "${datadog_monitor.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}"
+  value       = "${datadog_monitor.mysql_no_connection.*.id}"
 }
 
 output "mysql_free_storage_id" {
   description = "id for monitor mysql_free_storage"
-  value       = "${datadog_monitor.mysql_free_storage.id}"
+  value       = "${datadog_monitor.mysql_free_storage.*.id}"
 }
 
 output "mysql_io_consumption_id" {
   description = "id for monitor mysql_io_consumption"
-  value       = "${datadog_monitor.mysql_io_consumption.id}"
+  value       = "${datadog_monitor.mysql_io_consumption.*.id}"
 }
 
 output "mysql_memory_usage_id" {
   description = "id for monitor mysql_memory_usage"
-  value       = "${datadog_monitor.mysql_memory_usage.id}"
+  value       = "${datadog_monitor.mysql_memory_usage.*.id}"
 }