crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[comptage] "Optimisations"

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-06-21 19:31:49 +02:00
parent 6ca9a058e1
commit aa63141c63
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
surveillance/analyse2.py
View file

@ -56,8 +56,6 @@ FROM (
machines.mac_addr = upload.mac_src machines.mac_addr = upload.mac_src
WHERE WHERE
ip_src=%(pg_value)s ip_src=%(pg_value)s
AND NOT
ip_src <<= inet%(ipv6_local)s
AND NOT AND NOT
ip_dst <<= inet%(ipv6_local)s ip_dst <<= inet%(ipv6_local)s
AND NOT AND NOT
@ -69,7 +67,7 @@ FROM (
AND AND
stamp_inserted >= %(begin)s stamp_inserted >= %(begin)s
AND AND
stamp_updated <= %(end)s stamp_inserted <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -97,8 +95,6 @@ FROM (
ip_dst=%(pg_value)s ip_dst=%(pg_value)s
AND NOT AND NOT
ip_src <<= inet%(ipv6_local)s ip_src <<= inet%(ipv6_local)s
AND NOT
ip_dst <<= inet%(ipv6_local)s
AND NOT AND NOT
ip_src <<= inet%(plage_ens)s ip_src <<= inet%(plage_ens)s
AND NOT AND NOT
@ -108,7 +104,7 @@ FROM (
AND AND
stamp_inserted >= %(begin)s stamp_inserted >= %(begin)s
AND AND
stamp_updated <= %(end)s stamp_inserted <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -152,7 +148,7 @@ FROM (
ON ON
machines.mac_addr = upload.mac_src machines.mac_addr = upload.mac_src
WHERE WHERE
machines.mac_addr=%(pg_value)s mac_src=macaddr%(pg_value)s
AND NOT AND NOT
ip_src <<= inet%(ipv6_local)s ip_src <<= inet%(ipv6_local)s
AND NOT AND NOT
@ -166,7 +162,7 @@ FROM (
AND AND
stamp_inserted >= %(begin)s stamp_inserted >= %(begin)s
AND AND
stamp_updated <= %(end)s stamp_inserted <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -191,7 +187,7 @@ FROM (
ON ON
machines.mac_addr = upload.mac_dst machines.mac_addr = upload.mac_dst
WHERE WHERE
machines.mac_addr=%(pg_value)s mac_dst=macaddr%(pg_value)s
AND NOT AND NOT
ip_src <<= inet%(ipv6_local)s ip_src <<= inet%(ipv6_local)s
AND NOT AND NOT
@ -205,7 +201,7 @@ FROM (
AND AND
stamp_inserted >= %(begin)s stamp_inserted >= %(begin)s
AND AND
stamp_updated <= %(end)s stamp_inserted <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -265,7 +261,7 @@ FROM (
AND AND
stamp_inserted >= %(begin)s stamp_inserted >= %(begin)s
AND AND
stamp_updated <= %(end)s stamp_inserted <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -306,7 +302,7 @@ FROM (
AND AND
stamp_inserted >= %(begin)s stamp_inserted >= %(begin)s
AND AND
stamp_updated <= %(end)s stamp_inserted <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,

8
surveillance/deconnexion.py
View file

@ -108,9 +108,9 @@ FROM (
FROM FROM
upload upload
WHERE WHERE
stamp_updated > now() - interval '1 day' stamp_inserted > now() - interval '1 day'
AND stamp_updated < now() AND stamp_inserted < now()
AND NOT (ip_dst <<= inet%(plage_ens)s OR ip_dst <<= inet%(plage_ipv6)s OR ip_dst <<= inet%(appt)s OR ip_src <<= inet%(ipv6_local)s OR ip_src='0.0.0.0') AND NOT (ip_dst <<= inet%(plage_ens)s OR ip_dst <<= inet%(plage_ipv6)s OR ip_dst <<= inet%(appt)s OR ip_src <<= inet%(ipv6_local)s OR ip_src=inet'0.0.0.0' OR ip_src <<= inet%(plage_adm)s OR ip_dst <<= inet%(plage_adm)s)
AND (ip_src <<= inet%(allone)s OR ip_src <<= inet%(alltwo)s OR ip_src <<= inet%(plage_ipv6)s OR ip_src <<= inet%(appt)s) AND (ip_src <<= inet%(allone)s OR ip_src <<= inet%(alltwo)s OR ip_src <<= inet%(plage_ipv6)s OR ip_src <<= inet%(appt)s)
AND NOT EXISTS AND NOT EXISTS
( (
@ -138,7 +138,7 @@ GROUP BY
ORDER BY ORDER BY
tot_upload; tot_upload;
""" """
curseur.execute(requete, {'plage_ens':plage_ens, 'allone':NETs['all'][0], 'alltwo':NETs['all'][1], 'plage_ipv6':prefix['subnet'][0], 'appt':NETs['personnel-ens'][0], 'ipv6_local':'fe80::/8'}) curseur.execute(requete, {'plage_ens':plage_ens, 'allone':NETs['all'][0], 'alltwo':NETs['all'][1], 'plage_ipv6':prefix['subnet'][0], 'appt':NETs['personnel-ens'][0], 'ipv6_local':'fe80::/8', 'plage_adm':NETs['adm'][0]})
uploadeurs = curseur.fetchall() uploadeurs = curseur.fetchall()