Merge branch 'master' of https://gitlab.mynisum.com/sbilal/abs-grafana

alerts/alert_rule.jsonnet

@@ -2,6 +2,7 @@ local alert_test = import '../alerts-config/alert_rule.libsonnet';
 local alert_data = import '../alerts-config/alert_model.libsonnet';
 local alert_model_data = import '../alerts-config/alert_condition.libsonnet';
 
+
 local my_alert_condition_A = alert_model_data.new(
   evaluatorParams=null,
   evaluatorType='gt',

scripts/deploy_alerts.sh

@@ -16,7 +16,7 @@ curl -O -u $ARTIFACTORY_USER:$ARTIFACTORY_PASS "$ARTIFACTORY_URL/grafonet/$CI_PI
 ls -larth
 pwd
 mkdir -p ${ALERTS_TAR_NAME}
-tar -xzvf ${ALERTS_TAR_NAME}.tar.gz -C ${CURRENT_DIR}/${DASHBOARD_DEPLOY_DIR}/${ALERTS_TAR_NAME}
+tar -xzvf ${ALERTS_TAR_NAME}.tar.gz -C ${CURRENT_DIR}/${ALERTS_DEPLOY_DIR}/${ALERTS_TAR_NAME}
 cd ${ALERTS_TAR_NAME}
 
 ls -larth