diff --git a/monitoring/check_version.sh b/monitoring/check_mobilizonchaprilorg_update similarity index 98% rename from monitoring/check_version.sh rename to monitoring/check_mobilizonchaprilorg_update index 8ee1da1..b45ee1d 100755 --- a/monitoring/check_version.sh +++ b/monitoring/check_mobilizonchaprilorg_update @@ -34,7 +34,7 @@ else result=0 else echo "WARNING : new version available, current is $currentVersion, last is $lastVersion." - result=2 + result=1 fi fi exit $result diff --git a/monitoring/mobilizonchaprilorg.cron b/monitoring/mobilizonchaprilorg.cron deleted file mode 100644 index efd9224..0000000 --- a/monitoring/mobilizonchaprilorg.cron +++ /dev/null @@ -1 +0,0 @@ - 5 0 1 * * root /srv/mobilizon.chapril.org/tools/rapport_activite/rapport_activite.sh -p >> /srv/mobilizon.chapril.org/Exploitation/rapport_mobilizon.log 2>&1 diff --git a/rapport_activite/mobilizonchaprilorg-rapport-activite.cron b/rapport_activite/mobilizonchaprilorg-rapport-activite.cron deleted file mode 100644 index fb8c288..0000000 --- a/rapport_activite/mobilizonchaprilorg-rapport-activite.cron +++ /dev/null @@ -1,2 +0,0 @@ -# -5 0 1 * * root /srv/mobilizon.chapril.org/tools/rapport_activite/update_redmine_ticket.sh > /var/log/mobilizonchaprilorg-cron.log 2>&1 diff --git a/rapport_activite/mobilizonchaprilorg-rapportactivite.cron b/rapport_activite/mobilizonchaprilorg-rapportactivite.cron new file mode 100644 index 0000000..edd30ac --- /dev/null +++ b/rapport_activite/mobilizonchaprilorg-rapportactivite.cron @@ -0,0 +1,2 @@ +# +5 0 1 * * root /srv/mobilizon.chapril.org/tools/rapport_activite/update_redmine_ticket.sh > /var/log/mobilizon.chapril.org/rapportactivite-cron.log 2>&1 diff --git a/rapport_activite/rapport_activite.sh b/rapport_activite/rapport_activite.sh index 614e651..753bb51 100755 --- a/rapport_activite/rapport_activite.sh +++ b/rapport_activite/rapport_activite.sh @@ -83,14 +83,6 @@ generateHTTPReport() echo } -# display the value of a key in the json fetched with curl -function show -{ - # to navigate to sub keys like data.statistics.my_key , we must use multiple -e extract options - local value=$(echo "$json" | jshon -e "data" -e "statistics" -e $1 -u) - printf "$1=$value\n" -} - # generateSpecificReport() { @@ -116,17 +108,17 @@ generateSpecificReport() echo "Nombre d'ipv6 utilisatrices du service = $ipv6UserCount" echo "Nombre total d'ip utilisatrices du service = $((ipv4UserCount+ipv6UserCount))" - echo "Nombre total d'erreurs = $errorsCount" + echo "Nombre total d'erreurs = $errorsCount" + echo "Nombre d'évènements = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfEvents" -u)" + echo "Nombre d'évènements locaux = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfLocalEvents" -u)" + echo "Nombre de groupes = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfGroups" -u)" + echo "Nombre de groupes locaux = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfLocalGroups" -u)" + echo "Nombre de commentaires = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfComments" -u)" + echo "Nombre de commentaires locaux = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfLocalComments" -u)" + echo "Nombre d'instances abonnées = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfInstanceFollowers" -u)" + echo "Nombre d'instances suivies = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfInstanceFollowings" -u)" + echo "Nombre d'utilisateurices selon l'api = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfUsers" -u)" - show "numberOfEvents" - show "numberOfLocalEvents" - show "numberOfGroups" - show "numberOfLocalGroups" - show "numberOfComments" - show "numberOfLocalComments" - show "numberOfInstanceFollowers" - show "numberOfInstanceFollowings" - show "numberOfUsers" echo }