From 93eee3f2c45e6d6ee9d90c13e3ea2384f7626ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi?= <remi@le-filament.com> Date: Thu, 20 May 2021 12:00:09 +0200 Subject: [PATCH] Update check Odoo scripts --- check_odoo2_storage.sh | 5 ++++- check_odoo_storage.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/check_odoo2_storage.sh b/check_odoo2_storage.sh index 4a6b619..adb56f8 100755 --- a/check_odoo2_storage.sh +++ b/check_odoo2_storage.sh @@ -9,11 +9,14 @@ RETURN_CODE="0" for file in `ls /backup/odoo2/*.latest` do CONTAINER=$(grep "Container:" $file | cut -d ":" -f 2 | tr -d " ") + if [[ "$CONTAINER" == 'tuleap_filament_dedicated2' ]] ; then + continue + fi BYTES=$(grep "Bytes:" $file | cut -d ":" -f 2 | tr -d " ") OBJECTS=$(grep "Objects:" $file | cut -d ":" -f 2 | tr -d " ") 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` ] + if ([ -n "$LAST_FULL_BACKUP" ] && [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]) || ([ -n "$LAST_INC_BACKUP" ] && [ `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-Full-Backup: ${LAST_FULL_BACKUP:5:19}, Last-Incremental-Backup: ${LAST_INC_BACKUP:5:19}\n" else diff --git a/check_odoo_storage.sh b/check_odoo_storage.sh index dedc6d7..6f36866 100755 --- a/check_odoo_storage.sh +++ b/check_odoo_storage.sh @@ -9,11 +9,14 @@ RETURN_CODE="0" for file in `ls /backup/odoo/*.latest` do CONTAINER=$(grep "Container:" $file | cut -d ":" -f 2 | tr -d " ") + if [[ "$CONTAINER" == 'odoo_oikos' ]] || [[ "$CONTAINER" == 'tuleap_filament_dedicated2' ]] ; then + continue + fi BYTES=$(grep "Bytes:" $file | cut -d ":" -f 2 | tr -d " ") OBJECTS=$(grep "Objects:" $file | cut -d ":" -f 2 | tr -d " ") 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` ] + if ([ -n "$LAST_FULL_BACKUP" ] && [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]) || ([ -n "$LAST_INC_BACKUP" ] && [ `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-Full-Backup: ${LAST_FULL_BACKUP:5:19}, Last-Incremental-Backup: ${LAST_INC_BACKUP:5:19}\n" else -- GitLab