Receive bot instructions from Grafolean; rearrange DB; support Netflow v5; disable autoheal by default

Author: grafolean

.env.example

@@ -1,4 +1,5 @@
 BACKEND_URL=https://grafolean.com/api
 BOT_TOKEN=
+DB_DIR=
 JOBS_REFRESH_INTERVAL=60
 NETFLOW_PORT=2055

Pipfile.lock

@@ -137,8 +137,7 @@ def migration_step_2():
     with db.cursor() as c:
         # UNLOGGED: Disabling WAL avoids high I/O load. Since NetFlow data is of temporary nature, this still
         # allows us to perform queries, but if the database crashes it is acceptable to lose all of the records.
-        c.execute(f'CREATE UNLOGGED TABLE {DB_PREFIX}records (seq BIGSERIAL NOT NULL PRIMARY KEY, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, client_ip TEXT);')
-        c.execute(f'CREATE INDEX {DB_PREFIX}records_ts ON {DB_PREFIX}records (ts);')
+        c.execute(f'CREATE UNLOGGED TABLE {DB_PREFIX}records (seq BIGSERIAL NOT NULL PRIMARY KEY, ts NUMERIC(16,6) NOT NULL, client_ip TEXT);')
 
         c.execute(f"""
             CREATE UNLOGGED TABLE {DB_PREFIX}flows (
@@ -155,6 +154,5 @@ def migration_step_2():
             );
         """)
 
-def migration_step_3():
-    with db.cursor() as c:
-        c.execute(f'CREATE TABLE {DB_PREFIX}bot_jobs (job_id TEXT NOT NULL, last_used_seq BIGSERIAL DEFAULT NULL);')
+        c.execute(f'CREATE TABLE {DB_PREFIX}bot_jobs (job_id TEXT NOT NULL PRIMARY KEY, last_used_seq BIGSERIAL);')
+

dbutils.py

@@ -121,17 +121,17 @@ services:
       - grafolean
 
 
-  autoheal:
-    # This container automatically restarts any container that fails its health check. Not a bullet-proof solution, but better than nothing.
-    image: willfarrell/autoheal
-    container_name: grafolean-netflow-bot-autoheal
-    environment:
-      - AUTOHEAL_CONTAINER_LABEL=all
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart: always
-    networks:
-      - grafolean
+#  autoheal:
+#    # This container automatically restarts any container that fails its health check. Not a bullet-proof solution, but better than nothing.
+#    image: willfarrell/autoheal
+#    container_name: grafolean-netflow-bot-autoheal
+#    environment:
+#      - AUTOHEAL_CONTAINER_LABEL=all
+#    volumes:
+#      - /var/run/docker.sock:/var/run/docker.sock
+#    restart: always
+#    networks:
+#      - grafolean
 
 
 networks: