Merge ~barryprice/influxdb-charm/+git/trunk:master into influxdb-charm:master

[Barry Price]

Add compression to backups LP:1850772

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

One question inline

[Tom Haddon (mthaddon)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision fb57c9cfe2c4ae05279cca4c72279fe40ef11ea6

diff --git a/templates/influxdb-backup b/templates/influxdb-backup
index cd3fabf..b253fbc 100644
--- a/templates/influxdb-backup
+++ b/templates/influxdb-backup
@@ -24,10 +24,10 @@ fi
 auth_args=""
 case $(influx -version) in
     "InfluxDB shell version: 1.0."*|"InfluxDB shell 0."*)
-	auth_args="-username ${INFLUX_USERNAME} -password ${INFLUX_PASSWORD}"
-	;;
+        auth_args="-username ${INFLUX_USERNAME} -password ${INFLUX_PASSWORD}"
+        ;;
     *)
-	;;
+        ;;
 esac
 
 DATABASES=$(influx ${auth_args} --execute 'show databases' --format=json | jq --raw-output '.results[0].series[0].values[][0]' | grep -ve '^_internal$')
@@ -40,11 +40,19 @@ for d in ${DATABASES}; do
     influxd backup -database $d $TODAY_DIR/$d
 done
 
+# compress the on-disk backup - gzip will do as the files can be huge, more efficient compressors are too slow/intensive
+tar czf $TODAY_DIR.tgz $TODAY_DIR && rm -rf $TODAY_DIR
+
 # remove old backups - to keep NUM backups we need to delete from directory NUM+1
 (( NUM++ ))
 cd $BACKUP_DIR
-for dir in $(ls -t | tail -n +$NUM); do
-    if [ -d ./$dir ]; then
-	rm -rf ./$dir && echo "Removed $dir"
-    fi
+
+# remove any old backup dirs from pre-compression revisions of this script
+for dir in $(find . -maxdepth 1 -type d | grep -v ^.$ | sort -r | tail -n +$NUM); do
+    rm -rf ./$dir && echo "Removed $dir"
+done
+
+# remove old compressed backup files
+for file in $(find . -maxdepth 1 -type f | sort -r | tail -n +$NUM); do
+    rm -rf ./$file && echo "Removed $file"
 done