Skip to content
Snippets Groups Projects
Commit 36a259bb authored by julian's avatar julian
Browse files

made some changes to accomodate theia dataset

parent 933dcacb
No related branches found
No related tags found
No related merge requests found
...@@ -8,9 +8,6 @@ BATCH_SIZE=10000 ...@@ -8,9 +8,6 @@ BATCH_SIZE=10000
EDGE_INSERTS=EDGE_INSERTS EDGE_INSERTS=EDGE_INSERTS
UUID_EDGES= UUID_EDGES=
# query
QUERY_INTERVAL=1
# pgadmin # pgadmin
PGADMIN_CONFIG_SERVER_MODE=False PGADMIN_CONFIG_SERVER_MODE=False
PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
......
...@@ -11,8 +11,8 @@ services: ...@@ -11,8 +11,8 @@ services:
- PGPASSFILE=/run/secrets/pgpass - PGPASSFILE=/run/secrets/pgpass
profiles: profiles:
- experiment - experiment
configs: volumes:
- data.zip - ./data/cadets.zip:/data.zip:ro
secrets: secrets:
- pgpass - pgpass
depends_on: depends_on:
...@@ -27,7 +27,6 @@ services: ...@@ -27,7 +27,6 @@ services:
- PGDATABASE - PGDATABASE
- PGUSER - PGUSER
- PGPASSFILE=/run/secrets/pgpass - PGPASSFILE=/run/secrets/pgpass
- QUERY_INTERVAL
profiles: profiles:
- experiment - experiment
secrets: secrets:
...@@ -50,11 +49,11 @@ services: ...@@ -50,11 +49,11 @@ services:
start_period: 5s start_period: 5s
start_interval: 1s start_interval: 1s
volumes: volumes:
- ./data/theia_part1.zip:/data.zip:ro
- ./postgres/initdb/initdb.py:/docker-entrypoint-initdb.d/initdb.py:ro - ./postgres/initdb/initdb.py:/docker-entrypoint-initdb.d/initdb.py:ro
- ./postgres/initdb/00-initdb.sql:/docker-entrypoint-initdb.d/00-initdb.sql:ro - ./postgres/initdb/00-initdb.sql:/docker-entrypoint-initdb.d/00-initdb.sql:ro
configs: configs:
- postgres_conf - postgres_conf
- data.zip
secrets: secrets:
- postgres_db_pass - postgres_db_pass
...@@ -77,12 +76,8 @@ services: ...@@ -77,12 +76,8 @@ services:
configs: configs:
postgres_conf: postgres_conf:
file: ./postgresql.conf file: ./postgresql.conf
mosquitto_conf:
file: ./mosquitto.conf
pgadmin_server_conf: pgadmin_server_conf:
file: ./servers.json file: ./servers.json
data.zip:
file: ./data/ta1-cadets-e3-official.zip
secrets: secrets:
pgpass: pgpass:
......
services:
postgres:
volumes:
- ./postgres/initdb/03-initdb_fill_edge_id.sql:/docker-entrypoint-initdb.d/03-initdb.sql:ro
...@@ -2,5 +2,5 @@ FROM python:3 ...@@ -2,5 +2,5 @@ FROM python:3
WORKDIR /app WORKDIR /app
RUN pip install "psycopg[binary,pool]" RUN pip install "psycopg[binary,pool]"
COPY pg_insert.py ./ COPY pg_insert.py ./
# ENV PGHOST= PGDATABASE= PGUSER= PGPASSWORD= BATCH_SIZE= EDGE_INSERTS= UUID_EDGES= # ENV PGHOST= PGDATABASE= PGUSER= PGPASSFILE= BATCH_SIZE= EDGE_INSERTS= UUID_EDGES=
CMD ["python", "-u", "pg_insert.py"] CMD ["python", "-u", "pg_insert.py"]
...@@ -27,6 +27,7 @@ NODE_TYPES: Final[dict] = { ...@@ -27,6 +27,7 @@ NODE_TYPES: Final[dict] = {
), ),
"NetFlowObject": (), "NetFlowObject": (),
"SrcSinkObject": (), "SrcSinkObject": (),
"MemoryObject": (),
"Principal": (), "Principal": (),
"Host": (), "Host": (),
} }
......
services:
postgres:
volumes:
- ./postgres/initdb/01-initdb_load_data.sql:/docker-entrypoint-initdb.d/01-initdb.sql:ro
CREATE TYPE VERTEX_TYPE AS ENUM ('Event', 'FileObject', 'Principal', 'Subject', 'Host', 'NetFlowObject', 'SrcSinkObject', 'UnnamedPipeObject'); CREATE TYPE VERTEX_TYPE AS ENUM ('Event', 'FileObject', 'Principal', 'Subject', 'Host', 'NetFlowObject', 'SrcSinkObject', 'UnnamedPipeObject', 'MemoryObject');
CREATE TABLE vertex( CREATE TABLE vertex(
id INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY, id INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
type VERTEX_TYPE NOT NULL, type VERTEX_TYPE NOT NULL,
......
...@@ -2,5 +2,5 @@ FROM python:3 ...@@ -2,5 +2,5 @@ FROM python:3
WORKDIR /app WORKDIR /app
RUN pip install "psycopg[binary,pool]" schedule RUN pip install "psycopg[binary,pool]" schedule
COPY cdm_sql_queries.py queries.sql ./ COPY cdm_sql_queries.py queries.sql ./
# ENV PGHOST= PGDATABASE= PGUSER= PGPASSWORD= QUERY_INTERVAL= # ENV PGHOST= PGDATABASE= PGUSER= PGPASSFILE=
CMD ["python", "-u", "cdm_sql_queries.py"] CMD ["python", "-u", "cdm_sql_queries.py"]
\ No newline at end of file
from datetime import datetime from datetime import datetime
from signal import SIGINT, SIGTERM, signal from signal import SIGINT, SIGTERM, signal
from typing import Sequence, Tuple, Any, Deque from typing import Tuple, Any, Deque
from time import strftime, perf_counter, sleep from time import perf_counter, sleep
from os import environ, path, makedirs from os import path, makedirs
from logging import info, basicConfig, INFO from logging import info, basicConfig, INFO
from psycopg import connect from psycopg import connect
from datetime import timedelta from datetime import timedelta
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment