From 513b5d9e142507519c88d1a346fe811a6095f479 Mon Sep 17 00:00:00 2001 From: Laurent Poujoulat Date: Mon, 27 Apr 2020 16:20:37 +0200 Subject: [PATCH] Completed the mumble specific activity report --- rapports_activites/rapport_activites.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rapports_activites/rapport_activites.sh b/rapports_activites/rapport_activites.sh index 0d75d69..15a7cf4 100755 --- a/rapports_activites/rapport_activites.sh +++ b/rapports_activites/rapport_activites.sh @@ -25,7 +25,7 @@ # Configuration data MUMBLE_STATS_DIR="/var/lib/mumble.chapril.org" -MUMBLE_STATS_FILE="${VALISE_STATS_DIR}/stats" +MUMBLE_STATS_FILE="${MUMBLE_STATS_DIR}/stats" # Format statistic value for the report writeStatValue() @@ -53,16 +53,19 @@ writeStatValue() # Extraction mumble important values NB_OF_USERS=0 NB_OF_CONNECTIONS=0 +NB_OF_ROOMS=0 # Work out iso date match for prev month PREV_MONTH_MATCH=$(date +%Y-%m -d "1 month ago") NB_OF_CONNECTIONS=$(grep -hE "${PREV_MONTH_MATCH}.*New connection" /var/log/mumble-server/*.log.*|wc -l) NB_OF_USERS=$(grep -hE "${PREV_MONTH_MATCH}.*Authenticated" /var/log/mumble-server/*.log.*|grep -hEo "<[0-9]+\:.*\(-1\)"|grep -hEo "\:.*"|sort|uniq|wc -l) +NB_OF_ROOMS=$(grep -hE "${PREV_MONTH_MATCH}.*Moved" /var/log/mumble-server/*.log.*|grep -hEo "to [^[]+"|sort|uniq|wc -l) # Get previous values NB_OF_USERS_P=0 NB_OF_CONNECTIONS_P=0 +NB_OF_ROOMS_P=0 if [ -e ${MUMBLE_STATS_FILE} ] then @@ -81,8 +84,9 @@ echo echo "=================================================================" echo writeStatValue "Nombre d'utilisateurs" "" ${NB_OF_USERS} ${NB_OF_USERS_P} +writeStatValue "Nombre de salons utilisés" "" ${NB_OF_ROOMS} ${NB_OF_ROOMS_P} writeStatValue "Nombre de connexions" "" ${NB_OF_CONNECTIONS} ${NB_OF_CONNECTIONS_P} # Addition des infos HTTP -# /srv/mumble.chapril.org/tools/rapports_activites/rapport_activites_http.sh -p +/srv/mumble.chapril.org/tools/rapports_activites/rapport_activites_http.sh -p