updated deploy dir paths

scripts/deploy_alerts.sh

 #!/bin/bash
 
 
-ALERTS_DEPLOY_DIR=build/$CI_BUILD_ID/alerts
+ALERTS_DEPLOY_DIR=build/$CI_PIPELINE_ID/alerts
 ALERTS_TAR_NAME=alerts
 CURRENT_DIR=$PWD
 
-mkdir -p ${ALERTS_DEPLOY_DIR}
-cd ${ALERTS_DEPLOY_DIR}
+mkdir -p ${CURRENT_DIR}/${ALERTS_DEPLOY_DIR}
+cd ${CURRENT_DIR}/${ALERTS_DEPLOY_DIR}
 
 echo "Cleaning up previous archives"
-rm -rf ${ALERTS_TAR_NAME}.tar.gz
+rm -rf ${CURRENT_DIR}/${ALERTS_TAR_NAME}.tar.gz
 
 echo "Downloading artifact from $ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${ALERTS_TAR_NAME}.tar.gz"
 curl -O -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS "$ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${ALERTS_TAR_NAME}.tar.gz"
 ls -larth
 pwd
-tar -xzvf ${ALERTS_TAR_NAME}.tar.gz
+mkdir -p ${CURRENT_DIR}/${ALERTS_TAR_NAME}
+tar -xzvf ${ALERTS_TAR_NAME}.tar.gz -C ${CURRENT_DIR}/${DASHBOARD_DEPLOY_DIR}/${ALERTS_TAR_NAME}
 cd ${ALERTS_TAR_NAME}
 
 ls -larth

scripts/deploy_dashboards.sh

 #!/bin/bash
 
-ALERTS_DEPLOY_DIR=build/$CI_BUILD_ID/alerts
+DASHBOARD_DEPLOY_DIR=build/$CI_PIPELINE_ID/dashboards
 DASHBOARD_TAR_NAME=dashboards
 CURRENT_DIR=$PWD
 
-mkdir -p ${ALERTS_DEPLOY_DIR}
-cd ${ALERTS_DEPLOY_DIR}
+mkdir -p ${CURRENT_DIR}/${DASHBOARD_DEPLOY_DIR}
+cd ${CURRENT_DIR}/${DASHBOARD_DEPLOY_DIR}
 
 echo "Cleaning up previous archives"
-rm -rf ${DASHBOARD_TAR_NAME}.tar.gz
+rm -rf ${CURRENT_DIR}/${DASHBOARD_DEPLOY_DIR}/*
 
 echo "Downloading artifact from $ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${DASHBOARD_TAR_NAME}.tar.gz"
 curl -O -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS "$ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${DASHBOARD_TAR_NAME}.tar.gz"
 ls -larth
 pwd
-tar -xzvf ${DASHBOARD_TAR_NAME}.tar.gz
+mkdir -p ${DASHBOARD_TAR_NAME}
+tar -xzvf ${DASHBOARD_TAR_NAME}.tar.gz -C ${CURRENT_DIR}/${DASHBOARD_DEPLOY_DIR}/${DASHBOARD_TAR_NAME}
 cd ${DASHBOARD_TAR_NAME}
 
 ls -larth
@@ -27,7 +28,7 @@ for FILE in *;
    -H "Authorization: Bearer $TOKEN" \
    -H "Content-Type: application/json" \
    -d "$DASHBOARD" \
-   $GRAFANA_URL/api/v1/provisioning/alert-rules
+   $GRAFANA_URL/api/dashboards/db
   echo "\n"
 done
 

scripts/promote_alerts_artifacts.sh

@@ -6,6 +6,11 @@ ARCHIVE_PATH=build/archive
 
 CURRENT_DIR=$PWD
 
+mkdir -p ${CURRENT_DIR}/${ARCHIVE_PATH}
+
+echo "Cleaning up previous archives"
+rm -rf ${CURRENT_DIR}/${ARCHIVE_PATH}/${ALERTS_TAR_NAME}.tar.gz
+
 cd ${ALERTS_BUILD_PATH}
 
 count_file=`ls -1 *.json 2>/dev/null | wc -l`
@@ -14,8 +19,9 @@ echo "${count_file} json files found at `pwd`"
 if [ $count_file != 0 ]
  then
     tar -cvzf ${ARCHIVE_PATH}/${ALERTS_TAR_NAME}.tar.gz *.json
+    ls -larth ${CURRENT_DIR}/${ARCHIVE_PATH}
     echo "Uploading to $ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${ALERTS_TAR_NAME}.tar.gz"
-    curl -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS -T ${ARCHIVE_PATH}/${ALERTS_TAR_NAME}.tar.gz "$ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${ALERTS_TAR_NAME}.tar.gz"
+    curl -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS -T ${CURRENT_DIR}/${ARCHIVE_PATH}/${ALERTS_TAR_NAME}.tar.gz "$ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${ALERTS_TAR_NAME}.tar.gz"
     echo "Artifact Uploaded Successfully"
 else
     echo  "ERROR: No json files found at ${ALERTS_BUILD_PATH}. Build process Failed"

scripts/promote_dashboard_artifacts.sh

@@ -6,16 +6,22 @@ ARCHIVE_PATH=build/archive
 
 CURRENT_DIR=$PWD
 
-cd ${DASHBOARDS_BUILD_PATH}
+mkdir -p ${CURRENT_DIR}/${ARCHIVE_PATH}
+
+echo "Cleaning up previous archives"
+rm -rf ${CURRENT_DIR}/${ARCHIVE_PATH}/${DASHBOARDS_TAR_NAME}.tar.gz
 
+cd ${DASHBOARDS_BUILD_PATH}
+ls -larth
 count_file=`ls -1 *.json 2>/dev/null | wc -l`
 echo "${count_file} json files found at `pwd`"
 
 if [ $count_file != 0 ]
  then
-    tar -cvzf ${ARCHIVE_PATH}/${DASHBOARDS_TAR_NAME}.tar.gz *.json
+    tar -cvzf ${CURRENT_DIR}/${ARCHIVE_PATH}/${DASHBOARDS_TAR_NAME}.tar.gz *.json
+    ls -larth ${CURRENT_DIR}/${ARCHIVE_PATH}
     echo "Uploading to $ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${DASHBOARDS_TAR_NAME}.tar.gz"
-    curl -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS -T ${ARCHIVE_PATH}/${DASHBOARDS_TAR_NAME}.tar.gz "$ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${DASHBOARDS_TAR_NAME}.tar.gz"
+    curl -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS -T ${CURRENT_DIR}/${ARCHIVE_PATH}/${DASHBOARDS_TAR_NAME}.tar.gz "$ARTIFACTORY_URL/grafonet/$CI_PIPELINE_ID/${DASHBOARDS_TAR_NAME}.tar.gz"
     echo "Artifact Uploaded Successfully"
 else
     echo  "ERROR: No json files found at ${DASHBOARDS_BUILD_PATH}. Build process Failed"