Compare commits
No commits in common. "bd0ddcc899e545cc03a2959c267ac57f51dd38b7" and "97fdc9bafae59b090a66e6218debe9aa0f8ab4f7" have entirely different histories.
bd0ddcc899
...
97fdc9bafa
@ -1,2 +0,0 @@
|
|||||||
# Generation des statistiques du service mumble (tous les 1er du mois)
|
|
||||||
5 0 1 * * root /srv/mumble.chapril.org/tools/rapports_activites/update_redmine_ticket.sh >> /var/log/mumble_stats.log
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
#! /bin/bash
|
|
||||||
#
|
|
||||||
# Copyright (C) 2020 Laurent Poujoulat <lpoujoulat@april.org>
|
|
||||||
#
|
|
||||||
# This file is part of mumble.chapril.org
|
|
||||||
#
|
|
||||||
# This script is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
# ============================================
|
|
||||||
# This scripts reads the nextcloud state, extract the main status variables
|
|
||||||
# and writes a plain text report on stdout
|
|
||||||
# ============================================
|
|
||||||
|
|
||||||
# Configuration data
|
|
||||||
MUMBLE_STATS_DIR="/var/lib/mumble.chapril.org"
|
|
||||||
MUMBLE_STATS_FILE="${MUMBLE_STATS_DIR}/stats"
|
|
||||||
|
|
||||||
# Format statistic value for the report
|
|
||||||
writeStatValue()
|
|
||||||
{
|
|
||||||
local LABEL=$1
|
|
||||||
local UNIT=$2
|
|
||||||
local CUR_VALUE=$3
|
|
||||||
local PREV_VALUE=$4
|
|
||||||
local VARIATION=$(( ${CUR_VALUE}-${PREV_VALUE} ))
|
|
||||||
|
|
||||||
if [ ${VARIATION} -gt 0 ]
|
|
||||||
then
|
|
||||||
VARIATION="+"${VARIATION}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${UNIT}" == "" ]
|
|
||||||
then
|
|
||||||
echo ${LABEL}": "${CUR_VALUE}" ("${VARIATION}")"
|
|
||||||
else
|
|
||||||
echo ${LABEL}": "${CUR_VALUE}" "${UNIT}" ("${VARIATION}")"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# 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 "<W>${PREV_MONTH_MATCH}.*New connection" /var/log/mumble-server/*.log.*|wc -l)
|
|
||||||
NB_OF_USERS=$(grep -hE "<W>${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 "<W>${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
|
|
||||||
source ${MUMBLE_STATS_FILE}
|
|
||||||
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_CONNECTIONS_P="${NB_OF_CONNECTIONS} >> ${MUMBLE_STATS_FILE}
|
|
||||||
echo "NB_OF_ROOMS_P="${NB_OF_ROOMS} >> ${MUMBLE_STATS_FILE}
|
|
||||||
|
|
||||||
|
|
||||||
# Generate report
|
|
||||||
echo "Rapport d'activité du service mumble.chapril.org au "`date "+%-d %B %Y"`
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,127 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Copyright (C) 2018,2019 Didier Clermonté <dclermonte@april.org>
|
|
||||||
# Copyright (C) 2018,2019 Christian Pierre Momon <christian.momon@devinsy.fr>
|
|
||||||
# Copyright (C) 2019 Laurent Poujoulat <lpoujoulat÷@april.org> [pour la mumble]
|
|
||||||
#
|
|
||||||
# This file is part of mumble.chapril.org.
|
|
||||||
#
|
|
||||||
# This script is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# ============================================
|
|
||||||
help()
|
|
||||||
{
|
|
||||||
echo "Usage:"
|
|
||||||
echo " $(basename "$0") -h display help"
|
|
||||||
echo " $(basename "$0") analyse current month"
|
|
||||||
echo " $(basename "$0") -p analyse preceding month"
|
|
||||||
echo " $(basename "$0") month_number year analyse this month"
|
|
||||||
}
|
|
||||||
|
|
||||||
generateReport()
|
|
||||||
{
|
|
||||||
local monthEnglish="$1"
|
|
||||||
local month="$2"
|
|
||||||
local year="$3"
|
|
||||||
echo -e "================================================================="
|
|
||||||
echo
|
|
||||||
httpRequestCount=$(zgrep "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep -c "$year")
|
|
||||||
echo "Nombre total de requêtes http = $httpRequestCount"
|
|
||||||
|
|
||||||
trueHttpRequestCount=$(zgrep "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep "$year"|grep -vi bot|grep -c -v check_http)
|
|
||||||
echo "Nombre de vraies requêtes http = $trueHttpRequestCount"
|
|
||||||
|
|
||||||
botRequestCount=$(zgrep "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep "$year"|grep -i bot|grep -c -v check_http)
|
|
||||||
echo "Nombre de requêtes bot = $botRequestCount"
|
|
||||||
|
|
||||||
errorRequestCount=$(zgrep "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-error.log*|grep -c "$year")
|
|
||||||
echo "Nombre de requêtes http en erreur = $errorRequestCount"
|
|
||||||
|
|
||||||
ipv4Count=$(zgrep -h "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep "$year"|grep -vi bot|grep -v check_http|grep '^\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\} '|cut -d' ' -f1|sort|uniq |wc -l)
|
|
||||||
echo "Nombre d'ipv4 ayant visité le service = $ipv4Count"
|
|
||||||
|
|
||||||
ipv6Count=$(zgrep -h "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep "$year"|grep -vi bot|grep -v check_http|grep '^\([0-9a-f]\{0,4\}:\)\{2,7\}\([0-9a-f]\{0,4\}\)\{1\} '|cut -d' ' -f1|sort|uniq |wc -l)
|
|
||||||
echo "Nombre d'ipv6 ayant visité le service = $ipv6Count"
|
|
||||||
|
|
||||||
echo "Nombre total d'ip ayant visité le service = $((ipv4Count+ipv6Count))"
|
|
||||||
|
|
||||||
ipv4UserCount=$(zgrep -h "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep "$year"|grep -vi bot|grep -v check_http|grep '^\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\} '|grep "\(PROPFIND /remote\.php/\|GET /apps/files/\)"|grep -v "HTTP/1.0\" 404"|grep -v "HEAD"|cut -d' ' -f1|sort|uniq|wc -l )
|
|
||||||
echo "Nombre d'ipv4 utilisatrices = $ipv4UserCount"
|
|
||||||
|
|
||||||
ipv6UserCount=$(zgrep -h "$monthEnglish" /var/log/nginx/mumble.chapril.org/mumble.chapril.org-access.log*|grep "$year"|grep -vi bot|grep -v check_http|grep '^\([0-9a-f]\{0,4\}:\)\{2,7\}\([0-9a-f]\{0,4\}\)\{1\} '|grep -v "::1 "|grep "\(PROPFIND /remote\.php/\|GET /apps/files/\)"|grep -v "HTTP/1.0\" 404"|grep -v "HEAD"|cut -d' ' -f1|sort|uniq|wc -l )
|
|
||||||
echo "Nombre d'ipv6 utilisatrices = $ipv6UserCount"
|
|
||||||
|
|
||||||
echo "Nombre total d'ip ayant utilisées le service = $((ipv4UserCount+ipv6UserCount))"
|
|
||||||
|
|
||||||
echo -e "\n"
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
# ============================================
|
|
||||||
echo
|
|
||||||
if [ "$#" = 1 ] && [ "$1" = "-h" ]; then
|
|
||||||
help
|
|
||||||
elif [ "$#" = 1 ] && [ "$1" = "-p" ]; then
|
|
||||||
if [ "$(date +%m)" -gt 1 ]; then
|
|
||||||
precedingMonth="$((10#$(date +%m)-1))"
|
|
||||||
year="$(date +%Y)"
|
|
||||||
if [ $precedingMonth -lt 10 ]; then
|
|
||||||
month="${year}0$precedingMonth"
|
|
||||||
else
|
|
||||||
month="$year$precedingMonth"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
precedingMonth=12
|
|
||||||
year="$(($(date +%Y)-1))"
|
|
||||||
fi
|
|
||||||
monthEnglish=$(LANG=en_EN.UTF-8;date -d $year-$precedingMonth-01 +%b)
|
|
||||||
echo
|
|
||||||
generateReport "$monthEnglish" "$month" "$year"
|
|
||||||
elif [ "$#" -eq 2 ]; then
|
|
||||||
if ! (let "$1") 2>/dev/null; then
|
|
||||||
echo -e "Le mois doit être numérique."
|
|
||||||
help
|
|
||||||
elif ([ "$1" -lt 1 ] || [ "$1" -gt 12 ]); then
|
|
||||||
echo -e "Numéro du mois non valable $1."
|
|
||||||
help
|
|
||||||
elif ! (let "$2") 2>/dev/null; then
|
|
||||||
echo -e "L'année doit être numérique."
|
|
||||||
help
|
|
||||||
elif [ "$2" -lt 2018 ] || [ "$2" -gt "$(date +%Y)" ]; then
|
|
||||||
echo -e "Année non valable $2."
|
|
||||||
help
|
|
||||||
elif [ "$2" -le 2017 ] || [ "$2" -ge $(($(date +%Y)+1)) ] ; then
|
|
||||||
echo -e "Pas de données pour ce mois."
|
|
||||||
help
|
|
||||||
else
|
|
||||||
if [ "$1" -lt 10 ]; then
|
|
||||||
month="$2"0"$1"
|
|
||||||
else
|
|
||||||
month="$2""$1"
|
|
||||||
fi
|
|
||||||
monthEnglish=$(LANG=en_EN.UTF-8;date -d "$2-$1-01" +%b)
|
|
||||||
year="$2"
|
|
||||||
echo -e "Rapport d'activité du service mumble.chapril.org du mois $monthEnglish $2"
|
|
||||||
generateReport "$monthEnglish" "$month" "$year"
|
|
||||||
fi
|
|
||||||
elif [ "$#" -eq 0 ]; then
|
|
||||||
month="$(date +%Y%m)"
|
|
||||||
monthEnglish=$(LANG=en_EN.UTF-8;date +%b)
|
|
||||||
year="$(date +%Y)"
|
|
||||||
echo -e "Rapport d'activité du service mumble.chapril.org du mois $(date +%b) 20$(date +%y)"
|
|
||||||
generateReport "$monthEnglish" "$month" "$year"
|
|
||||||
else
|
|
||||||
echo -e "Bad parameter."
|
|
||||||
help
|
|
||||||
fi
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
#! /bin/bash
|
|
||||||
|
|
||||||
# Lecture configuration
|
|
||||||
CONFIG="/etc/mumble.chapril.org/mumblechaprilorg.conf"
|
|
||||||
CONFIG_KEY="/etc/chagirbot/agiraprilorg.conf"
|
|
||||||
source ${CONFIG}
|
|
||||||
source ${CONFIG_KEY}
|
|
||||||
REDMINE_API_KEY=${key}
|
|
||||||
|
|
||||||
main() {
|
|
||||||
post_report
|
|
||||||
}
|
|
||||||
|
|
||||||
post_report() {
|
|
||||||
datafile=$(mktemp /tmp/report_stats_$(date +%Y-%m-%d_%H%M)_XXXX.json)
|
|
||||||
cat <<EOF > "${datafile}"
|
|
||||||
{
|
|
||||||
"issue": {
|
|
||||||
"notes": "$(/srv/mumble.chapril.org/tools/rapports_activites/rapport_activites.sh | sed -z 's/\n/\\n/g')"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
curl -s \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-H "X-Redmine-API-Key: ${REDMINE_API_KEY}" \
|
|
||||||
-X PUT --data-binary "@${datafile}" \
|
|
||||||
"${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json"
|
|
||||||
rm "${datafile}"
|
|
||||||
}
|
|
||||||
|
|
||||||
last_comment_date() {
|
|
||||||
curl -H "X-Redmine-API-Key: ${REDMINE_API_KEY}" -s "${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json?include=journals" \
|
|
||||||
| jq '.issue.journals | last | .created_on'
|
|
||||||
}
|
|
||||||
|
|
||||||
list() {
|
|
||||||
curl -H "X-Redmine-API-Key: ${REDMINE_API_KEY}" -s "${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json?include=journals" \
|
|
||||||
| jq '.issue.journals[] | [.user.name, .notes]'
|
|
||||||
}
|
|
||||||
|
|
||||||
main
|
|
||||||
Loading…
Reference in New Issue
Block a user