diff --git a/surveillance/analyse2.py b/surveillance/analyse2.py index ae0113ab..defb75de 100755 --- a/surveillance/analyse2.py +++ b/surveillance/analyse2.py @@ -80,9 +80,9 @@ FROM ( AND NOT ip_dst <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans, @@ -119,9 +119,9 @@ FROM ( AND NOT ip_src <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans, @@ -188,9 +188,9 @@ FROM ( AND NOT ip_dst <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans, @@ -229,9 +229,9 @@ FROM ( AND NOT ip_src <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans, @@ -284,9 +284,9 @@ FROM ( ON machines_sans_doublon.mac_addr = upload.mac_src WHERE - machines_sans_doublon.type=%(pg_filter)s + machines_sans_doublon.type = %(pg_filter)s AND - machines_sans_doublon.id=%(pg_value)s + machines_sans_doublon.id = %(pg_value)s AND NOT ip_src <<= inet%(ipv6_local)s AND NOT @@ -300,9 +300,9 @@ FROM ( AND NOT ip_dst <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans, @@ -343,9 +343,9 @@ FROM ( AND NOT ip_src <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans, diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index da2773f1..b69b120c 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -97,8 +97,8 @@ FROM ( FROM upload WHERE - stamp_inserted > now() - interval '1 day' - AND stamp_inserted < now() + stamp_updated > now() - interval '1 day' + 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 (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 diff --git a/surveillance/maintenance/delete.sql b/surveillance/maintenance/delete.sql index 379a9e2a..1b50401c 100644 --- a/surveillance/maintenance/delete.sql +++ b/surveillance/maintenance/delete.sql @@ -3,4 +3,4 @@ ----------------------------------------------------------------- -- 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'; diff --git a/surveillance/statistiques2.py b/surveillance/statistiques2.py index e5df91f3..a902671d 100755 --- a/surveillance/statistiques2.py +++ b/surveillance/statistiques2.py @@ -90,9 +90,9 @@ FROM ( AND NOT ip_dst <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans @@ -125,9 +125,9 @@ FROM ( AND NOT ip_src <<= inet%(plage_ipv6)s AND - stamp_inserted >= %(begin)s + stamp_updated >= %(begin)s AND - stamp_inserted <= %(end)s + stamp_updated <= %(end)s GROUP BY mac, ip_crans