Adding monitoring and logging (#2)

.github/workflows/terraform.yml

@@ -94,5 +94,5 @@ jobs:
       # On push to "main", build or change infrastructure according to Terraform configuration files
       # Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks
     - name: Terraform Apply
-      if: github.ref == 'refs/heads/"main"' && github.event_name == 'push'
+      if: github.ref == 'refs/heads/main' && github.event_name == 'push'
       run: terraform apply -auto-approve -input=false

ec2.tf

@@ -21,4 +21,8 @@ resource "aws_instance" "minecraft_server" {
               echo "eula=true" > eula.txt
               java -Xms2G -Xmx4G -jar server.jar nogui
               EOF
+
+  tags = {
+    Name = "minecraft_server"
+  }
 }

locals.tf

@@ -1,4 +1,5 @@
 locals {
   # Allowed CIDR for minecraft_server
-  allowed_ips = ["186.155.12.50/32"]
+  allowed_ips   = ["186.155.12.50/32"]
+  ssh_source_ip = "186.155.12.50/32"
 }

monitoring/logging.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ssh -i '/Users/Oscar_Lopez/Downloads/test.pem' [email protected] tail -f /minecraft_server/logs/latest.log

monitoring/top.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+pid=$(ssh -i '/Users/Oscar_Lopez/Downloads/test.pem' [email protected] pidof java)
+ssh -i '/Users/Oscar_Lopez/Downloads/test.pem' [email protected] ps -p ${pid} -o %cpu,%mem,cmd

outputs.tf

@@ -0,0 +1,5 @@
+output "pub_ip" {
+  value       = aws_instance.minecraft_server.public_ip
+  description = "Instance Public IP"
+  depends_on  = [aws_instance.minecraft_server]
+}

sg.tf

@@ -10,7 +10,7 @@ resource "aws_security_group" "minecraft_server" {
 
 resource "aws_vpc_security_group_ingress_rule" "minecraft_server_ssh" {
   security_group_id = aws_security_group.minecraft_server.id
-  cidr_ipv4         = "186.155.12.50/32"
+  cidr_ipv4         = local.ssh_source_ip
   from_port         = 22
   ip_protocol       = "tcp"
   to_port           = 22
@@ -23,4 +23,10 @@ resource "aws_vpc_security_group_ingress_rule" "minecraft_server_port" {
   from_port         = 25565
   ip_protocol       = "tcp"
   to_port           = 25565
+}
+
+resource "aws_vpc_security_group_egress_rule" "minecraft_server" {
+  security_group_id = aws_security_group.minecraft_server.id
+  cidr_ipv4         = "0.0.0.0/0"
+  ip_protocol       = -1
 }