Merge branch 'master', remote-tracking branch 'origin' into support-gp3

Author: dm3ch

main.tf

@@ -125,6 +125,7 @@ resource "aws_elasticsearch_domain" "default" {
     volume_size = var.ebs_volume_size
     volume_type = var.ebs_volume_type
     iops        = var.ebs_iops
+    throughput  = var.ebs_throughput
   }
 
   encrypt_at_rest {
@@ -157,6 +158,27 @@ resource "aws_elasticsearch_domain" "default" {
         availability_zone_count = var.availability_zone_count
       }
     }
+
+    cold_storage_options {
+      enabled = var.cold_storage_enabled
+    }
+  }
+
+  dynamic "auto_tune_options" {
+    for_each = var.auto_tune_enabled ? [true] : []
+    content {
+      desired_state       = "ENABLED"
+      rollback_on_disable = var.auto_tune_rollback_settings
+      maintenance_schedule {
+        # Required until https://github.com/hashicorp/terraform-provider-aws/issues/22239 would be resolved
+        start_at = var.auto_tune_starting_time == null ? timeadd(timestamp(), "1h") : var.auto_tune_starting_time
+        duration {
+          value = var.auto_tune_duration
+          unit  = "HOURS"
+        }
+        cron_expression_for_recurrence = var.auto_tune_cron_schedule
+      }
+    }
   }
 
   node_to_node_encryption {
@@ -238,7 +260,7 @@ data "aws_iam_policy_document" "default" {
   # https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-ac.html#es-ac-types-ip
   # https://aws.amazon.com/premiumsupport/knowledge-center/anonymous-not-authorized-elasticsearch/
   dynamic "statement" {
-    for_each = length(var.allowed_cidr_blocks) > 0 && ! var.vpc_enabled ? [true] : []
+    for_each = length(var.allowed_cidr_blocks) > 0 && !var.vpc_enabled ? [true] : []
     content {
       effect = "Allow"
 
@@ -296,4 +318,4 @@ module "kibana_hostname" {
   records = [join("", aws_elasticsearch_domain.default.*.endpoint)]
 
   context = module.this.context
-}
+}

variables.tf

@@ -141,6 +141,12 @@ variable "ebs_iops" {
   description = "The baseline input/output (I/O) performance of EBS volumes attached to data nodes. Applicable only for the Provisioned IOPS EBS volume type"
 }
 
+variable "ebs_throughput" {
+  type        = number
+  default     = null
+  description = "Specifies the throughput (in MiB/s) of the EBS volumes attached to data nodes. Applicable only for the gp3 volume type. Valid values are between 125 and 1000."
+}
+
 variable "encrypt_at_rest_enabled" {
   type        = bool
   default     = true
@@ -363,3 +369,42 @@ variable "custom_endpoint_certificate_arn" {
   description = "ACM certificate ARN for custom endpoint."
   default     = ""
 }
+
+variable "cold_storage_enabled" {
+  type        = bool
+  description = "Enables cold storage support."
+  default     = false
+}
+
+variable "auto_tune_enabled" {
+  type        = bool
+  description = "Whether to enable autotune."
+  default     = false
+}
+
+variable "auto_tune_rollback_settings" {
+  type        = string
+  description = "Whether to roll back to default Auto-Tune settings when disabling Auto-Tune."
+  default     = "NO_ROLLBACK"
+
+  validation {
+    condition     = contains(["DEFAULT_ROLLBACK", "NO_ROLLBACK"], var.auto_tune_rollback_settings)
+    error_message = "Valid values: DEFAULT_ROLLBACK or NO_ROLLBACK."
+  }
+}
+
+variable "auto_tune_starting_time" {
+  type        = string
+  description = "Date and time at which to start the Auto-Tune maintenance schedule in RFC3339 format. Time should be in the future."
+  default = null
+}
+
+variable "auto_tune_cron_schedule" {
+  type        = string
+  description = "A cron expression specifying the recurrence pattern for an Auto-Tune maintenance schedule."
+}
+
+variable "auto_tune_duration" {
+  type        = number
+  description = "Autotune maintanance window duration time in hours."
+}