infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

mm-backend: adapt statistics script

Browse source 
This adapts the create_statistics.sh script to correctly handle the new
systemd timer based logrotate on the proxies. This also filters out
accesses from 127.0.0.1 as that is haproxy doing its checks.

Signed-off-by: Adrian Reber <adrian@lisas.de>
This commit is contained in:
Adrian Reber 2020-01-16 13:42:19 +01:00 • committed by Pierre-Yves Chibon
parent 1943a7fc51
commit a8bad3cf10
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/mirrormanager/backend/tasks/main.yml
View file

@ -71,7 +71,7 @@
cron_file=create-statistics cron_file=create-statistics
- name: create yesterdays mirrorlist statistics cronjob - name: create yesterdays mirrorlist statistics cronjob
cron: name="yesterdays-statistics" minute="15" hour="0" user="mirrormanager" cron: name="yesterdays-statistics" minute="55" hour="0" user="mirrormanager"
job="/usr/local/bin/create_statistics.sh yesterday" job="/usr/local/bin/create_statistics.sh yesterday"
cron_file=yesterdays-statistics cron_file=yesterdays-statistics

16
roles/mirrormanager/backend/templates/create_statistics.sh
View file

@ -6,29 +6,29 @@ FRONTENDS="{% for host in groups['mm_frontend'] %} {{ host }} {% endfor %}"
INPUT="/var/log/mirrormanager/mirrorlist.log" INPUT="/var/log/mirrormanager/mirrorlist.log"
CONTAINER1="/var/log/mirrormanager/mirrorlist1.service.log" CONTAINER1="/var/log/mirrormanager/mirrorlist1.service.log"
CONTAINER2="/var/log/mirrormanager/mirrorlist2.service.log" CONTAINER2="/var/log/mirrormanager/mirrorlist2.service.log"
CONTAINER3="/var/log/mirrormanager/mirrorlist3.service.log"
if [ "$1" == "yesterday" ]; then if [ "$1" == "yesterday" ]; then
DATE=`date +%Y%m%d --date='yesterday'`
STATISTICS="/usr/bin/mirrorlist_statistics -o 1" STATISTICS="/usr/bin/mirrorlist_statistics -o 1"
DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m --date='yesterday'`" DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m --date='yesterday'`"
else else
DATE=`date +%Y%m%d`
STATISTICS="/usr/bin/mirrorlist_statistics" STATISTICS="/usr/bin/mirrorlist_statistics"
DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m`" DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m`"
fi fi
INFILE=${INPUT}-${DATE}.xz DATE=`date +%Y%m%d`
OUTPUT=`mktemp -d` OUTPUT=`mktemp -d`
trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT
for s in ${MIRRORLIST_PROXIES}; do for s in ${MIRRORLIST_PROXIES}; do
ssh $s "( cat $CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( cat $CONTAINER1 | grep -v 127.0.0.1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( cat $CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( cat $CONTAINER2 | grep -v 127.0.0.1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( cat $CONTAINER3 | grep -v 127.0.0.1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz 2>/dev/null
if [ "$1" == "yesterday" ]; then if [ "$1" == "yesterday" ]; then
ssh $s "( xzcat $CONTAINER1-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( xzcat $CONTAINER1-${DATE}.xz | grep -v 127.0.0.1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( xzcat $CONTAINER2-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( xzcat $CONTAINER2-${DATE}.xz | grep -v 127.0.0.1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( xzcat $CONTAINER3-${DATE}.xz | grep -v 127.0.0.1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz 2>/dev/null
fi fi
done done