Skip to content

Commit

Permalink
Revert "Chore/reports cron parametrize date (#1644)"
Browse files Browse the repository at this point in the history
This reverts commit d6a0be8.
  • Loading branch information
haraprasadj authored Jul 1, 2021
1 parent d6a0be8 commit a45d23d
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions files/scripts/reports-cronjob.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,32 @@ 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
fileName="${report}-${service}-${dateTime}.json"
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 - <<EOM
BEGIN {
Expand Down

0 comments on commit a45d23d

Please sign in to comment.