From a45d23d6519b2447c48bc56049643ff9625dbb7f Mon Sep 17 00:00:00 2001 From: Hara Prasad Date: Thu, 1 Jul 2021 09:31:49 -0500 Subject: [PATCH] Revert "Chore/reports cron parametrize date (#1644)" This reverts commit d6a0be81e740e667922585b9aed54404ff143b46. --- files/scripts/reports-cronjob.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/files/scripts/reports-cronjob.sh b/files/scripts/reports-cronjob.sh index 1138511d2..098b58a50 100644 --- a/files/scripts/reports-cronjob.sh +++ b/files/scripts/reports-cronjob.sh @@ -45,9 +45,8 @@ if [[ $# -lt 1 || ! "$1" =~ ^vpc=.+$ ]]; then fi dataFolder="$(mktemp -d -p "$XDG_RUNTIME_DIR" 'reportsFolder_XXXXXX')" -reportStartTime=$(date --date 'yesterday 00:00') -dateTime="$(date --date "$reportStartTime" +%Y%m%d)" -destFolder="reports/$(date --date "$reportStartTime" +%Y)/$(date --date "$reportStartTime" +%m)" +dateTime="$(date --date 'yesterday 00:00' +%Y%m%d)" +destFolder="reports/$(date --date 'yesterday 00:00' +%Y)/$(date --date 'yesterday 00:00' +%m)" cd "$dataFolder" for service in all fence guppy indexd peregrine sheepdog; do for report in rtimes codes; do @@ -55,23 +54,23 @@ for service in all fence guppy indexd peregrine sheepdog; do if [[ "$service" == "all" ]]; then fileName="${report}-${dateTime}.json" fi - gen3 logs history $report start="$reportStartTime" end="$reportStartTime"-24 proxy="$service" "$@" | tee "${fileName}" + gen3 logs history $report start='yesterday 00:00' end='today 00:00' proxy="$service" "$@" | tee "${fileName}" done done fileName="users-${dateTime}.json" -gen3 logs history users start="$reportStartTime" end="$reportStartTime"-24 "$@" | tee "${fileName}" +gen3 logs history users start='yesterday 00:00' end='today 00:00' "$@" | tee "${fileName}" fileName="protocol-${dateTime}.json" -gen3 logs history protocol start="$reportStartTime" end="$reportStartTime"-24 "$@" | tee "${fileName}" +gen3 logs history protocol start='yesterday 00:00' end='today 00:00' "$@" | tee "${fileName}" fileName="loginproviders-${dateTime}.json" -gen3 logs history loginproviders start="$reportStartTime" end="$reportStartTime"-24 "$@" | tee "${fileName}" +gen3 logs history loginproviders start='yesterday 00:00' end='today 00:00' "$@" | tee "${fileName}" fileName="oidclogins-${dateTime}.json" -gen3 logs history oidclogins start="$reportStartTime" end="$reportStartTime"-24 "$@" | tee "${fileName}" +gen3 logs history oidclogins start='yesterday 00:00' end='today 00:00' "$@" | tee "${fileName}" fileName="ga4ghrcodes-${dateTime}.json" -gen3 logs history ga4gs_rtimes start="$reportStartTime" end="$reportStartTime"-24 "$@" | tee "${fileName}" +gen3 logs history ga4gs_rtimes start='yesterday 00:00' end='today 00:00' "$@" | tee "${fileName}" csvToJson="$(cat - <