From a8bad3cf10f8ce496ed1b3def9279f44f585b845 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 16 Jan 2020 13:42:19 +0100 Subject: [PATCH] mm-backend: adapt statistics script 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 --- roles/mirrormanager/backend/tasks/main.yml | 2 +- .../backend/templates/create_statistics.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index 8dabb4a75a..ea91a3f412 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -71,7 +71,7 @@ cron_file=create-statistics - 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" cron_file=yesterdays-statistics diff --git a/roles/mirrormanager/backend/templates/create_statistics.sh b/roles/mirrormanager/backend/templates/create_statistics.sh index 929db9f447..b801a492a5 100644 --- a/roles/mirrormanager/backend/templates/create_statistics.sh +++ b/roles/mirrormanager/backend/templates/create_statistics.sh @@ -6,29 +6,29 @@ FRONTENDS="{% for host in groups['mm_frontend'] %} {{ host }} {% endfor %}" INPUT="/var/log/mirrormanager/mirrorlist.log" CONTAINER1="/var/log/mirrormanager/mirrorlist1.service.log" CONTAINER2="/var/log/mirrormanager/mirrorlist2.service.log" +CONTAINER3="/var/log/mirrormanager/mirrorlist3.service.log" if [ "$1" == "yesterday" ]; then - DATE=`date +%Y%m%d --date='yesterday'` STATISTICS="/usr/bin/mirrorlist_statistics -o 1" DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m --date='yesterday'`" else - DATE=`date +%Y%m%d` STATISTICS="/usr/bin/mirrorlist_statistics" DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m`" fi -INFILE=${INPUT}-${DATE}.xz - +DATE=`date +%Y%m%d` OUTPUT=`mktemp -d` trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT for s in ${MIRRORLIST_PROXIES}; do - ssh $s "( cat $CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz - ssh $s "( cat $CONTAINER2 | 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 | 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 - ssh $s "( xzcat $CONTAINER1-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz - ssh $s "( xzcat $CONTAINER2-${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 | 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 done