diff --git a/rapports_activites/rapport_activites.sh b/rapports_activites/rapport_activites.sh index 42db155..d0d4137 100755 --- a/rapports_activites/rapport_activites.sh +++ b/rapports_activites/rapport_activites.sh @@ -52,18 +52,22 @@ writeStatValue() # Extraction mumble important values NB_OF_USERS=0 +NB_OF_WEB_CONNECTIONS=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_CONNECTIONS=$(grep -hE "${PREV_MONTH_MATCH}.*Client version" /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_WEB_CONNECTIONS=$(grep -hE "${PREV_MONTH_MATCH}.*New connection\: 127\.0\.0\.1" /var/log/mumble-server/*.log.*|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_WEB_CONNECTIONS_P=0 NB_OF_CONNECTIONS_P=0 NB_OF_ROOMS_P=0 @@ -75,6 +79,7 @@ fi # Save current values for the next run mkdir -p ${MUMBLE_STATS_DIR} echo "NB_OF_USERS_P="${NB_OF_USERS} >> ${MUMBLE_STATS_FILE} +echo "NB_OF_WEB_CONNECTIONS_P="${NB_OF_WEB_CONNECTIONS} >> ${MUMBLE_STATS_FILE} echo "NB_OF_CONNECTIONS_P="${NB_OF_CONNECTIONS} >> ${MUMBLE_STATS_FILE} echo "NB_OF_ROOMS_P="${NB_OF_ROOMS} >> ${MUMBLE_STATS_FILE} @@ -87,6 +92,7 @@ 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} +writeStatValue "Nombre de connexions web" "" ${NB_OF_WEB_CONNECTIONS} ${NB_OF_WEB_CONNECTIONS_P} # Addition des infos HTTP /srv/mumble.chapril.org/tools/rapports_activites/rapport_activites_http.sh -p