Merge pull request #11 from ldvc/patch-1

Use hostname with FQDN as a default name for host

bin/backup

@@ -1,19 +1,15 @@
 #! /bin/bash
 set -uo pipefail
 
-#backup li run 
+display_usage() {
-#backup li 
-
-display_usage() { 
 	echo "Usage: $0 <repo> (local|monitor <host> <warning> <critical>|restic arguments)" >&2
-} 
+}
 
 if [ "$#" -lt 2 ]; then
 	display_usage
     	exit 1
 fi
 
-
 TARGET=$1
 ACTION=$2
 RESTIC=$(which restic)
@@ -26,7 +22,7 @@ check_config() {
     	    	exit 1
 	else
 		set -a
-		source $CONFIG 
+		source $CONFIG
 		set +a
         fi
 
@@ -35,19 +31,20 @@ check_config() {
     		echo "Restic binary not found"
     		exit 1
 	fi
-
-
 }
 
 handle_params () {
 
+	. /etc/backup/local.config
 	if [ $2 == "local" ]; then
     		do_local_backup
 	elif [ $2 == "monitor" ]; then
 		do_monitor $@
 	else
 		shift 1
-		$RESTIC $@
+		# define an empty default if RESTIC_ARGS is not set
+		RESTIC_ARGS=${RESTIC_ARGS:-""}
+		$RESTIC $RESTIC_ARGS $@
         fi
 }
 
@@ -60,11 +57,14 @@ do_local_backup () {
 
 	. /etc/backup/local.config
 
+	# define an empty default if BACKUP_ARGS is not set
+	BACKUP_ARGS=${BACKUP_ARGS:-""}
+
         if [[ -x /etc/backup/local.pre ]]; then
         	/etc/backup/local.pre $TARGET
  	fi
 
-	$RESTIC --exclude-file /etc/backup/local.exclude backup --hostname $BACKUP_HOSTNAME $BACKUP_DIR 
+	$RESTIC --exclude-file /etc/backup/local.exclude backup --host $BACKUP_HOSTNAME $BACKUP_ARGS $BACKUP_DIR
 
         if [[ -x /etc/backup/local.post ]]; then
                 /etc/backup/local.post $TARGET
@@ -85,8 +85,12 @@ do_monitor () {
 	WARN=$4
 	CRIT=$5
 
+	# define an empty default if RESTIC_ARGS is not set
+	RESTIC_ARGS=${RESTIC_ARGS:-""}
+	SNAPS=`$RESTIC $RESTIC_ARGS snapshots --compact --no-lock -H $3`
 	# Get last line and parse into variables. Removes header and is empty when no snapshot exists for host
-	LAST=`$RESTIC snapshots --compact --no-lock -H $3 | sed 1,2d | tail -n 1`
+	LAST=`sed 1,2d <<< $SNAPS | head -n -2 | tail -n 1`
+  COUNT=`tail -n 1 <<< $SNAPS | cut -d " " -f 1`
 	if [ ! $? -eq 0 ]; then
 		echo "WARNING - restic command returned an error"
 		exit 1;
@@ -94,7 +98,7 @@ do_monitor () {
 
 	IFS=' ' read HASH DATE TIME HOST DIR <<< "$LAST"
 
-	if [ -z "$HASH" ]; then 
+	if [ -z "$HASH" ]; then
 		echo "UNKNOWN - No snapshot found for $3"
 		exit 4;
 	fi
@@ -109,12 +113,13 @@ do_monitor () {
 			BACKUP_TST=$(date -d "$DATE $TIME" +"%s" )
 			;;
 	esac
+
 	NOW_TST=$(date +%s)
 	DIFF_S=`expr $NOW_TST - $BACKUP_TST`
 
 	DIFF_H=`expr $DIFF_S / 3600`
 
-	MESSAGE="Last snapshot #$HASH ${DIFF_H}h ago"
+	MESSAGE="Last snapshot #$HASH ${DIFF_H}h ago|snapshots=$COUNT; age=$DIFF_H"
         RET=0
 	RET_H="OK"
 
@@ -124,7 +129,7 @@ do_monitor () {
 	elif [ $DIFF_H -lt $CRIT ]; then
                 RET=1
                 RET_H="WARNING"
-	else 
+	else
                 RET=2
                 RET_H="CRITICAL"
 
@@ -133,9 +138,5 @@ do_monitor () {
 	return $RET
 }
 
-
-
 check_config $@
 handle_params $@
-
-

etc/backup/local.config

@@ -1,3 +1,5 @@
-BACKUP_HOSTNAME="backuphost.example.org"
+BACKUP_HOSTNAME=$(hostname -f)
 BACKUP_DIR="/"
+BACKUP_ARGS="--tag filesystem"
 # HEALTHCHECK_URL="<URL from https://healthchecks.io/checks/ to notify>"
+# RESTIC_ARGS="<optional restic args appended to all commands>"

etc/backup/local.post

@@ -0,0 +1 @@
+# run commands after the backup (script must be executable)

etc/backup/local.pre

@@ -0,0 +1 @@
+# run commands before the backup (script must be executable)