Merge branch 'workflows-fix' into staging

Author: pmatsinopoulos

terraform/ethereum_ec2_install_lz4.tf

@@ -0,0 +1,18 @@
+resource "terraform_data" "install_lz4" {
+  depends_on = [aws_instance.ethereum]
+
+  connection {
+    type        = "ssh"
+    user        = var.ethereum_node.user
+    port        = var.ethereum_node.ssh_port
+    host        = aws_instance.ethereum.public_ip
+    private_key = file("${path.module}/ethereum.pem")
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "sudo apt-get update -y",
+      "sudo apt-get install -y lz4"
+    ]
+  }
+}

terraform/ethereum_ec2_instance.tf

@@ -50,6 +50,8 @@ resource "aws_instance" "ethereum" {
   vpc_security_group_ids = [
     local.vpc_default_security_group_id,
     aws_security_group.ethereum_ssh.id,
-    aws_security_group.ethereum_nginx.id
+    aws_security_group.ethereum_nginx.id,
+    aws_security_group.ethereum_public_p2p.id,
+    aws_security_group.lighthouse_public_p2p.id
   ]
 }

terraform/ethereum_ec2_public_ip.tf

@@ -10,5 +10,5 @@ resource "aws_eip" "ethereum" {
 output "ethereum_ssh_connect" {
   value       = "ssh -p ${var.ethereum_node.ssh_port} -i ${path.module}/ethereum.pem -o IdentitiesOnly=yes ${var.ethereum_node.user}@${aws_eip.ethereum.public_ip}"
   description = "SSH command to connect to the Ethereum EC2 instance"
-  sensitive   = true
+  sensitive   = false
 }

terraform/ethereum_lb_unhealthy_host_count_alarm.tf

@@ -0,0 +1,34 @@
+resource "aws_cloudwatch_metric_alarm" "ethereum_lb_unhealthy_host_count" {
+  alarm_name        = "${var.project}_${var.environment}_ethereum_lb_unhealthy_host_count"
+  alarm_description = "Watches for Ethereum Load Balancer Unhealthy Host Count"
+
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  datapoints_to_alarm = 1
+
+  metric_name = "UnHealthyHostCount"
+  namespace   = "AWS/ApplicationELB"
+  period      = "60"
+  statistic   = "Minimum"
+  threshold   = "0"
+
+  alarm_actions = [
+    data.aws_sns_topic.developers_notifications.arn
+  ]
+  ok_actions = [
+    data.aws_sns_topic.developers_notifications.arn
+  ]
+
+  insufficient_data_actions = []
+
+  treat_missing_data = "notBreaching"
+
+  dimensions = {
+    TargetGroup  = aws_lb_target_group.ethereum_nginx.arn_suffix
+    LoadBalancer = aws_lb.main.arn_suffix
+  }
+
+  tags = {
+    "Name" = "${var.project}_${var.environment}_ethereum_lb_unhealthy_host_count"
+  }
+}

terraform/ethereum_nginx_cloudwatch_logs.tf

@@ -2,6 +2,8 @@ resource "aws_cloudwatch_log_group" "ethereum_nginx_access" {
   name              = "${var.project}-${var.environment}-ethereum-nginx-access"
   retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
 
+  depends_on = [terraform_data.nginx_configuration]
+
   tags = {
     "Name" = "${var.project}-${var.environment}-ethereum-nginx-access"
   }
@@ -11,6 +13,8 @@ resource "aws_cloudwatch_log_group" "ethereum_nginx_error" {
   name              = "${var.project}-${var.environment}-ethereum-nginx-error"
   retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
 
+  depends_on = [terraform_data.nginx_configuration]
+
   tags = {
     "Name" = "${var.project}-${var.environment}-ethereum-nginx-error"
   }

terraform/production/ethereum_ec2_install_lz4.tf

@@ -0,0 +1 @@
+../ethereum_ec2_install_lz4.tf

terraform/production/ethereum_lb_unhealthy_host_count_alarm.tf

@@ -0,0 +1 @@
+../ethereum_lb_unhealthy_host_count_alarm.tf

terraform/staging/ethereum_ec2_install_lz4.tf

@@ -0,0 +1 @@
+../ethereum_ec2_install_lz4.tf

terraform/staging/ethereum_lb_unhealthy_host_count_alarm.tf

@@ -0,0 +1 @@
+../ethereum_lb_unhealthy_host_count_alarm.tf