diff --git a/database/mysql/README.md b/database/mysql/README.md
index e5e6b1c..1693d03 100644
--- a/database/mysql/README.md
+++ b/database/mysql/README.md
@@ -43,8 +43,9 @@ Creates DataDog monitors with the following checks:
 | mysql_aborted_timeframe | Monitor timeframe for MySQL aborted connects monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_10m` | no |
 | mysql_availability_extra_tags | Extra tags for Mysql availability monitor | list | `<list>` | no |
 | mysql_availability_message | Custom message for Mysql availability monitor | string | `` | no |
+| mysql_availability_no_data_timeframe | Mysql availability monitor no data timeframe | string | `10` | no |
 | mysql_availability_silenced | Groups to mute for Mysql availability monitor | map | `<map>` | no |
-| mysql_availability_threshold_critical | Mysql availability monitor (critical threshold) | string | `1.1754943508222875e-38` | no |
+| mysql_availability_threshold_warning | Mysql availability monitor (warning threshold) | string | `3` | no |
 | mysql_connection_extra_tags | Extra tags for MySQL connection monitor | list | `<list>` | no |
 | mysql_connection_message | Custom message for MySQL connection monitor | string | `` | no |
 | mysql_connection_silenced | Groups to mute MySQL connection monitor | map | `<map>` | no |
diff --git a/database/mysql/inputs.tf b/database/mysql/inputs.tf
index f20d62d..0755c6b 100644
--- a/database/mysql/inputs.tf
+++ b/database/mysql/inputs.tf
@@ -51,10 +51,16 @@ variable "mysql_availability_message" {
   default     = ""
 }
 
-variable "mysql_availability_threshold_critical" {
-  description = "Mysql availability monitor (critical threshold)"
+variable "mysql_availability_threshold_warning" {
+  description = "Mysql availability monitor (warning threshold)"
   type        = "string"
-  default     = 1.1754943508222875e-38
+  default     = 3
+}
+
+variable "mysql_availability_no_data_timeframe" {
+  description = "Mysql availability monitor no data timeframe"
+  type        = "string"
+  default     = 10
 }
 
 #################################
diff --git a/database/mysql/monitors-mysql.tf b/database/mysql/monitors-mysql.tf
index 2a13d9c..868dded 100644
--- a/database/mysql/monitors-mysql.tf
+++ b/database/mysql/monitors-mysql.tf
@@ -5,15 +5,16 @@ resource "datadog_monitor" "mysql_availability" {
   type = "service check"
 
   query = <<EOF
-    "mysql.can_connect".over${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
+    "mysql.can_connect".over${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
   EOF
 
   thresholds = {
-    warning  = 0
-    critical = "${var.mysql_availability_threshold_critical}"
+    warning  = "${var.mysql_availability_threshold_warning}"
+    critical = 5
   }
 
   notify_no_data      = true
+  no_data_timeframe   = "${var.mysql_availability_no_data_timeframe}"
   new_host_delay      = "${var.new_host_delay}"
   renotify_interval   = 0
   notify_audit        = false