Fix grafana config

BBVA · Feb 19, 2019 · 4df5959 · 4df5959
1 parent b9e09a4
commit 4df5959
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/deploy/aws/modules/prometheus/build.sh b/deploy/aws/modules/prometheus/build.sh
@@ -14,6 +14,7 @@ tdir=$(mktemp -d /tmp/prometheus.XXX)
 prometheus_path=${pub}/prometheus
 
 mkdir -p ${pub}
+cp -r ./provisioning ${pub}
 
 (
 cd ${tdir}

diff --git a/deploy/aws/modules/prometheus/main.tf b/deploy/aws/modules/prometheus/main.tf
@@ -52,17 +52,6 @@ resource "aws_instance" "prometheus" {
     Name = "qed-prometheus"
   }
 
-
-  provisioner "file" {
-      source     = "${path.module}/provisioning"
-      destination = "/etc/grafana/provisioning"
-
-      connection {
-        user = "ec2-user"
-        private_key = "${file("${var.key_path}")}"
-      }
-  }
-
  provisioner "file" {
       source     = "${path.module}/data"
       destination = "${var.path}"
@@ -86,7 +75,12 @@ resource "aws_instance" "prometheus" {
   user_data = <<-DATA
   #!/bin/bash
 
+   while [ `lsof ${var.path}/provisioning | wc -l` -gt 0 ]; do
+    sleep 1 # INFO: prevents Error of `text file busy`
+  done 
+
   sudo yum install -y https://dl.grafana.com/oss/release/grafana-5.4.2-1.x86_64.rpm
+  sudo mv ${var.path}/provisioning /etc/grafana
   sudo service grafana-server start
 
   while [ `lsof ${var.path}/prometheus | wc -l` -gt 0 ]; do