module/alicloud_elasticsearch_instance: support attributes kibana_node_spec, data_node_disk_performance_level; examples/complete: improve the examples

Author: shanye997

examples/complete/main.tf

@@ -14,18 +14,20 @@ module "example" {
 
   number_of_instance = 1
 
-  instance_charge_type = var.instance_charge_type
-  period               = var.period
-  data_node_amount     = var.data_node_amount
-  data_node_spec       = var.data_node_spec
-  data_node_disk_size  = var.data_node_disk_size
-  data_node_disk_type  = var.data_node_disk_type
-  vswitch_id           = module.vpc.this_vswitch_ids[0]
-  password             = var.password
-  es_version           = "5.5.3_with_X-Pack"
-  private_whitelist    = var.private_whitelist
-  kibana_whitelist     = var.kibana_whitelist
-  master_node_spec     = var.master_node_spec
-  description          = var.description
+  instance_charge_type             = var.instance_charge_type
+  period                           = var.period
+  data_node_amount                 = var.data_node_amount
+  data_node_spec                   = var.data_node_spec
+  data_node_disk_size              = var.data_node_disk_size
+  data_node_disk_type              = var.data_node_disk_type
+  vswitch_id                       = module.vpc.this_vswitch_ids[0]
+  password                         = var.password
+  es_version                       = "7.10_with_X-Pack"
+  private_whitelist                = var.private_whitelist
+  kibana_whitelist                 = var.kibana_whitelist
+  master_node_spec                 = var.master_node_spec
+  description                      = var.description
+  data_node_disk_performance_level = var.data_node_disk_performance_level
+  kibana_node_spec                 = var.kibana_node_spec
 
 }

examples/complete/tfvars/01-update.tfvars

@@ -1,11 +1,9 @@
 #alicloud_elasticsearch_instance
 period              = 2
 data_node_amount    = 3
-data_node_spec      = "elasticsearch.sn2ne.large"
 data_node_disk_size = 30
 data_node_disk_type = "cloud_ssd"
 password            = "YourPassword123!Update"
 private_whitelist   = ["172.16.0.0/21"]
 kibana_whitelist    = ["172.16.0.0/21"]
-master_node_spec    = "elasticsearch.sn2ne.xlarge"
 description         = "update-tf-description"

examples/complete/variables.tf

@@ -19,7 +19,7 @@ variable "data_node_amount" {
 variable "data_node_spec" {
   description = "The data node specifications of the Elasticsearch instance."
   type        = string
-  default     = "elasticsearch.sn1ne.large"
+  default     = "elasticsearch.sn2ne.large"
 }
 
 variable "data_node_disk_size" {
@@ -31,7 +31,7 @@ variable "data_node_disk_size" {
 variable "data_node_disk_type" {
   description = "The data node disk type. Supported values: cloud_ssd, cloud_efficiency."
   type        = string
-  default     = "cloud_efficiency"
+  default     = "cloud_ssd"
 }
 
 variable "password" {
@@ -55,11 +55,23 @@ variable "kibana_whitelist" {
 variable "master_node_spec" {
   description = "The master node specifications of the Elasticsearch instance."
   type        = string
-  default     = "elasticsearch.sn2ne.large"
+  default     = null
 }
 
 variable "description" {
   description = "The description of the Elasticsearch instance."
   type        = string
   default     = "tf-description"
-}
+}
+
+variable "data_node_disk_performance_level" {
+  description = "The description of the Elasticsearch instance."
+  type        = string
+  default     = "PL1"
+}
+
+variable "kibana_node_spec" {
+  description = "The description of the Elasticsearch instance."
+  type        = string
+  default     = "elasticsearch.sn2ne.large"
+}

main.tf

@@ -1,17 +1,19 @@
 resource "alicloud_elasticsearch_instance" "instance" {
   count = var.number_of_instance
 
-  instance_charge_type = var.instance_charge_type
-  period               = var.period
-  data_node_amount     = var.data_node_amount
-  data_node_spec       = var.data_node_spec
-  data_node_disk_size  = var.data_node_disk_size
-  data_node_disk_type  = var.data_node_disk_type
-  vswitch_id           = var.vswitch_id
-  password             = var.password
-  version              = var.es_version
-  private_whitelist    = var.private_whitelist
-  kibana_whitelist     = var.kibana_whitelist
-  master_node_spec     = var.master_node_spec
-  description          = var.description
+  instance_charge_type             = var.instance_charge_type
+  period                           = var.period
+  data_node_amount                 = var.data_node_amount
+  data_node_spec                   = var.data_node_spec
+  data_node_disk_size              = var.data_node_disk_size
+  data_node_disk_type              = var.data_node_disk_type
+  vswitch_id                       = var.vswitch_id
+  password                         = var.password
+  version                          = var.es_version
+  private_whitelist                = var.private_whitelist
+  kibana_whitelist                 = var.kibana_whitelist
+  master_node_spec                 = var.master_node_spec
+  description                      = var.description
+  data_node_disk_performance_level = var.data_node_disk_performance_level
+  kibana_node_spec                 = var.kibana_node_spec
 }

variables.tf

@@ -86,4 +86,16 @@ variable "description" {
   description = "The description of the Elasticsearch instance."
   type        = string
   default     = ""
-}
+}
+
+variable "data_node_disk_performance_level" {
+  description = "Cloud disk performance level. Valid values are `PL0`, `PL1`, `PL2`, `PL3`. The `data_node_disk_type` muse be `cloud_essd`."
+  type        = string
+  default     = null
+}
+
+variable "kibana_node_spec" {
+  description = "The kibana node specifications of the Elasticsearch instance."
+  type        = string
+  default     = null
+}