Fix agents config and add awslogs stream config

BBVA · Feb 19, 2019 · f9eb3ad · f9eb3ad
1 parent d66c35e
commit f9eb3ad
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/deploy/aws/main.tf b/deploy/aws/main.tf
@@ -28,6 +28,7 @@ module "leader" {
   subnet_id = "${element(data.aws_subnet_ids.all.ids, 0)}"
   key_name = "${aws_key_pair.qed.key_name}"
   key_path = "${var.keypath}"
+  command = "start >> /var/tmp/qed/qed.log"
 
   config = <<-CONFIG
   ---
@@ -54,6 +55,7 @@ module "follower-1" {
   subnet_id = "${element(data.aws_subnet_ids.all.ids, 0)}"
   key_name = "${aws_key_pair.qed.key_name}"
   key_path = "${var.keypath}"
+  command = "start >> /var/tmp/qed/qed.log"
 
   config = <<-CONFIG
   ---
@@ -84,6 +86,7 @@ module "follower-2" {
   subnet_id = "${element(data.aws_subnet_ids.all.ids, 0)}"
   key_name = "${aws_key_pair.qed.key_name}"
   key_path = "${var.keypath}"
+  command = "start >> /var/tmp/qed/qed.log"
 
   config = <<-CONFIG
   ---
@@ -126,7 +129,7 @@ module "agent-publisher" {
   key_name = "${aws_key_pair.qed.key_name}"
   key_path = "${var.keypath}"
 
-  command="agent publisher"
+  command = "agent publisher >> /var/tmp/qed/qed.log"
   config = <<-CONFIG
   ---
   api_key: "terraform_qed"
@@ -137,12 +140,10 @@ module "agent-publisher" {
     advertise: ""
     join:
       - "${module.leader.private_ip[0]}:8400"
-    server_urls:
-      - "${module.leader.private_ip[0]}:8800"
     alert_urls:
-      - "${module.inmemory-storage.private_ip}:8888"
+      - "http://${module.inmemory-storage.private_ip}:8888"
     snapshots_store_urls:
-      - "${module.inmemory-storage.private_ip}:8888"
+      - "http://${module.inmemory-storage.private_ip}:8888"
   CONFIG
 }
 
@@ -158,7 +159,7 @@ module "agent-monitor" {
   key_name = "${aws_key_pair.qed.key_name}"
   key_path = "${var.keypath}"
 
-  command="agent monitor"
+  command="agent monitor >> /var/tmp/qed/qed.log"
   config = <<-CONFIG
   ---
   api_key: "terraform_qed"
@@ -170,11 +171,11 @@ module "agent-monitor" {
     join:
       - "${module.leader.private_ip[0]}:8400"
     server_urls:
-      - "${module.leader.private_ip[0]}:8800"
+      - "https://${module.follower-1.private_ip[0]}:8800"
     alert_urls:
-      - "${module.inmemory-storage.private_ip}:8888"
+      - "http://${module.inmemory-storage.private_ip}:8888"
     snapshots_store_urls:
-      - "${module.inmemory-storage.private_ip}:8888"
+      - "http://${module.inmemory-storage.private_ip}:8888"
   CONFIG
 }
 
@@ -189,7 +190,7 @@ module "agent-auditor" {
   key_name = "${aws_key_pair.qed.key_name}"
   key_path = "${var.keypath}"
 
-  command="agent auditor"
+  command="agent auditor >> /var/tmp/qed/qed.log"
   config = <<-CONFIG
   ---
   api_key: "terraform_qed"
@@ -201,11 +202,11 @@ module "agent-auditor" {
     join:
       - "${module.leader.private_ip[0]}:8400"
     server_urls:
-      - "${module.leader.private_ip[0]}:8800"
+      - "https://${module.follower-2.private_ip[0]}:8800"
     alert_urls:
-      - "${module.inmemory-storage.private_ip}:8888"
+      - "http://${module.inmemory-storage.private_ip}:8888"
     snapshots_store_urls:
-      - "${module.inmemory-storage.private_ip}:8888"
+      - "http://${module.inmemory-storage.private_ip}:8888"
   CONFIG
 }
 

diff --git a/deploy/aws/modules/prometheus/outputs.tf b/deploy/aws/modules/prometheus/outputs.tf
@@ -1,7 +1,6 @@
 output "private_ip" {
   value = "${aws_instance.prometheus.private_ip}"
 }
-
 output "public_ip" {
   value = "${aws_instance.prometheus.public_ip}"
 }
diff --git a/deploy/aws/modules/qed/main.tf b/deploy/aws/modules/qed/main.tf
@@ -72,6 +72,18 @@ resource "aws_instance" "qed-server" {
   echo "Install and enable AWS CloudWatch"
   aws configure set region eu-west-1 
   sudo yum install -y awslogs
+  sudo sed -i "s/us-east-1/eu-west-1/g" /etc/awslogs/awscli.conf
+sudo cat << EOF >> /etc/awslogs/awslogs.conf
+
+[/var/tmp/qed]
+datetime_format = %b %d %H:%M:%S
+file = /var/tmp/qed/qed.log
+buffer_duration = 5000
+log_stream_name = ${var.name}
+initial_position = start_of_file
+log_group_name = qed
+EOF
+
   sudo service awslogs start
 
   while [ ! -f ${var.path}/qed ]; do