Add default values for kibana logging vars, as they could be commented out if another logging solution is chosen.

bmonkman · bmonkman · commit b4914d6f0419 · 2020-08-25T16:06:25.000-07:00
diff --git a/templates/terraform/modules/environment/variables.tf b/templates/terraform/modules/environment/variables.tf
@@ -83,27 +83,33 @@ variable "logging_type" {
   }
 }
 
+# The following have default values specified in case logging_type is not set to "kibana", in which case they are not necessary.
 variable "logging_es_version" {
   description = "The version of elasticsearch to use"
+  default     = "7.7"
 }
 
 variable "logging_az_count" {
   description = "The number of availability zones to use for the cluster. More is more higly available but requires more instances, which increases cost"
   type        = number
+  default     = 1
 }
 
 variable "logging_es_instance_type" {
   description = "Instance type for nodes"
+  default     = "m3.medium.elasticsearch"
 }
 
 variable "logging_es_instance_count" {
-  description = "Number of nodes in the cluster. Must be a multiple of the number of"
+  description = "Number of nodes in the cluster. Must be a multiple of the number of availability zones"
   type        = number
+  default     = 1
 }
 
 variable "logging_volume_size_in_gb" {
   description = "Size of EBS volume (in GB) to attach to *each* of the nodes in the cluster. The maximum size is limited by the size of the instance"
   type        = number
+  default     = 10
 }
 
 variable "enable_cluster_logging" {

Original file line number	Diff line number	Diff line change
`@@ -83,27 +83,33 @@ variable "logging_type" {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
	`86`	`+# The following have default values specified in case logging_type is not set to "kibana", in which case they are not necessary.`
`86`	`87`	`variable "logging_es_version" {`
`87`	`88`	`description = "The version of elasticsearch to use"`
	`89`	`+ default = "7.7"`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`variable "logging_az_count" {`
`91`	`93`	`description = "The number of availability zones to use for the cluster. More is more higly available but requires more instances, which increases cost"`
`92`	`94`	`type = number`
	`95`	`+ default = 1`
`93`	`96`	`}`
`94`	`97`
`95`	`98`	`variable "logging_es_instance_type" {`
`96`	`99`	`description = "Instance type for nodes"`
	`100`	`+ default = "m3.medium.elasticsearch"`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`variable "logging_es_instance_count" {`
`100`		`- description = "Number of nodes in the cluster. Must be a multiple of the number of"`
	`104`	`+ description = "Number of nodes in the cluster. Must be a multiple of the number of availability zones"`
`101`	`105`	`type = number`
	`106`	`+ default = 1`
`102`	`107`	`}`
`103`	`108`
`104`	`109`	`variable "logging_volume_size_in_gb" {`
`105`	`110`	`description = "Size of EBS volume (in GB) to attach to each of the nodes in the cluster. The maximum size is limited by the size of the instance"`
`106`	`111`	`type = number`
	`112`	`+ default = 10`
`107`	`113`	`}`
`108`	`114`
`109`	`115`	`variable "enable_cluster_logging" {`