From a70d8fcde5ee4c7f4f39bf2c507cc5fdc52feb17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Sat, 23 Mar 2013 18:58:30 +0100
Subject: [PATCH] =?UTF-8?q?[Satistiques.py]=20On=20vire=20le=20p2p=20et=20?=
 =?UTF-8?q?on=20s'arrange=20pour=20que=20les=20ipv6=20vie=20priv=C3=A9e=20?=
 =?UTF-8?q?soient=20remplac=C3=A9es=20par=20les=20ipv6=20eui64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 surveillance/statistiques.py | 81 ++++++++++++------------------------
 1 file changed, 26 insertions(+), 55 deletions(-)

diff --git a/surveillance/statistiques.py b/surveillance/statistiques.py
index 94e4c837..9ba1700c 100755
--- a/surveillance/statistiques.py
+++ b/surveillance/statistiques.py
@@ -73,20 +73,33 @@ WHERE
 
 UNION
 
-(SELECT ip_crans, sum(upload) AS somme, sum(download)
-FROM upload6
-WHERE
-  date > timestamp 'now' - interval '1 day'
-  AND NOT EXISTS (
-    SELECT 1
-    FROM exemptes
-    WHERE
-      upload6.ip_crans <<= exemptes.ip_crans
-      AND upload6.ip_ext <<= exemptes.ip_dest
-  )
-  GROUP BY ip_crans
+(SELECT 
+    ip_crans, sum(upload) AS somme, sum(download) 
+FROM
+    (
+        SELECT DISTINCT * FROM 
+        (
+            SELECT 
+                upload6.date, mac_ip.mac AS ip_crans, upload6.ip_ext, upload6.id, upload6.port_crans, upload6.port_ext, upload6.download, upload6.upload
+            FROM mac_ip,upload6 
+            WHERE 
+                upload6.ip_crans = mac_ip.ip 
+                AND upload6.date > mac_ip.date 
+                AND upload6.date - interval '1 day' < mac_ip.date 
+                AND upload6.date > timestamp 'now' - interval '1 day'
+                AND upload6.date < 'now'
+                AND NOT EXISTS
+                (
+                    SELECT 1
+                    FROM exemptes
+                    WHERE upload6.ip_crans <<= exemptes.ip_crans
+                    AND upload6.ip_ext <<= exemptes.ip_dest
+                )
+        ) AS upload
+    ) AS upload
+GROUP BY
+    ip_crans
 )
-
 ORDER BY somme DESC"""
 curseur.execute(requete)
 data_upload = curseur.fetchall()
@@ -245,43 +258,6 @@ liste_virus3 = tableau(data = liste_virus3,
                        alignement = ['c', 'd']).encode('iso-8859-15')
 
 
-# Machines ayant utilisé des protocoles P2P dans la journée :
-#############################################################
-requete = """SELECT ip_src, nom, compteur, max(date) FROM
-             (SELECT ip_src,nom,count(ip_src) as compteur
-             FROM p2p INNER JOIN protocole_p2p ON p2p.id_p2p=protocole_p2p.id_p2p
-             WHERE p2p.date > timestamp 'now' - interval '1 day'
-             GROUP BY ip_src,nom)
-           AS tous
-           LEFT JOIN
-             (SELECT * FROM avertis_p2p
-             WHERE date > timestamp 'now' - interval '1 day')
-           AS avertis
-           ON ip_src=ip_crans
-           WHERE tous.compteur>5
-           GROUP BY ip_src, nom, compteur
-           ORDER BY 3 DESC"""
-curseur.execute(requete)
-liste_p2p = []
-for IP, protocole, compteur, blackliste in curseur.fetchall():
-    hostname = socket.getfqdn(IP)
-    # Le champ blackliste contient la date du blacklistage si il a eu lieu
-    if blackliste :
-        liste_p2p.append(['*%s*' % hostname,
-                          '*%s*' % protocole,
-                          '*%d*' % compteur,
-                          '*%d*' % config.p2p.limite[protocole]])
-    else:
-        liste_p2p.append([hostname, protocole,
-            compteur, config.p2p.limite[protocole]])
-
-liste_p2p = tableau(data = liste_p2p,
-                    titre = ['machine', 'protocole', 'nombre', 'limite'],
-                    largeur = [32, 14, 10, 8],
-                    alignement = ['c', 'c', 'd', 'd']).encode('iso-8859-15')
-
-
-
 #############
 # Message : #
 #############
@@ -318,10 +294,6 @@ Content-Type: text/plain; charset="iso-8859-15"
 
 %(liste_virus3)s
 
-*Machines ayant utilisé des protocoles P2P durant la journée*
-
-%(liste_p2p)s
-
 *Statistiques de trafic des adhérents* (tout le trafic)
 
 %(liste_upload)s
@@ -343,7 +315,6 @@ corps = message % { 'From': expediteur,
                     'liste_etherunk': liste_etherunk,
                     'liste_serveurs': liste_serveurs,
                     'liste_upload': liste_upload,
-                    'liste_p2p': liste_p2p,
                     'liste_virus': liste_virus,
                     'liste_virus2': liste_virus2,
                     'liste_virus3': liste_virus3,