update notifications

Author: nikmel2803

resources/notify.sh

@@ -1,13 +1,3 @@
 #/bin/sh
 
-
-# Check if there is any value in $2. If so, post an entry to the Slack channel with log information. If not, send a general message that all databases successfully completed
-if [ "$(printf '%s' "$2")" == '' ]
-then
-PAYLOAD="payload={\"channel\": \"$NOTIFY_CHANNEL\", \"username\": \"$NOTIFY_USERNAME\", \"text\": \"$1\", \"icon_emoji\": \":slack:\"}"
-else
-PAYLOAD="payload={\"channel\": \"$NOTIFY_CHANNEL\", \"username\": \"$NOTIFY_USERNAME\", \"text\": \"$1\`\`\`$(echo $2 | sed "s/\"/'/g")\`\`\`\", \"icon_emoji\": \":slack:\"}"
-fi
-
-# Send Slack message
-curl -s -X POST --data-urlencode "$PAYLOAD" "$NOTIFY_WEBHOOK_URL" > /dev/null
+curl -X POST  -d $PAYLOAD $NOTIFICATION_WEBHOOK_URL

resources/perform-backup.sh

@@ -3,6 +3,7 @@
 
 # Set the has_failed variable to false. This will change if any of the subsequent database backups/uploads fail.
 has_failed=false
+backup_name=""
 
 
 # Loop through all the defined databases, seperating by a ,
@@ -14,9 +15,9 @@ do
     then
 
         echo -e "Database backup successfully completed for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S')."
-
+        backup_name=$CURRENT_DATABASE_$(date +"%Y-%m-%d_%H-%M-%S").sql
         # Perform the upload to S3. Put the output to a variable. If successful, print an entry to the console and the log. If unsuccessful, set has_failed to true and print an entry to the console and the log
-        if awsoutput=$(aws s3 cp /tmp/$CURRENT_DATABASE.sql $AWS_BUCKET_URI$AWS_BUCKET_BACKUP_PATH/$CURRENT_DATABASE.sql 2>&1)
+        if awsoutput=$(aws s3 cp /tmp/$CURRENT_DATABASE.sql $AWS_BUCKET_URI$AWS_BUCKET_BACKUP_PATH/$backup_name 2>&1)
         then
             echo -e "Database backup successfully uploaded for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S')."
         else
@@ -55,7 +56,7 @@ else
     # If Slack alerts are enabled, send a notification that all database backups were successful
     if [ "$NOTIFY_ENABLED" = true ]
     then
-        /notify.sh "All database backups successfully completed on database host $TARGET_DATABASE_HOST."
+        /notify.sh "Backup created: $backup_name"
     fi
 
     exit 0