diff --git a/updater/scripts/api-requests-by-user.sh b/updater/scripts/api-requests-by-user.sh index bf55a75..3b9f004 100755 --- a/updater/scripts/api-requests-by-user.sh +++ b/updater/scripts/api-requests-by-user.sh @@ -7,9 +7,9 @@ echo -e "user\trequests" zcat -f /var/log/github/unicorn.log.1* | - grep -F 'request_category=api' | + grep -F 'request_category="api"' | grep -Fv 'remote_address=127.0.0.1' | - grep -oP 'current_user=\K\S+' | + grep -oP 'gh.actor.login=\K\S+' | grep -Fvx 'nil' | sort | uniq -ic | diff --git a/updater/scripts/api-requests.sh b/updater/scripts/api-requests.sh index 79b3caf..74056c1 100755 --- a/updater/scripts/api-requests.sh +++ b/updater/scripts/api-requests.sh @@ -5,7 +5,7 @@ echo -e "resource\ttype\tsource IP\trequests" zcat -f /var/log/haproxy.log.1* | - perl -ne 'print if s/.*haproxy\[\d+\]: ([^:]+).*\/api\/v3\/([^\/\? ]+)\/([^\/\? ]+?(\/[^\/\? ]+)).*/\1 \2 \3/' | + perl -ne 'print if s/.*haproxy-frontend\[\d+\]: ([^:]+).*\/api\/v3\/([^\/\? ]+)\/([^\/\? ]+?(\/[^\/\? ]+)).*/\1 \2 \3/' | grep -v '^127.0.0.1' | sort | uniq -ic | diff --git a/updater/scripts/git-protocol.sh b/updater/scripts/git-protocol.sh index 54267a0..ddabf94 100755 --- a/updater/scripts/git-protocol.sh +++ b/updater/scripts/git-protocol.sh @@ -4,7 +4,9 @@ # echo -e "Git protocol\tconnections" -zcat -f /var/log/syslog.1* | +TMPDIR=`mktemp -d` +sudo cp -a /var/log/babeld/babeld.log.1.gz $TMPDIR +zcat -f $TMPDIR/babeld.log.1.gz | # Remove the leading time stamp cut --characters 17- | # Remove the host name @@ -15,3 +17,5 @@ zcat -f /var/log/syslog.1* | sort | uniq -c | awk '{printf("%s\t%s\n",$2,$1)}' +sudo rm -f $TMPDIR/babeld.log.1.gz +rmdir $TMPDIR diff --git a/updater/scripts/git-requests.sh b/updater/scripts/git-requests.sh index 1dd7575..b5d1ad4 100755 --- a/updater/scripts/git-requests.sh +++ b/updater/scripts/git-requests.sh @@ -4,7 +4,9 @@ # echo -e "repository\tsource IP\trequests" -zcat -f /var/log/syslog.1* | +TMPDIR=`mktemp -d` +sudo cp -a /var/log/babeld/babeld.log.1.gz $TMPDIR +zcat -f $TMPDIR/babeld.log.1.gz | # Remove the leading time stamp cut --characters 17- | # Remove the host name @@ -16,3 +18,5 @@ zcat -f /var/log/syslog.1* | uniq -ic | sort -rn | awk '{printf("%s\t%s\t%s\n",$3,$2,$1)}' +sudo rm -f $TMPDIR/babeld.log.1.gz +rmdir $TMPDIR