diff --git a/surveillance/statistiques.py b/surveillance/statistiques.py index ba9eef97..73100a11 100755 --- a/surveillance/statistiques.py +++ b/surveillance/statistiques.py @@ -216,26 +216,49 @@ mail.sendmail('disconnect@crans.org','disconnect@crans.org',corps) # Pas propre. -import re -mo = re.match(".*(Gros upload depuis Zamok([^\\\n]*\\\n){5})", corps, re.DOTALL) -if mo: - quote = mo.group(1) - # Upload le plus gros sur zamok - upload = quote.split("\n")[-2].split("|")[-2].strip() - if "Mo" in upload: - upload = float(upload[:-2]) - if upload > 200: - quote = "\n".join(map(lambda x: "> %s" % x, quote.split("\n"))) - message = """From: Florian Dumas +for l in gros_uploads_des_serveurs.split('\n')[2:]: + l2 = l.split('|') + + if float(l2[4].strip()[:-2]) > 200: + # question de Florian + message = """From: Florian Dumas To: disconnect@crans.org Subject: Re: Statistiques des dernières 24h Disconnect nous disait : - -%s +> |machine crans| machine ext | download | upload | +> |-------------+------------------------------------------+----------+----------| +> %s C'est normal ? -- Florian -""" % quote - mail.sendmail('disconnect@crans.org','disconnect@crans.org',message) +""" % l + mail.sendmail('disconnect@crans.org','disconnect@crans.org',message) + + # réponse de Vincent + ip_crans = socket.gethostbyname(l2[1].strip()) + ip_ext = socket.gethostbyname(l2[2].strip()) + raison = stats (ip_crans=[ip_crans], ip_ext=[ip_ext], show=['ip_ext','port_crans','port_ext'], upload_mini=10, show_limit=10).encode('iso8859-15') + + message = """From: Vincent Bernat +To: disconnect@crans.org +Subject: Re: Re: Statistiques des dernières 24h + +Florian Dumas nous disait: +> Disconnect nous disait : +> > |machine crans| machine ext | download | upload | +> > |-------------+------------------------------------------+----------+----------| +> > %s +> +> C'est normal ? + +A toi de voir... + +%s + +-- +Vince +""" % (l, raison) + + mail.sendmail('disconnect@crans.org','disconnect@crans.org',message)