diff --git a/databases/mysql/mon-mysql.tf b/databases/mysql/mon-mysql.tf
index 8a1f74d..1458aac 100644
--- a/databases/mysql/mon-mysql.tf
+++ b/databases/mysql/mon-mysql.tf
@@ -14,7 +14,7 @@ resource "datadog_monitor" "mysql_connection_too_high" {
   query = <<EOF
     avg(last_15m): (
       avg:mysql.net.connections{${data.template_file.filter.rendered}} by {region,db_host} /
-      avg:mysql.net.max_connections{${data.template_file.filter.rendered}} by {region,db_host}
+      avg:mysql.net.max_connections_available{${data.template_file.filter.rendered}} by {region,db_host}
     ) * 100 > ${var.mysql_connection_threshold_critical}
   EOF
 
@@ -38,7 +38,7 @@ resource "datadog_monitor" "mysql_connection_too_high" {
 }
 
 resource "datadog_monitor" "mysql_thread_too_high" {
-  name    = "[${var.environment}] Mysql threads {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Mysql threads {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   message = "${coalesce(var.mysql_thread_message, var.message)}"
   type    = "metric alert"