From 86317bad616577cfd0c951b75f44b3ac54866ce6 Mon Sep 17 00:00:00 2001
From: Mark Maas <mark@maas-martin.nl>
Date: Fri, 9 Apr 2021 13:27:43 +0200
Subject: [PATCH] Initial Commit of already exiting monitors

---
 OOM_error-variables.tf         | 52 ++++++++++++++++++++++++
 OOM_error.tf                   | 39 ++++++++++++++++++
 README.md                      | 18 ++++++++-
 blocked_clients-variables.tf   | 47 ++++++++++++++++++++++
 blocked_clients.tf             | 34 ++++++++++++++++
 connected_client.tf            | 34 ++++++++++++++++
 connected_clients-variables.tf | 47 ++++++++++++++++++++++
 evicted_keys-variables.tf      | 47 ++++++++++++++++++++++
 evicted_keys.tf                | 34 ++++++++++++++++
 hitratio-variables.tf          | 47 ++++++++++++++++++++++
 hitratio.tf                    | 35 +++++++++++++++++
 latency-variables.tf           | 47 ++++++++++++++++++++++
 latency.tf                     | 34 ++++++++++++++++
 main.tf                        |  0
 maxmem-variables.tf            | 47 ++++++++++++++++++++++
 maxmem.tf                      | 35 +++++++++++++++++
 memfrag-variables.tf           | 47 ++++++++++++++++++++++
 memfrag.tf                     | 36 +++++++++++++++++
 memory-free-bytes-variables.tf | 47 ++++++++++++++++++++++
 memory-free-bytes.tf           | 34 ++++++++++++++++
 ops-per-sec-variables copy.tf  | 47 ++++++++++++++++++++++
 ops-per-sec.tf                 | 72 ++++++++++++++++++++++++++++++++++
 variables.tf                   | 30 ++++++++++++++
 23 files changed, 909 insertions(+), 1 deletion(-)
 create mode 100644 OOM_error-variables.tf
 create mode 100644 OOM_error.tf
 create mode 100644 blocked_clients-variables.tf
 create mode 100644 blocked_clients.tf
 create mode 100644 connected_client.tf
 create mode 100644 connected_clients-variables.tf
 create mode 100644 evicted_keys-variables.tf
 create mode 100644 evicted_keys.tf
 create mode 100644 hitratio-variables.tf
 create mode 100644 hitratio.tf
 create mode 100644 latency-variables.tf
 create mode 100644 latency.tf
 create mode 100644 main.tf
 create mode 100644 maxmem-variables.tf
 create mode 100644 maxmem.tf
 create mode 100644 memfrag-variables.tf
 create mode 100644 memfrag.tf
 create mode 100644 memory-free-bytes-variables.tf
 create mode 100644 memory-free-bytes.tf
 create mode 100644 ops-per-sec-variables copy.tf
 create mode 100644 ops-per-sec.tf
 create mode 100644 variables.tf

diff --git a/OOM_error-variables.tf b/OOM_error-variables.tf
new file mode 100644
index 0000000..9eff96a
--- /dev/null
+++ b/OOM_error-variables.tf
@@ -0,0 +1,52 @@
+variable "oom_error_enabled" {
+  type    = bool
+  default = true
+  description = "oom_error in redis"
+}
+
+variable "oom_error_warning" {
+  type    = number
+  default = 1
+  # 1 oom_errors
+}
+
+variable "oom_error_critical" {
+  type    = number
+  default = 5
+  # 5 oom_errors
+}
+
+variable "oom_error_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "oom_error_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "oom_error_note" {
+  type    = string
+  default = ""
+}
+
+variable "oom_error_docs" {
+  type    = string
+  default = ""
+}
+
+variable "oom_error_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "oom_error_alerting_enabled" {
+  type    = bool
+  default = true
+}
+
+variable "type" {
+  type = string
+  default = "log alert"
+}
\ No newline at end of file
diff --git a/OOM_error.tf b/OOM_error.tf
new file mode 100644
index 0000000..d5d712a
--- /dev/null
+++ b/OOM_error.tf
@@ -0,0 +1,39 @@
+locals {
+  oom_error_filter = coalesce(
+    var.oom_error_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_oom_error" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Out Of Memory errors in the logs"
+  query = "logs(\"OOM command not allowed when used memory \\> 'maxmemory'.\").index(\"*\").rollup(\"count\").last(\"15m\") > ${var.oom_error_critical}"
+
+  enabled          = var.oom_error_enabled
+  alerting_enabled = var.oom_error_alerting_enabled
+
+  alert_message    = <<EOF
+Available memory on ${var.service} has dropped so much we are getting OOM errors in the logging.
+See: https://app.datadoghq.eu/logs?query=OOM%20command%20not%20allowed%20when%20used%20memory%20%3E%20%27maxmemory%27.&index=%2A&integration_id=&integration_short_name=&saved_view=19730&from_ts=1617618461039&to_ts=1617704861039&live=true&cols=host%2Cservice&stream_sort=service%2Cdesc&messageDisplay=inline&viz=stream
+    EOF
+  recovery_message = "No more OOM error log entries in the last 15 minutes."
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.oom_error_severity
+  note            = var.oom_error_note
+  docs            = var.oom_error_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  type = var.type
+
+  critical_threshold = var.oom_error_critical
+  warning_threshold  = var.oom_error_warning
+}
diff --git a/README.md b/README.md
index 3559016..4ba9d10 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,17 @@
-# terraform-datadog-redis
\ No newline at end of file
+## Severity Levels
+
+| Severity | Description |
+| --- | --- |
+| critical | P1 |
+| major | P2 |
+| minor | P3 |
+| warning | P4 |
+
+## Timeframes
+
+available values: 
+```
+last_#m (1, 5, 10, 15, or 30) 
+last_#h (1, 2, or 4) 
+last_1d
+```
\ No newline at end of file
diff --git a/blocked_clients-variables.tf b/blocked_clients-variables.tf
new file mode 100644
index 0000000..76ecd49
--- /dev/null
+++ b/blocked_clients-variables.tf
@@ -0,0 +1,47 @@
+variable "blocked_enabled" {
+  type    = bool
+  default = true
+  description = "blocked in redis"
+}
+
+variable "blocked_warning" {
+  type    = number
+  default = 5
+  # 10 blockeds
+}
+
+variable "blocked_critical" {
+  type    = number
+  default = 10
+  # 20 blockeds
+}
+
+variable "blocked_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "blocked_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "blocked_note" {
+  type    = string
+  default = ""
+}
+
+variable "blocked_docs" {
+  type    = string
+  default = ""
+}
+
+variable "blocked_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "blocked_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/blocked_clients.tf b/blocked_clients.tf
new file mode 100644
index 0000000..d881154
--- /dev/null
+++ b/blocked_clients.tf
@@ -0,0 +1,34 @@
+locals {
+  blocked_filter = coalesce(
+    var.blocked_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_blocked" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Blocked Clients"
+  query = "avg(${var.blocked_evaluation_period}):avg:redis.clients.blocked{${local.blocked_filter}} >= ${var.blocked_critical}"
+
+  enabled          = var.blocked_enabled
+  alerting_enabled = var.blocked_alerting_enabled
+
+  alert_message    = "${var.service} is waiting to fill a request with data. Until the data is filled, the client is blocked. Current threshold: {{threshold}} and is currently at {{value}} blocked clients. This could indicate a latency issue or timeouts upstream."
+  recovery_message = "${var.service} blocked clients is back to {{value}}"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.blocked_severity
+  note            = var.blocked_note
+  docs            = var.blocked_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.blocked_critical
+  warning_threshold  = var.blocked_warning
+}
diff --git a/connected_client.tf b/connected_client.tf
new file mode 100644
index 0000000..44991c0
--- /dev/null
+++ b/connected_client.tf
@@ -0,0 +1,34 @@
+locals {
+  connected_clients_filter = coalesce(
+    var.connected_clients_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_connected_clients" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Connected Clients"
+  query = "avg(${var.connected_clients_evaluation_period}):avg:redis.net.clients{${local.connected_clients_filter}} >= ${var.connected_clients_critical}"
+
+  enabled          = var.connected_clients_enabled
+  alerting_enabled = var.connected_clients_alerting_enabled
+
+  alert_message    = "Amount of connected clients to ${var.service} has gone above {{threshold}} and is currently {{value}}%. This could indicate problems with upstream not responding quickly enough."
+  recovery_message = "Amount of connected clients to ${var.service} has recovered to {{value}}"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.connected_clients_severity
+  note            = var.connected_clients_note
+  docs            = var.connected_clients_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.connected_clients_critical
+  warning_threshold  = var.connected_clients_warning
+}
diff --git a/connected_clients-variables.tf b/connected_clients-variables.tf
new file mode 100644
index 0000000..5d3150b
--- /dev/null
+++ b/connected_clients-variables.tf
@@ -0,0 +1,47 @@
+variable "connected_clients_enabled" {
+  type    = bool
+  default = true
+  description = "connected_clients in redis"
+}
+
+variable "connected_clients_warning" {
+  type    = number
+  default = 20
+  # 20 connected_clientss
+}
+
+variable "connected_clients_critical" {
+  type    = number
+  default = 30
+  # 30 connected_clientss
+}
+
+variable "connected_clients_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "connected_clients_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "connected_clients_note" {
+  type    = string
+  default = ""
+}
+
+variable "connected_clients_docs" {
+  type    = string
+  default = ""
+}
+
+variable "connected_clients_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "connected_clients_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/evicted_keys-variables.tf b/evicted_keys-variables.tf
new file mode 100644
index 0000000..ef5135c
--- /dev/null
+++ b/evicted_keys-variables.tf
@@ -0,0 +1,47 @@
+variable "eviction_enabled" {
+  type    = bool
+  default = true
+  description = "eviction in redis"
+}
+
+variable "eviction_warning" {
+  type    = number
+  default = 10
+  # 10 evictions
+}
+
+variable "eviction_critical" {
+  type    = number
+  default = 20
+  # 20 evictions
+}
+
+variable "eviction_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "eviction_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "eviction_note" {
+  type    = string
+  default = ""
+}
+
+variable "eviction_docs" {
+  type    = string
+  default = ""
+}
+
+variable "eviction_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "eviction_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/evicted_keys.tf b/evicted_keys.tf
new file mode 100644
index 0000000..6fd641a
--- /dev/null
+++ b/evicted_keys.tf
@@ -0,0 +1,34 @@
+locals {
+  eviction_filter = coalesce(
+    var.eviction_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_eviction" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Eviction Rate"
+  query = "avg(${var.eviction_evaluation_period}):avg:redis.keys.evicted{${local.eviction_filter}} >= ${var.eviction_critical}"
+
+  enabled          = var.eviction_enabled
+  alerting_enabled = var.eviction_alerting_enabled
+
+  alert_message    = "Memory usage on ${var.service} has gone so high, it needs to start evicting keys. Current threshold: {{threshold}} and is eviction rate: {{value}}"
+  recovery_message = "${var.service} is evicting keys at the rate of  {{value}}"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.eviction_severity
+  note            = var.eviction_note
+  docs            = var.eviction_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.eviction_critical
+  warning_threshold  = var.eviction_warning
+}
diff --git a/hitratio-variables.tf b/hitratio-variables.tf
new file mode 100644
index 0000000..4ce125c
--- /dev/null
+++ b/hitratio-variables.tf
@@ -0,0 +1,47 @@
+variable "hitratio_enabled" {
+  type    = bool
+  default = true
+  description = "hitratio in redis"
+}
+
+variable "hitratio_warning" {
+  type    = number
+  default = 50
+  # 50 percent
+}
+
+variable "hitratio_critical" {
+  type    = number
+  default = 40
+  # 40 percent
+}
+
+variable "hitratio_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "hitratio_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "hitratio_note" {
+  type    = string
+  default = ""
+}
+
+variable "hitratio_docs" {
+  type    = string
+  default = ""
+}
+
+variable "hitratio_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "hitratio_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/hitratio.tf b/hitratio.tf
new file mode 100644
index 0000000..9bec432
--- /dev/null
+++ b/hitratio.tf
@@ -0,0 +1,35 @@
+locals {
+  hitratio_filter = coalesce(
+    var.hitratio_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_hitratio" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Hitratio"
+  query = "avg(${var.hitratio_evaluation_period}):( avg:redis.stats.keyspace_hits{${local.hitratio_filter}} / ( avg:redis.stats.keyspace_hits{${local.hitratio_filter}} + avg:redis.stats.keyspace_misses{${local.hitratio_filter}} ) ) * 100 <= ${var.hitratio_critical}"
+
+  enabled          = var.hitratio_enabled
+  alerting_enabled = var.hitratio_alerting_enabled
+
+
+  alert_message    = "Hit Ratio on ${var.service} has dropped below {{threshold}}% and is {{value}}%."
+  recovery_message = "Hit Ratio on ${var.service} has recovered to {{value}}%"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.hitratio_severity
+  note            = var.hitratio_note
+  docs            = var.hitratio_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.hitratio_critical
+  warning_threshold  = var.hitratio_warning
+}
diff --git a/latency-variables.tf b/latency-variables.tf
new file mode 100644
index 0000000..e3550f5
--- /dev/null
+++ b/latency-variables.tf
@@ -0,0 +1,47 @@
+variable "latency_enabled" {
+  type    = bool
+  default = true
+  description = "Latency in redis"
+}
+
+variable "latency_warning" {
+  type    = number
+  default = 8
+  # 8MS
+}
+
+variable "latency_critical" {
+  type    = number
+  default = 10
+  # 10MS
+}
+
+variable "latency_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "latency_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "latency_note" {
+  type    = string
+  default = ""
+}
+
+variable "latency_docs" {
+  type    = string
+  default = ""
+}
+
+variable "latency_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "latency_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/latency.tf b/latency.tf
new file mode 100644
index 0000000..824a3ec
--- /dev/null
+++ b/latency.tf
@@ -0,0 +1,34 @@
+locals {
+  latency_filter = coalesce(
+    var.latency_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_latency" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Latency"
+  query = "avg(${var.latency_evaluation_period}):avg:redis.info.latency_ms{${local.latency_filter}} >= ${var.latency_critical}"
+
+  enabled          = var.latency_enabled
+  alerting_enabled = var.latency_alerting_enabled
+
+  alert_message    = "Latency on ${var.service} has dropped below {{threshold}} and has {{value}} available"
+  recovery_message = "Latency on ${var.service} has recovered {{value}}"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.latency_severity
+  note            = var.latency_note
+  docs            = var.latency_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.latency_critical
+  warning_threshold  = var.latency_warning
+}
diff --git a/main.tf b/main.tf
new file mode 100644
index 0000000..e69de29
diff --git a/maxmem-variables.tf b/maxmem-variables.tf
new file mode 100644
index 0000000..9e79bc9
--- /dev/null
+++ b/maxmem-variables.tf
@@ -0,0 +1,47 @@
+variable "maxmem_enabled" {
+  type    = bool
+  default = true
+  description = "maxmem in redis"
+}
+
+variable "maxmem_warning" {
+  type    = number
+  default = 80
+  # 80 percent
+}
+
+variable "maxmem_critical" {
+  type    = number
+  default = 95
+  # 95 percent
+}
+
+variable "maxmem_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "maxmem_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "maxmem_note" {
+  type    = string
+  default = ""
+}
+
+variable "maxmem_docs" {
+  type    = string
+  default = ""
+}
+
+variable "maxmem_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "maxmem_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/maxmem.tf b/maxmem.tf
new file mode 100644
index 0000000..50aff17
--- /dev/null
+++ b/maxmem.tf
@@ -0,0 +1,35 @@
+locals {
+  maxmem_filter = coalesce(
+    var.maxmem_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_maxmem" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Memory Usage"
+  query = "avg(${var.maxmem_evaluation_period}):( avg:redis.mem.used{${local.maxmem_filter}} / avg:redis.mem.maxmemory{${local.maxmem_filter}} ) * 100 >= ${var.maxmem_critical}"
+
+  enabled          = var.maxmem_enabled
+  alerting_enabled = var.maxmem_alerting_enabled
+
+
+  alert_message    = "Memory usage on ${var.service} has gone above {{threshold}}% and is currently {{value}}%."
+  recovery_message = "Memory usage on ${var.service} has recovered to {{value}}%"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.maxmem_severity
+  note            = var.maxmem_note
+  docs            = var.maxmem_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.maxmem_critical
+  warning_threshold  = var.maxmem_warning
+}
diff --git a/memfrag-variables.tf b/memfrag-variables.tf
new file mode 100644
index 0000000..6fa2328
--- /dev/null
+++ b/memfrag-variables.tf
@@ -0,0 +1,47 @@
+variable "memfrag_enabled" {
+  type    = bool
+  default = true
+  description = "memfrag in redis"
+}
+
+variable "memfrag_warning" {
+  type    = number
+  default = 1.1
+  # more then 1 signle memory block is already a sign of trouble 
+}
+
+variable "memfrag_critical" {
+  type    = number
+  default = 1.5
+  # Memory fragmentation above 1.5 means trouble
+}
+
+variable "memfrag_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "memfrag_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "memfrag_note" {
+  type    = string
+  default = ""
+}
+
+variable "memfrag_docs" {
+  type    = string
+  default = ""
+}
+
+variable "memfrag_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "memfrag_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/memfrag.tf b/memfrag.tf
new file mode 100644
index 0000000..22bc49f
--- /dev/null
+++ b/memfrag.tf
@@ -0,0 +1,36 @@
+locals {
+  memfrag_filter = coalesce(
+    var.memfrag_filter_override,
+    var.filter_str
+  )
+}
+
+module "redis_memfrag" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Memory Fragmentation"
+  query = "avg(${var.memfrag_evaluation_period}):avg:redis.mem.fragmentation_ratio{${local.memfrag_filter}} > ${var.memfrag_critical}"
+
+  enabled          = var.memfrag_enabled
+  alerting_enabled = var.memfrag_alerting_enabled
+
+  
+  alert_message    = "Memory Fragmentation problem on ${var.service}. Meaning the OS cannot supply ${var.service} with 'single blocks' of memory. So it has to fragment ${var.service}'s memory in order to still fit.  The threshold for this alert is {{threshold}} and the fragmentation is currently {{value}}."
+  recovery_message = "Memory Fragmentation on ${var.service} has recovered to {{value}} single block of memory."
+  
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.memfrag_severity
+  note            = var.memfrag_note
+  docs            = var.memfrag_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.memfrag_critical
+  warning_threshold  = var.memfrag_warning
+}
diff --git a/memory-free-bytes-variables.tf b/memory-free-bytes-variables.tf
new file mode 100644
index 0000000..36713a0
--- /dev/null
+++ b/memory-free-bytes-variables.tf
@@ -0,0 +1,47 @@
+variable "memory_available_enabled" {
+  type    = bool
+  default = true
+  description = "Memory free in redis"
+}
+
+variable "memory_available_warning" {
+  type    = number
+  default = 1000000000
+  # 1GB
+}
+
+variable "memory_available_critical" {
+  type    = number
+  default = 500000000
+  # 500MB
+}
+
+variable "memory_available_evaluation_period" {
+  type    = string
+  default = "last_5m"
+}
+
+variable "memory_available_severity" {
+  type    = string
+  default = "critical"
+}
+
+variable "memory_available_note" {
+  type    = string
+  default = ""
+}
+
+variable "memory_available_docs" {
+  type    = string
+  default = ""
+}
+
+variable "memory_available_filter_override" {
+  type    = string
+  default = ""
+}
+
+variable "memory_available_alerting_enabled" {
+  type    = bool
+  default = true
+}
\ No newline at end of file
diff --git a/memory-free-bytes.tf b/memory-free-bytes.tf
new file mode 100644
index 0000000..eda02ea
--- /dev/null
+++ b/memory-free-bytes.tf
@@ -0,0 +1,34 @@
+locals {
+  memory_available_filter = coalesce(
+    var.memory_available_filter_override,
+    var.filter_str
+  )
+}
+
+module "memory_available" {
+  source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+  name  = "Available Memory"
+  query = "avg(${var.memory_available_evaluation_period}):avg:redis.mem.maxmemory{${local.memory_available_filter}} - avg:redis.mem.used{${local.memory_available_filter}} < ${var.memory_available_critical}"
+
+  enabled          = var.memory_available_enabled
+  alerting_enabled = var.memory_available_alerting_enabled
+
+  alert_message    = "Available memory on ${var.service} has dropped below {{threshold}} and has {{value}} available"
+  recovery_message = "Available memory on ${var.service} has recovered {{value}}"
+
+  service         = var.service
+  env             = var.alert_env
+  severity        = var.memory_available_severity
+  note            = var.memory_available_note
+  docs            = var.memory_available_docs
+  additional_tags = var.additional_tags
+
+  notification_channel = var.notification_channel
+
+  require_full_window = true
+  locked = var.locked
+
+  critical_threshold = var.memory_available_critical
+  warning_threshold  = var.memory_available_warning
+}
diff --git a/ops-per-sec-variables copy.tf b/ops-per-sec-variables copy.tf
new file mode 100644
index 0000000..096d7c6
--- /dev/null
+++ b/ops-per-sec-variables copy.tf	
@@ -0,0 +1,47 @@
+# variable "opspersec_enabled" {
+#   type    = bool
+#   default = true
+#   description = "Operations per second in redis"
+# }
+
+# variable "opspersec_warning" {
+#   type    = number
+#   default = 0
+#   # 8MS
+# }
+
+# variable "opspersec_critical" {
+#   type    = number
+#   default = 1
+#   # 10MS
+# }
+
+# variable "opspersec_evaluation_period" {
+#   type    = string
+#   default = "last_2w"
+# }
+
+# variable "opspersec_severity" {
+#   type    = string
+#   default = "critical"
+# }
+
+# variable "opspersec_note" {
+#   type    = string
+#   default = ""
+# }
+
+# variable "opspersec_docs" {
+#   type    = string
+#   default = ""
+# }
+
+# variable "opspersec_filter_override" {
+#   type    = string
+#   default = ""
+# }
+
+# variable "opspersec_alerting_enabled" {
+#   type    = bool
+#   default = true
+# }
\ No newline at end of file
diff --git a/ops-per-sec.tf b/ops-per-sec.tf
new file mode 100644
index 0000000..736e2e4
--- /dev/null
+++ b/ops-per-sec.tf
@@ -0,0 +1,72 @@
+# locals {
+#   opspersec_filter = coalesce(
+#     var.opspersec_filter_override,
+#     var.filter_str
+#   )
+# }
+
+# module "redis_opspersec" {
+#   source = "git@github.com:kabisa/terraform-datadog-generic-monitor.git?ref=0.5"
+
+#   name  = "Operations per Second"
+#   query = "avg(${var.opspersec_evaluation_period}):anomalies(avg:redis.net.instantaneous_ops_per_sec{${local.opspersec_filter}}, 'basic', 2, direction='both', alert_window='${var.opspersec_evaluation_period}', interval=21600, count_default_zero='true') >= ${var.opspersec_critical}"
+
+
+#   enabled          = var.opspersec_enabled
+#   alerting_enabled = var.opspersec_alerting_enabled
+
+#   alert_message    = "Operations per second on ${var.service} has an anomaly {{value}}"
+#   recovery_message = "Operations per second on ${var.service} has recovered {{value}}"
+
+#   service         = var.service
+#   env             = var.alert_env
+#   severity        = var.opspersec_severity
+#   note            = var.opspersec_note
+#   docs            = var.opspersec_docs
+#   additional_tags = var.additional_tags
+
+#   notification_channel = var.notification_channel
+
+#   require_full_window = true
+#   locked = var.locked
+
+#   critical_threshold = var.opspersec_critical
+#   warning_threshold  = var.opspersec_warning
+# }
+
+
+## Export of this check:
+# {
+# 	"id": 846280,
+# 	"name": "Redis - Operations per second",
+# 	"type": "query alert",
+# 	"query": "avg(last_2w):anomalies(avg:redis.net.instantaneous_ops_per_sec{aiven-project:kabisa-d466}, 'basic', 2, direction='both', alert_window='last_14d', interval=21600, count_default_zero='true') >= 1",
+# 	"message": "{{#is_alert}}\nOperations per second on Redis has an anomaly {{value}}\n{{/is_alert}}\n{{#is_recovery}}\nOperations per second on Redis has recovered {{value}}\n{{/is_recovery}}\n@pagerduty-VacanSoleil",
+# 	"tags": [
+# 		"env:prd",
+# 		"service:Redis",
+# 		"severity:critical"
+# 	],
+# 	"options": {
+# 		"notify_audit": false,
+# 		"locked": true,
+# 		"timeout_h": 0,
+# 		"silenced": {},
+# 		"include_tags": true,
+# 		"no_data_timeframe": null,
+# 		"require_full_window": true,
+# 		"new_host_delay": 300,
+# 		"notify_no_data": false,
+# 		"renotify_interval": 0,
+# 		"escalation_message": "",
+# 		"threshold_windows": {
+# 			"recovery_window": "last_5m",
+# 			"trigger_window": "last_14d"
+# 		},
+# 		"thresholds": {
+# 			"critical": 1,
+# 			"critical_recovery": 0
+# 		}
+# 	},
+# 	"priority": null
+# }
\ No newline at end of file
diff --git a/variables.tf b/variables.tf
new file mode 100644
index 0000000..3ade737
--- /dev/null
+++ b/variables.tf
@@ -0,0 +1,30 @@
+variable "env" {
+  type = string
+}
+
+variable "alert_env" {
+  type = string
+}
+
+variable "service" {
+  type    = string
+  default = "Redis"
+}
+
+variable "notification_channel" {
+  type = string
+}
+
+variable "additional_tags" {
+  type    = list(string)
+  default = []
+}
+
+variable "filter_str" {
+  type = string
+}
+
+variable "locked" {
+  type    = bool
+  default = true
+}