Merge pull request #58 from Ontotext-AD/fix-monitoring-issues

Fixed variable name for FQDN

README.md

@@ -144,6 +144,8 @@ Before you begin using this Terraform module, ensure you meet the following prer
 | monitoring\_endpoint\_auto\_confirms | Enable or disable endpoint auto confirm subscription to the sns topic | `bool` | `false` | no |
 | monitoring\_log\_group\_retention\_in\_days | Log group retention in days | `number` | `30` | no |
 | monitoring\_route53\_health\_check\_aws\_region | Define the region in which you want the monitoring to be deployed. It is used to define where the Route53 Availability Check will be deployed, since if it is not specified it will deploy the check in us-east-1 and if you deploy in different region it will not find the dimensions. | `string` | `"us-east-1"` | no |
+| monitoring\_route53\_availability\_http\_port | Define the HTTP port for the Route53 availability check | `number` | `80` | no |
+| monitoring\_route53\_availability\_https\_port | Define the HTTPS port for the Route53 availability check | `number` | `443` | no |
 | monitoring\_route53\_healtcheck\_fqdn\_url | Define custom domain name for the Route53 Health check | `string` | `""` | no |
 | graphdb\_properties\_path | Path to a local file containing GraphDB properties (graphdb.properties) that would be appended to the default in the VM. | `string` | `null` | no |
 | graphdb\_java\_options | GraphDB options to pass to GraphDB with GRAPHDB\_JAVA\_OPTS environment variable. | `string` | `null` | no |

main.tf

@@ -41,8 +41,6 @@ locals {
     var.sns_default_kms_key)) :
     var.sns_default_kms_key
   )
-  route53_availability_request_url = var.monitoring_route53_healtcheck_fqdn_url != "" ? var.monitoring_route53_healtcheck_fqdn_url: module.load_balancer.lb_dns_name
-  route53_availability_port        = var.lb_tls_certificate_arn != "" ? 443 : 80
 }
 
 locals {
@@ -223,12 +221,12 @@ module "monitoring" {
   cmk_key_alias                          = var.sns_cmk_key_alias
   parameter_store_kms_key_arn            = local.calculated_parameter_store_kms_key_arn
   cloudwatch_log_group_retention_in_days = var.monitoring_log_group_retention_in_days
-  route53_availability_request_url       = local.route53_availability_request_url
+  route53_availability_request_url       = var.monitoring_route53_healtcheck_fqdn_url != "" ? var.monitoring_route53_healtcheck_fqdn_url : module.load_balancer.lb_dns_name
   route53_availability_measure_latency   = var.monitoring_route53_measure_latency
   sns_kms_key_arn                        = local.calculated_sns_kms_key_arn
   graphdb_node_count                     = var.graphdb_node_count
   route53_availability_http_string_type  = local.calculated_http_string_type
-  route53_availability_port              = local.route53_availability_port
+  route53_availability_port              = var.lb_tls_certificate_arn != "" ? var.monitoring_route53_availability_http_port : var.monitoring_route53_availability_https_port
 }
 
 module "graphdb" {

variables.tf

@@ -362,6 +362,18 @@ variable "monitoring_route53_health_check_aws_region" {
   default     = "us-east-1"
 }
 
+variable "monitoring_route53_availability_http_port" {
+  description = "Define the HTTP port for the Route53 availability check"
+  type        = number
+  default     = 80
+}
+
+variable "monitoring_route53_availability_https_port" {
+  description = "Define the HTTPS port for the Route53 availability check"
+  type        = number
+  default     = 443
+}
+
 variable "monitoring_route53_healtcheck_fqdn_url" {
   description = "Define custom domain name for the Route53 Health check"
   type        = string