update copilot review

Author: FabrizioCafolla

examples/main.tf

@@ -125,6 +125,7 @@ module "example" {
           }
         ]
       }
+      # Use default thresholds (memory_utilization CRITICAL at 80%)
       "my-redis-instance-2" = {}
     }
 

memorystore.tf

@@ -86,7 +86,7 @@ resource "google_monitoring_alert_policy" "memorystore_instance_cpu" {
     condition_threshold {
       filter = <<-EOT
         resource.type = "redis_instance"
-        AND resource.labels.instance_id = "${each.value.instance}"
+        AND resource.labels.instance_id = "${element(reverse(split("/", each.value.instance)), 0)}"
         AND metric.type = "redis.googleapis.com/stats/cpu_utilization_main_thread"
       EOT
 
@@ -95,13 +95,8 @@ resource "google_monitoring_alert_policy" "memorystore_instance_cpu" {
       duration        = each.value.duration
 
       aggregations {
-        alignment_period     = each.value.alignment_period
-        per_series_aligner   = "ALIGN_RATE"
-        cross_series_reducer = "REDUCE_SUM"
-        group_by_fields = [
-          "resource.label.instance_id",
-          "resource.label.node_id",
-        ]
+        alignment_period   = each.value.alignment_period
+        per_series_aligner = "ALIGN_MEAN"
       }
 
       trigger {
@@ -133,7 +128,7 @@ resource "google_monitoring_alert_policy" "memorystore_instance_memory" {
     condition_threshold {
       filter = <<-EOT
         resource.type = "redis_instance"
-        AND resource.labels.instance_id = "${each.value.instance}"
+        AND resource.labels.instance_id = "${element(reverse(split("/", each.value.instance)), 0)}"
         AND metric.type = "redis.googleapis.com/stats/memory/system_memory_usage_ratio"
       EOT
 
@@ -175,7 +170,7 @@ resource "google_monitoring_alert_policy" "memorystore_cluster_cpu" {
     condition_threshold {
       filter = <<-EOT
         resource.type = "redis_cluster"
-        AND resource.labels.cluster_id = "${each.value.cluster}"
+        AND resource.labels.cluster_id = "${element(reverse(split("/", each.value.cluster)), 0)}"
         AND metric.type = "redis.googleapis.com/cluster/stats/cpu_utilization"
       EOT
 
@@ -184,13 +179,8 @@ resource "google_monitoring_alert_policy" "memorystore_cluster_cpu" {
       duration        = each.value.duration
 
       aggregations {
-        alignment_period     = each.value.alignment_period
-        per_series_aligner   = "ALIGN_RATE"
-        cross_series_reducer = "REDUCE_SUM"
-        group_by_fields = [
-          "resource.label.cluster_id",
-          "resource.label.node_id",
-        ]
+        alignment_period   = each.value.alignment_period
+        per_series_aligner = "ALIGN_MEAN"
       }
 
       trigger {
@@ -222,7 +212,7 @@ resource "google_monitoring_alert_policy" "memorystore_cluster_memory" {
     condition_threshold {
       filter = <<-EOT
         resource.type = "redis_cluster"
-        AND resource.labels.cluster_id = "${each.value.cluster}"
+        AND resource.labels.cluster_id = "${element(reverse(split("/", each.value.cluster)), 0)}"
         AND metric.type = "redis.googleapis.com/cluster/stats/memory/system_memory_usage_ratio"
       EOT
 

variables.tf

@@ -309,7 +309,7 @@ variable "litellm" {
 }
 
 variable "memorystore" {
-  description = "Configuration for GCP Memorystore (Redis) CPU monitoring alerts. Supports both Redis instances and Redis clusters with multiple threshold levels. Each resource is identified by its name (map key)."
+  description = "Configuration for GCP Memorystore (Redis) CPU and memory utilization monitoring alerts. Supports both Redis instances and Redis clusters with multiple threshold levels. Each resource is identified by its name (map key)."
   default     = {}
   type = object({
     enabled               = optional(bool, false)