Fixed issues with backup and monitoring

CHANGELOG.md

@@ -1,5 +1,11 @@
 # GraphDB AWS Terraform Module Changelog
 
+# 1.2.2
+
+* Fixed issues with variables in the backup user data script
+* Added ability to choose http port for Route53 availability check
+* Added ability to specify custom FQDN for the Route53 availability URL
+
 # 1.2.1
 
 * Fixed issue where the backup script was not configured

main.tf

@@ -41,6 +41,8 @@ locals {
     var.sns_default_kms_key)) :
     var.sns_default_kms_key
   )
+  route53_availability_request_url = var.fqdn_url != "" ? var.fqdn_url : module.load_balancer.lb_dns_name
+  route53_availability_port        = var.lb_tls_certificate_arn != "" ? 443 : 80
 }
 
 locals {
@@ -221,12 +223,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       = module.load_balancer.lb_dns_name
+  route53_availability_request_url       = local.route53_availability_request_url
   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
 }
 
 module "graphdb" {

modules/graphdb/templates/05_gdb_backup_conf.sh.tpl

@@ -27,8 +27,8 @@ NODE_STATE="\$(curl --silent -u "admin:\$GRAPHDB_ADMIN_PASSWORD" http://localhos
 
 function trigger_backup {
   local backup_name="\$(date +'%Y-%m-%d_%H-%M-%S').tar"
-  current_time=$(date +"%T %Y-%m-%d")
-  start_time=$(date +%s)
+  current_time=\$(date +"%T %Y-%m-%d")
+  start_time=\$(date +%s)
   echo "Creating backup \$backup_name at \$start_time"
 
   curl \
@@ -62,17 +62,19 @@ IS_CLUSTER=\$(
   curl -s -o /dev/null \
     -u "admin:\$GRAPHDB_ADMIN_PASSWORD" \
     -w "%%{http_code}" \
-    http://localhost:7200/rest/monitor/cluster
+    http://localhost:7201/rest/monitor/cluster
 )
 
-if [ "\$IS_CLUSTER" == 200 ]; then
+if [ "\$IS_CLUSTER" -eq 200 ]; then
+  echo "GraphDB is running in a cluster."
   # Checks if the current GraphDB instance is Leader, otherwise exits.
   if [ "\$NODE_STATE" != "LEADER" ]; then
-    echo "current node is not a leader, but \$NODE_STATE"
+    echo "Current node is not a leader, but \$NODE_STATE"
     exit 0
   fi
   (trigger_backup && echo "") | tee -a /var/opt/graphdb/node/graphdb_backup.log
-elif [ "\$IS_CLUSTER" == 503 ]; then
+elif [ "\$IS_CLUSTER" -ne 200 ]; then
+  echo "GraphDB is not running in a cluster."
   (trigger_backup && echo "") | tee -a /var/opt/graphdb/node/graphdb_backup.log
 fi
 

variables.tf

@@ -740,3 +740,9 @@ variable "sns_rotation_enabled" {
   type        = bool
   default     = true
 }
+
+variable "fqdn_url" {
+  description = "Define custom domain name for the Route53 Health check"
+  type        = string
+  default     = ""
+}