Merge branch 'main' into main

Author: bentonam

modules/kubernetes/annotations/logs/mask.alloy

@@ -288,7 +288,7 @@ declare "mask_ipv6" {
     optional = true
   }
 
-  argument "mask_ipv4_value" {
+  argument "mask_ipv6_value" {
     comment = "The regular expression to use to determine if logs should have IPv6 values masked, if you want to mask IPv6 values by default without setting the annotations everywhere use '.*' or 'true|' (default: true)"
     default = "(?i)true"
     optional = true
@@ -454,7 +454,7 @@ declare "mask_ssn" {
     // check logs.grafana.com/mask-ssn annotation, if true the data will be masked as **SSN*REDACTED**
     stage.match {
       pipeline_name = "pipeline for annotation || " + argument.annotation.value + "/mask-ssn: true"
-      selector = "{" + argument.__sd_annotation.value + "_mask_ssn=~\"" + argument.mask_phone_value.value + "\"}"
+      selector = "{" + argument.__sd_annotation.value + "_mask_ssn=~\"" + argument.mask_ssn_value.value + "\"}"
 
       stage.replace {
         // unescaped regex: ([0-9]{3}-[0-9]{2}-[0-9]{4})