From 4d08b4cecdac03c1e312876cc3bf0e935250fa52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Sun, 22 Jun 2014 23:21:11 +0200
Subject: [PATCH] [analyse2] On ne compte pas l'upload/le down vers/de adm.

---
 surveillance/analyse2.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/surveillance/analyse2.py b/surveillance/analyse2.py
index 8f0b764d..dca04305 100755
--- a/surveillance/analyse2.py
+++ b/surveillance/analyse2.py
@@ -71,6 +71,8 @@ FROM (
             ip_dst <<= inet%(plage_ens)s
         AND NOT
             ip_dst <<= inet%(appt)s
+        AND NOT
+            ip_dst <<= inet%(plage_adm)s
         AND NOT
             ip_dst <<= inet%(plage_ipv6)s
         AND
@@ -108,6 +110,8 @@ FROM (
             ip_src <<= inet%(plage_ens)s
         AND NOT
             ip_src <<= inet%(appt)s
+        AND NOT
+            ip_src <<= inet%(plage_adm)s
         AND NOT
             ip_src <<= inet%(plage_ipv6)s
         AND
@@ -175,6 +179,8 @@ FROM (
             ip_dst <<= inet%(plage_ens)s
         AND NOT
             ip_dst <<= inet%(appt)s
+        AND NOT
+            ip_dst <<= inet%(plage_adm)s
         AND NOT
             ip_dst <<= inet%(plage_ipv6)s
         AND
@@ -214,6 +220,8 @@ FROM (
             ip_src <<= inet%(plage_ens)s
         AND NOT
             ip_src <<= inet%(appt)s
+        AND NOT
+            ip_src <<= inet%(plage_adm)s
         AND NOT
             ip_src <<= inet%(plage_ipv6)s
         AND
@@ -283,6 +291,8 @@ FROM (
             ip_dst <<= inet%(plage_ens)s
         AND NOT
             ip_dst <<= inet%(appt)s
+        AND NOT
+            ip_dst <<= inet%(plage_adm)s
         AND NOT
             ip_dst <<= inet%(plage_ipv6)s
         AND
@@ -324,6 +334,8 @@ FROM (
             ip_src <<= inet%(plage_ens)s
         AND NOT
             ip_src <<= inet%(appt)s
+        AND NOT
+            ip_src <<= inet%(plage_adm)s
         AND NOT
             ip_src <<= inet%(plage_ipv6)s
         AND
@@ -364,14 +376,14 @@ GROUP BY
     ip_requete += " LIMIT %s" % (args.limit)
     adh_requete += " LIMIT %s" % (args.limit)
 
-    fill_in_dict = {
-                    "begin" : args.begin,
-                    "end" : args.end,
-                    "plage_ens" : config.plage_ens,
-                    "ipv6_local" : 'fe80::/8',
-                    "plage_ipv6" : config.prefix['subnet'][0],
-                    "appt" : config.NETs['personnel-ens'][0],
-                    }
+    fill_in_dict = { "begin" : args.begin,
+        "end" : args.end,
+        "plage_ens" : config.plage_ens,
+        "ipv6_local" : 'fe80::/8',
+        "plage_ipv6" : config.prefix['subnet'][0],
+        "appt" : config.NETs['personnel-ens'][0],
+        "plage_adm" : config.NETs['adm'][0],
+        }
 
     if args.aid:
         pg_filter = "adherent"