From 6105fe7d42d994e96da026b4e00292a9b90f29cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Wed, 29 Mar 2023 16:39:10 +0200
Subject: [PATCH] fix: use UTC to avoid DST
---
check_cloud_storage.sh | 2 +-
check_newest_file_age.sh | 2 +-
check_odoo2_storage.sh | 2 +-
check_odoo_storage.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/check_cloud_storage.sh b/check_cloud_storage.sh
index 1ac8122..b814845 100755
--- a/check_cloud_storage.sh
+++ b/check_cloud_storage.sh
@@ -12,7 +12,7 @@ do
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 '7 days ago' +%s` ]
+ if [ `date --utc --date "${LAST_FILE:5:19}" +%s` -gt `date --utc --date '7 days ago' +%s` ]
then
OUTPUT+="OK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Modified: ${LAST_FILE:5:19}\n"
else
diff --git a/check_newest_file_age.sh b/check_newest_file_age.sh
index ccea7e0..04b39d1 100755
--- a/check_newest_file_age.sh
+++ b/check_newest_file_age.sh
@@ -252,7 +252,7 @@ esac
DIR_COUNT=0
OK_FILE_COUNT=0
OUTPUT=
-CURRENT_TIME=`date +%s`
+CURRENT_TIME=`date --utc +%s`
OS_DISTRO=`uname -s`
# Loop through each provided directory.
diff --git a/check_odoo2_storage.sh b/check_odoo2_storage.sh
index 658c36f..24f906d 100755
--- a/check_odoo2_storage.sh
+++ b/check_odoo2_storage.sh
@@ -16,7 +16,7 @@ do
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 ([ -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` ])
+ if ([ -n "$LAST_FULL_BACKUP" ] && [ `date --utc --date "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date --utc --date '1 day ago' +%s` ]) || ([ -n "$LAST_INC_BACKUP" ] && [ `date --utc --date "${LAST_INC_BACKUP:5:19}" +%s` -gt `date --utc --date '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 b7150d0..0203529 100755
--- a/check_odoo_storage.sh
+++ b/check_odoo_storage.sh
@@ -16,7 +16,7 @@ do
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 ([ -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` ])
+ if ([ -n "$LAST_FULL_BACKUP" ] && [ `date --utc --date "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date --utc --date '1 day ago' +%s` ]) || ([ -n "$LAST_INC_BACKUP" ] && [ `date --utc --date "${LAST_INC_BACKUP:5:19}" +%s` -gt `date --utc --date '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