Skip to content
Snippets Groups Projects
Commit 947e23d6 authored by Václav Bartoš's avatar Václav Bartoš Committed by Pavel Kácha
Browse files

Fixed bugs in kippo connector

- It didn't work with newer MySQL versions
- Fixed timezone conversions
parent 77c11ae8
No related branches found
No related tags found
No related merge requests found
...@@ -93,13 +93,13 @@ def main(): ...@@ -93,13 +93,13 @@ def main():
crs = con.cursor() crs = con.cursor()
events = [] events = []
query = "SELECT UNIX_TIMESTAMP(CONVERT_TZ(s.starttime, '+00:00', @@global.time_zone)) as starttime, s.ip, COUNT(s.id) as attack_scale, sn.ip as sensor \ query = "SELECT MIN(UNIX_TIMESTAMP(s.starttime)) as starttime, s.ip, COUNT(s.id) as attack_scale, sn.ip as sensor \
FROM sessions s \ FROM sessions s \
LEFT JOIN sensors sn ON s.sensor=sn.id \ LEFT JOIN sensors sn ON s.sensor=sn.id \
WHERE s.starttime > DATE_SUB(UTC_TIMESTAMP(), INTERVAL + %s SECOND) \ WHERE s.starttime > DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL + %s SECOND) \
GROUP BY s.ip ORDER BY s.starttime ASC;" GROUP BY s.ip, sn.ip ORDER BY starttime ASC;"
crs.execute(query, awin) crs.execute(query, (awin,))
rows = crs.fetchall() rows = crs.fetchall()
for row in rows: for row in rows:
dtime = format_timestamp(row['starttime']) dtime = format_timestamp(row['starttime'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment