diff --git a/system/generic/README.md b/system/generic/README.md
index e56af90..ac23407 100644
--- a/system/generic/README.md
+++ b/system/generic/README.md
@@ -32,26 +32,29 @@ Inputs
 | cpu_high_silenced | Groups to mute for CPU high monitor | map | `<map>` | no |
 | cpu_high_threshold_critical | CPU high critical threshold | string | `95` | no |
 | cpu_high_threshold_warning | CPU high warning threshold | string | `80` | no |
-| cpu_high_timeframe | CPU high timeframe | string | `last_5m` | no |
+| cpu_high_timeframe | Monitor timeframe for CPU high [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | cpu_load_message | Custom message for CPU load ratio monitor | string | `` | no |
 | cpu_load_silenced | Groups to mute for CPU load ratio monitor | map | `<map>` | no |
 | cpu_load_threshold_critical | CPU load ratio critical threshold | string | `4` | no |
 | cpu_load_threshold_warning | CPU load ratio warning threshold | string | `3` | no |
-| cpu_load_timeframe | CPU load timeframe | string | `last_5m` | no |
-| environment | Architecture Environment | string | - | yes |
+| cpu_load_timeframe | Monitor timeframe for CPU load ratio [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | delay | Delay in seconds for the metric evaluation | string | `15` | no |
+| environment | Architecture Environment | string | - | yes |
 | 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_disk_inodes_message | Custom message for Free disk inodes monitor | string | `` | no |
 | free_disk_inodes_silenced | Groups to mute for Free disk inodes monitor | map | `<map>` | no |
 | free_disk_inodes_threshold_critical | Free disk space critical threshold | string | `5` | no |
 | free_disk_inodes_threshold_warning | Free disk space warning threshold | string | `10` | no |
+| free_disk_inodes_timeframe | Monitor timeframe for Free disk inodes [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | free_disk_space_message | Custom message for Free diskspace monitor | string | `` | no |
 | free_disk_space_silenced | Groups to mute for Free diskspace monitor | map | `<map>` | no |
 | free_disk_space_threshold_critical | Free disk space critical threshold | string | `5` | no |
 | free_disk_space_threshold_warning | Free disk space warning threshold | string | `10` | no |
+| free_disk_space_timeframe | Monitor timeframe for Free diskspace [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | free_memory_message | Custom message for Free memory monitor | string | - | yes |
 | free_memory_silenced | Groups to mute for Free memory monitor | map | `<map>` | no |
 | free_memory_threshold_critical | Free disk space critical threshold | string | `5` | no |
 | free_memory_threshold_warning | Free disk space warning threshold | string | `10` | no |
+| free_memory_timeframe | Monitor timeframe for Free memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1m` | no |
 | message | Message sent when an alert is triggered | string | - | yes |
diff --git a/system/generic/inputs.tf b/system/generic/inputs.tf
index 8a77608..6c66909 100644
--- a/system/generic/inputs.tf
+++ b/system/generic/inputs.tf
@@ -39,7 +39,8 @@ variable "cpu_high_message" {
 }
 
 variable "cpu_high_timeframe" {
-  description = "CPU high timeframe"
+  description = "Monitor timeframe for CPU high [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = "string"
   default     = "last_5m"
 }
 
@@ -66,7 +67,8 @@ variable "cpu_load_message" {
 }
 
 variable "cpu_load_timeframe" {
-  description = "CPU load ratio timeframe"
+  description = "Monitor timeframe for CPU load ratio [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = "string"
   default     = "last_5m"
 }
 
@@ -92,6 +94,12 @@ variable "free_disk_space_message" {
   default     = ""
 }
 
+variable "free_disk_space_timeframe" {
+  description = "Monitor timeframe for Free diskspace [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 "free_disk_space_threshold_warning" {
   description = "Free disk space warning threshold"
   default     = 10
@@ -114,6 +122,12 @@ variable "free_disk_inodes_message" {
   default     = ""
 }
 
+variable "free_disk_inodes_timeframe" {
+  description = "Monitor timeframe for Free disk inodes [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 "free_disk_inodes_threshold_warning" {
   description = "Free disk space warning threshold"
   default     = 10
@@ -135,6 +149,12 @@ variable "free_memory_message" {
   type        = "string"
 }
 
+variable "free_memory_timeframe" {
+  description = "Monitor timeframe for Free memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = "string"
+  default     = "last_1m"
+}
+
 variable "free_memory_threshold_warning" {
   description = "Free disk space warning threshold"
   default     = 10
diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index fe8b394..d737f01 100644
--- a/system/generic/monitors-system.tf
+++ b/system/generic/monitors-system.tf
@@ -74,7 +74,7 @@ resource "datadog_monitor" "datadog_free_disk_space_too_low" {
   message = "${coalesce(var.free_disk_space_message, var.message)}"
 
   query = <<EOF
-    min(last_5m): (
+    min(${var.free_disk_space_timeframe}): (
       avg:system.disk.free{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} /
       avg:system.disk.total{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} * 100
     ) < ${var.free_disk_space_threshold_critical}
@@ -106,7 +106,7 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" {
   message = "${coalesce(var.free_disk_inodes_message, var.message)}"
 
   query = <<EOF
-    min(last_5m): (
+    min(${var.free_disk_inodes_timeframe}): (
       avg:system.fs.inodes.free{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} /
       avg:system.fs.inodes.total{${data.template_file.filter.rendered},dd_disk:enabled} by {region,host,device} * 100
     ) < ${var.free_disk_inodes_threshold_critical}
@@ -138,7 +138,7 @@ resource "datadog_monitor" "datadog_free_memory" {
   message = "${var.free_memory_message}"
 
   query = <<EOF
-    min(last_1m): (
+    min(${var.free_memory_timeframe}): (
       avg:system.mem.free{${data.template_file.filter.rendered}} by {region,host} /
       avg:system.mem.total{${data.template_file.filter.rendered}} by {region,host} * 100
     ) < ${var.free_memory_threshold_critical}