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

stamp_updated et non stamp_inserted

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-03-30 00:38:46 +02:00
parent 64bb5252ea
commit 6093c61b42
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
surveillance/analyse2.py
View file

@ -80,9 +80,9 @@ FROM (
AND NOT AND NOT
ip_dst <<= inet%(plage_ipv6)s ip_dst <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -119,9 +119,9 @@ FROM (
AND NOT AND NOT
ip_src <<= inet%(plage_ipv6)s ip_src <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -188,9 +188,9 @@ FROM (
AND NOT AND NOT
ip_dst <<= inet%(plage_ipv6)s ip_dst <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -229,9 +229,9 @@ FROM (
AND NOT AND NOT
ip_src <<= inet%(plage_ipv6)s ip_src <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -284,9 +284,9 @@ FROM (
ON ON
machines_sans_doublon.mac_addr = upload.mac_src machines_sans_doublon.mac_addr = upload.mac_src
WHERE WHERE
machines_sans_doublon.type=%(pg_filter)s machines_sans_doublon.type = %(pg_filter)s
AND AND
machines_sans_doublon.id=%(pg_value)s machines_sans_doublon.id = %(pg_value)s
AND NOT AND NOT
ip_src <<= inet%(ipv6_local)s ip_src <<= inet%(ipv6_local)s
AND NOT AND NOT
@ -300,9 +300,9 @@ FROM (
AND NOT AND NOT
ip_dst <<= inet%(plage_ipv6)s ip_dst <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,
@ -343,9 +343,9 @@ FROM (
AND NOT AND NOT
ip_src <<= inet%(plage_ipv6)s ip_src <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans, ip_crans,

4
surveillance/deconnexion.py
View file

@ -97,8 +97,8 @@ FROM (
FROM FROM
upload upload
WHERE WHERE
stamp_inserted > now() - interval '1 day' stamp_updated > now() - interval '1 day'
AND stamp_inserted < now() AND stamp_updated < 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=inet'0.0.0.0' OR ip_src <<= inet%(plage_adm)s OR ip_dst <<= inet%(plage_adm)s) 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

2
surveillance/maintenance/delete.sql
View file

@ -3,4 +3,4 @@
----------------------------------------------------------------- -----------------------------------------------------------------
-- effacement des vieux enregistrements -- effacement des vieux enregistrements
DELETE FROM upload where stamp_inserted < timestamp 'now' - interval '5 days'; DELETE FROM upload where stamp_updated < timestamp 'now' - interval '5 days';

8
surveillance/statistiques2.py
View file

@ -90,9 +90,9 @@ FROM (
AND NOT AND NOT
ip_dst <<= inet%(plage_ipv6)s ip_dst <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans ip_crans
@ -125,9 +125,9 @@ FROM (
AND NOT AND NOT
ip_src <<= inet%(plage_ipv6)s ip_src <<= inet%(plage_ipv6)s
AND AND
stamp_inserted >= %(begin)s stamp_updated >= %(begin)s
AND AND
stamp_inserted <= %(end)s stamp_updated <= %(end)s
GROUP BY GROUP BY
mac, mac,
ip_crans ip_crans