diff --git a/.gitignore b/.gitignore index 965f66f..f345aae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /files/ /output_files/ /parsedmarc/GeoLite2-Country* +/elastic_data/ +parsedmarc.ini diff --git a/docker-compose.yml b/docker-compose.yml index 5b20b30..d20d556 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,15 +5,17 @@ services: volumes: - ./files:/input:ro - ./output_files:/output - command: parsedmarc -c /parsedmarc.ini /input/* + command: parsedmarc -c /parsedmarc.ini /input/* --debug depends_on: - elasticsearch restart: on-failure elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.9.1 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5 environment: - discovery.type=single-node + volumes: + - ./elastic_data:/usr/share/elasticsearch/data grafana: build: ./grafana/ diff --git a/grafana/grafana-provisioning/datasources/all.yml b/grafana/grafana-provisioning/datasources/all.yml index e405b3f..ae59743 100644 --- a/grafana/grafana-provisioning/datasources/all.yml +++ b/grafana/grafana-provisioning/datasources/all.yml @@ -9,7 +9,7 @@ datasources: database: '[dmarc_aggregate-]YYYY-MM-DD' isDefault: true jsonData: - esVersion: 70 + esVersion: 7.17.5 timeField: 'date_range' interval: 'Daily' version: 1 @@ -22,7 +22,7 @@ datasources: database: '[dmarc_forensic-]YYYY-MM-DD' isDefault: false jsonData: - esVersion: 70 + esVersion: 7.17.5 timeField: 'arrival_date' interval: 'Daily' version: 1 diff --git a/parsedmarc/Dockerfile b/parsedmarc/Dockerfile index 83f5ef6..c2ea0cd 100644 --- a/parsedmarc/Dockerfile +++ b/parsedmarc/Dockerfile @@ -1,4 +1,4 @@ -FROM python:alpine +FROM python:3.9-alpine3.16 RUN apk add --update --no-cache libxml2-dev libxslt-dev RUN apk add --update --no-cache --virtual .build_deps build-base libffi-dev \ diff --git a/parsedmarc/parsedmarc.ini b/parsedmarc/parsedmarc.sample.ini similarity index 100% rename from parsedmarc/parsedmarc.ini rename to parsedmarc/parsedmarc.sample.ini