From da4074452e87304888dde12fbe54b52316d5dfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi?= <remi@le-filament.com>
Date: Fri, 11 Dec 2020 13:07:07 +0100
Subject: [PATCH] Fix errors on backup check with old increments

---
 check_odoo_storage.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/check_odoo_storage.sh b/check_odoo_storage.sh
index 4e82335..dedc6d7 100755
--- a/check_odoo_storage.sh
+++ b/check_odoo_storage.sh
@@ -11,12 +11,13 @@ do
     CONTAINER=$(grep "Container:" $file | cut -d ":" -f 2  | tr -d " ")
     BYTES=$(grep "Bytes:" $file | cut -d ":" -f 2  | tr -d " ")
     OBJECTS=$(grep "Objects:" $file | cut -d ":" -f 2  | tr -d " ")
-    LAST_FILE=$(tail -2 $file | grep gpg)
-    if [ `date -d "${LAST_FILE:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]
+    LAST_FULL_BACKUP=$(grep full-signature $file | tail -1)
+    LAST_INC_BACKUP=$(grep new-signature $file | tail -1)
+    if [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ] || [ `date -d "${LAST_INC_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ] 
     then
-        OUTPUT+="OK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Modified: ${LAST_FILE:5:19}\n"
+        OUTPUT+="OK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Full-Backup: ${LAST_FULL_BACKUP:5:19}, Last-Incremental-Backup: ${LAST_INC_BACKUP:5:19}\n"
     else 
-        OUTPUT+="NOK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Modified: ${LAST_FILE:5:19}\n"
+        OUTPUT+="NOK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Full-Backup: ${LAST_FULL_BACKUP:5:19}, Last-Incremental-Backup: ${LAST_INC_BACKUP:5:19}\n"
         RETURN_CODE="2"
     fi
     PERF_DATA+="${CONTAINER}_size=$BYTES ${CONTAINER}_files=$OBJECTS "
-- 
GitLab