From: Bryan Sullivan <bryan.sullivan@att.com>
Date: Sun, 19 Nov 2017 01:08:42 +0000 (-0800)
Subject: Correct dashboard import
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=376f01d813554c3c5fa028e580554bd5647b8764;p=models.git

Correct dashboard import

JIRA: MODELS-2

Change-Id: I8996ccb4d49fa8f7bd55aa55cb96339436f5ad3e
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
---

diff --git a/tools/prometheus/prometheus-tools.sh b/tools/prometheus/prometheus-tools.sh
index f713f01..04a2623 100644
--- a/tools/prometheus/prometheus-tools.sh
+++ b/tools/prometheus/prometheus-tools.sh
@@ -171,7 +171,7 @@ EOF
   # To add additional dashboards, browse the URL above and import the dashboard via the id displayed for the dashboard
   # Select the home icon (upper left), Dashboards / Import, enter the id, select load, and select the Prometheus datasource
 
-  cd ~/models/tools/prometheus/dashboards
+  cd $WORK_DIR/dashboards
   boards=$(ls)
   for board in $boards; do
     curl -X POST -u admin:admin -H "Accept: application/json" -H "Content-type: application/json" -d @${board} http://$grafana_ip:3000/api/dashboards/db
@@ -198,6 +198,7 @@ function run_and_connect_grafana() {
   log "connect_grafana complete"
 }
 
+export WORK_DIR=$(pwd)
 nodes=$2
 case "$1" in
   setup)