Fix/add configurable healthcheck settings

README.md

@@ -41,23 +41,27 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_instance_group_version_name"></a> [instance\_group\_version\_name](#input\_instance\_group\_version\_name) | A name to give to the instance group version control (e.g. app\_name + app\_version) | `string` | n/a | yes |
-| <a name="input_name"></a> [name](#input\_name) | A name which will be pre-pended to the resources created | `string` | n/a | yes |
-| <a name="input_network"></a> [network](#input\_network) | The name of the network to deploy within | `string` | n/a | yes |
-| <a name="input_region"></a> [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes |
-| <a name="input_service_account_email"></a> [service\_account\_email](#input\_service\_account\_email) | The name of the service account email address to bind to the deployment | `string` | n/a | yes |
-| <a name="input_user_supplied_script"></a> [user\_supplied\_script](#input\_user\_supplied\_script) | The user-data script extension to execute | `string` | n/a | yes |
 | <a name="input_associate_public_ip_address"></a> [associate\_public\_ip\_address](#input\_associate\_public\_ip\_address) | Whether to assign a public ip address to this instance; if false this instance must be behind a Cloud NAT to connect to the internet | `bool` | `true` | no |
+| <a name="input_check_interval_sec"></a> [check\_interval\_sec](#input\_check\_interval\_sec) | How often (in seconds) to send a health check | `number` | `5` | no |
 | <a name="input_health_check_path"></a> [health\_check\_path](#input\_health\_check\_path) | The path to bind for health checks | `string` | `""` | no |
+| <a name="input_healthy_threshold"></a> [healthy\_threshold](#input\_healthy\_threshold) | A so-far unhealthy instance will be marked healthy after this many consecutive successes | `number` | `2` | no |
 | <a name="input_ingress_port"></a> [ingress\_port](#input\_ingress\_port) | The port that the service will be bound to and exposed over HTTP | `number` | `-1` | no |
+| <a name="input_instance_group_version_name"></a> [instance\_group\_version\_name](#input\_instance\_group\_version\_name) | A name to give to the instance group version control (e.g. app\_name + app\_version) | `string` | n/a | yes |
 | <a name="input_labels"></a> [labels](#input\_labels) | The labels to append to this resource | `map(string)` | `{}` | no |
 | <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | The machine type to use | `string` | `"e2-small"` | no |
+| <a name="input_name"></a> [name](#input\_name) | A name which will be pre-pended to the resources created | `string` | n/a | yes |
 | <a name="input_named_port_http"></a> [named\_port\_http](#input\_named\_port\_http) | The name to give to the bound port on the instance group | `string` | `""` | no |
+| <a name="input_network"></a> [network](#input\_network) | The name of the network to deploy within | `string` | n/a | yes |
+| <a name="input_region"></a> [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes |
+| <a name="input_service_account_email"></a> [service\_account\_email](#input\_service\_account\_email) | The name of the service account email address to bind to the deployment | `string` | n/a | yes |
 | <a name="input_ssh_block_project_keys"></a> [ssh\_block\_project\_keys](#input\_ssh\_block\_project\_keys) | Whether to block project wide SSH keys | `bool` | `true` | no |
 | <a name="input_ssh_key_pairs"></a> [ssh\_key\_pairs](#input\_ssh\_key\_pairs) | The list of SSH key-pairs to add to the servers | <pre>list(object({<br>    user_name  = string<br>    public_key = string<br>  }))</pre> | `[]` | no |
 | <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | The name of the sub-network to deploy within; if populated will override the 'network' setting | `string` | `""` | no |
 | <a name="input_target_size"></a> [target\_size](#input\_target\_size) | The number of servers to deploy | `number` | `1` | no |
+| <a name="input_timeout_sec"></a> [timeout\_sec](#input\_timeout\_sec) | How long (in seconds) to wait before claiming failure | `number` | `5` | no |
 | <a name="input_ubuntu_20_04_source_image"></a> [ubuntu\_20\_04\_source\_image](#input\_ubuntu\_20\_04\_source\_image) | The source image to use which must be based of of Ubuntu 20.04; by default the latest community version is used | `string` | `""` | no |
+| <a name="input_unhealthy_threshold"></a> [unhealthy\_threshold](#input\_unhealthy\_threshold) | A so-far healthy instance will be marked unhealthy after this many consecutive failures | `number` | `10` | no |
+| <a name="input_user_supplied_script"></a> [user\_supplied\_script](#input\_user\_supplied\_script) | The user-data script extension to execute | `string` | n/a | yes |
 
 ## Outputs
 

main.tf

@@ -71,10 +71,10 @@ resource "google_compute_health_check" "hc" {
 
   name = var.name
 
-  check_interval_sec  = 5
-  timeout_sec         = 5
-  healthy_threshold   = 2
-  unhealthy_threshold = 10
+  check_interval_sec  = var.check_interval_sec
+  timeout_sec         = var.timeout_sec
+  healthy_threshold   = var.healthy_threshold
+  unhealthy_threshold = var.unhealthy_threshold
 
   http_health_check {
     request_path = var.health_check_path

variables.tf

@@ -75,6 +75,30 @@ variable "health_check_path" {
   default     = ""
 }
 
+variable "timeout_sec" {
+  description = "How long (in seconds) to wait before claiming failure"
+  type        = number
+  default     = 5
+}
+
+variable "check_interval_sec" {
+  description = "How often (in seconds) to send a health check"
+  type        = number
+  default     = 5
+}
+
+variable "healthy_threshold" {
+  description = "A so-far unhealthy instance will be marked healthy after this many consecutive successes"
+  type        = number
+  default     = 2
+}
+
+variable "unhealthy_threshold" {
+  description = "A so-far healthy instance will be marked unhealthy after this many consecutive failures"
+  type        = number
+  default     = 10
+}
+
 variable "user_supplied_script" {
   description = "The user-data script extension to execute"
   type        = string