ScriptsCollections/ServerUserCreate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix systemd read for dates with short-iso to get proper year date

Browse Source
This commit is contained in:
Clemens Schwaighofer
2022-11-21 18:37:34 +09:00
parent aa0594e17f
commit cae5c8a19a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/collect_login_data.sh
View File

@@ -33,15 +33,16 @@ function parseLog()
debug="${5}"; debug="${5}";
# echo "L: $line"; # echo "L: $line";
auth_date=$(echo "${line}" | cut -c 1-6)" ${start_year} "$(echo "${line}" | cut -c 8-15);
auth_date=$(echo "${auth_date}" | date +"%F %T" -f -);
# auth user has . at the end, remove that one # auth user has . at the end, remove that one
if [ "${logger}" = "systemd" ]; then if [ "${logger}" = "systemd" ]; then
# 2022-11-18T20:04:08+0900
auth_date=$(echo "${line}" | cut -d " " -f 1);
auth_user=$(echo "${line}" | cut -d "]" -f 2 | cut -d " " -f 7 | cut -d "." -f 1); auth_user=$(echo "${line}" | cut -d "]" -f 2 | cut -d " " -f 7 | cut -d "." -f 1);
else else
auth_date=$(echo "${line}" | cut -c 1-6)" ${start_year} "$(echo "${line}" | cut -c 8-15);
auth_user=$(echo "${line}" | cut -d ")" -f 2 | cut -d " " -f 6 | cut -d "(" -f 1); auth_user=$(echo "${line}" | cut -d ")" -f 2 | cut -d " " -f 6 | cut -d "(" -f 1);
fi; fi;
auth_date=$(echo "${auth_date}" | date +"%F %T" -f -);
# echo -n "USER: $auth_user | DATE: $auth_date"; # echo -n "USER: $auth_user | DATE: $auth_date";
@@ -71,9 +72,9 @@ if [ -z "${init_version##*systemd*}" ]; then
OPT_START_DATE="-S ${START_DATE}"; OPT_START_DATE="-S ${START_DATE}";
OPT_END_DATE="-U ${END_DATE}"; OPT_END_DATE="-U ${END_DATE}";
fi; fi;
# READ as other format so we get the YEAR (JSON ) # READ as other format so we get the YEAR -o short-iso
START_YEAR=$(date +%Y -d "1 day ago"); START_YEAR=$(date +%Y -d "1 day ago");
journalctl -u systemd-logind --no-pager ${OPT_START_DATE} ${OPT_END_DATE} | grep ": New session" | journalctl -u systemd-logind --no-pager -o short-iso ${OPT_START_DATE} ${OPT_END_DATE} | grep ": New session" |
while read line; do while read line; do
# # Nov 21 14:15:46 we.are.hostname.com systemd-logind[1865]: New session 12345 of user some^user. # # Nov 21 14:15:46 we.are.hostname.com systemd-logind[1865]: New session 12345 of user some^user.
# date: 5 chars # date: 5 chars