diff --git a/aws/resource_aws_route53_health_check.go b/aws/resource_aws_route53_health_check.go index 77b527c6acd..1386bd81c1e 100644 --- a/aws/resource_aws_route53_health_check.go +++ b/aws/resource_aws_route53_health_check.go @@ -131,6 +131,12 @@ func resourceAwsRoute53HealthCheck() *schema.Resource { Set: schema.HashString, }, + "disabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "tags": tagsSchema(), }, } @@ -196,6 +202,10 @@ func resourceAwsRoute53HealthCheckUpdate(d *schema.ResourceData, meta interface{ updateHealthCheck.Regions = expandStringList(d.Get("regions").(*schema.Set).List()) } + if d.HasChange("disabled") { + updateHealthCheck.Disabled = aws.Bool(d.Get("disabled").(bool)) + } + _, err := conn.UpdateHealthCheck(updateHealthCheck) if err != nil { return err @@ -294,6 +304,10 @@ func resourceAwsRoute53HealthCheckCreate(d *schema.ResourceData, meta interface{ callerRef = fmt.Sprintf("%s-%s", v.(string), callerRef) } + if v, ok := d.GetOk("disabled"); ok { + healthConfig.Disabled = aws.Bool(v.(bool)) + } + input := &route53.CreateHealthCheckInput{ CallerReference: aws.String(callerRef), HealthCheckConfig: healthConfig, @@ -342,6 +356,7 @@ func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{}) d.Set("resource_path", updated.ResourcePath) d.Set("measure_latency", updated.MeasureLatency) d.Set("invert_healthcheck", updated.Inverted) + d.Set("disabled", updated.Disabled) if err := d.Set("child_healthchecks", flattenStringList(updated.ChildHealthChecks)); err != nil { return fmt.Errorf("error setting child_healthchecks: %s", err) diff --git a/aws/resource_aws_route53_health_check_test.go b/aws/resource_aws_route53_health_check_test.go index 61b30cc91d7..f1eb9a83670 100644 --- a/aws/resource_aws_route53_health_check_test.go +++ b/aws/resource_aws_route53_health_check_test.go @@ -279,6 +279,7 @@ resource "aws_route53_health_check" "foo" { request_interval = "30" measure_latency = true invert_healthcheck = true + disabled = false tags = { Name = "tf-test-health-check" @@ -296,6 +297,7 @@ resource "aws_route53_health_check" "foo" { request_interval = "30" measure_latency = true invert_healthcheck = false + disabled = false tags = { Name = "tf-test-health-check" @@ -387,6 +389,7 @@ resource "aws_route53_health_check" "foo" { request_interval = "30" measure_latency = true invert_healthcheck = false + disabled = false search_string = "OK" tags = { @@ -405,6 +408,7 @@ resource "aws_route53_health_check" "foo" { request_interval = "30" measure_latency = true invert_healthcheck = true + disabled = false search_string = "FAILED" tags = { @@ -423,6 +427,7 @@ resource "aws_route53_health_check" "foo" { request_interval = "30" measure_latency = true invert_healthcheck = true + disabled = false tags = { Name = "tf-test-health-check" @@ -441,6 +446,7 @@ resource "aws_route53_health_check" "foo" { measure_latency = true invert_healthcheck = true enable_sni = true + disabled = false tags = { Name = "tf-test-health-check" @@ -459,6 +465,7 @@ resource "aws_route53_health_check" "foo" { measure_latency = true invert_healthcheck = true enable_sni = false + disabled = false tags = { Name = "tf-test-health-check" diff --git a/website/docs/r/route53_health_check.html.markdown b/website/docs/r/route53_health_check.html.markdown index e583856c7c8..402f21adece 100644 --- a/website/docs/r/route53_health_check.html.markdown +++ b/website/docs/r/route53_health_check.html.markdown @@ -95,6 +95,7 @@ The following arguments are supported: * `search_string` - (Optional) String searched in the first 5120 bytes of the response body for check to be considered healthy. Only valid with `HTTP_STR_MATCH` and `HTTPS_STR_MATCH`. * `measure_latency` - (Optional) A Boolean value that indicates whether you want Route 53 to measure the latency between health checkers in multiple AWS regions and your endpoint and to display CloudWatch latency graphs in the Route 53 console. * `invert_healthcheck` - (Optional) A boolean value that indicates whether the status of health check should be inverted. For example, if a health check is healthy but Inverted is True , then Route 53 considers the health check to be unhealthy. +* `disable` - (Optional) A boolean value that stops Route 53 from performing health checks. When true Route 53 stops submitting requests to your application, server, or other resource, stops aggregating the status of the referenced health checks and stops monitoring the corresponding CloudWatch metrics. After you disable a health check, Route 53 considers the status of the health check to always be healthy. If you configured DNS failover, Route 53 continues to route traffic to the corresponding resources. If you want to stop routing traffic to a resource, change the value of `invert_healthcheck`. * `enable_sni` - (Optional) A boolean value that indicates whether Route53 should send the `fqdn` to the endpoint when performing the health check. This defaults to AWS' defaults: when the `type` is "HTTPS" `enable_sni` defaults to `true`, when `type` is anything else `enable_sni` defaults to `false`. * `child_healthchecks` - (Optional) For a specified parent health check, a list of HealthCheckId values for the associated child health checks. * `child_health_threshold` - (Optional) The minimum number of child health checks that must be healthy for Route 53 to consider the parent health check to be healthy. Valid values are integers between 0 and 256, inclusive