[analyse2] On ne compte pas l'upload/le down vers/de adm.

This commit is contained in:
Pierre-Elliott Bécue 2014-06-22 23:21:11 +02:00
parent 852dc63e84
commit 4d08b4cecd

View file

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