Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade python, update grafana and elasticsearch to fix the pie charts #45

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Downgrade python, update grafana and elasticsearch to fix the pie charts #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6c13c1
Downgrade python to 3.11
Oct 11, 2023
3ded1ed
bump grafana and elasticsearch
Oct 11, 2023
3f4fd85
Merge branch 'master' into master
Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ services:
restart: on-failure

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5
image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- xpack.security.enrollment.enabled=false
- xpack.security.http.ssl.enabled=false
- xpack.security.transport.ssl.enabled=false
- xpack.security.transport.ssl.verification_mode=certificate
volumes:
- ./elastic_data:/usr/share/elasticsearch/data

Expand Down
4 changes: 3 additions & 1 deletion grafana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
FROM grafana/grafana:8.5.4
FROM grafana/grafana:latest

ADD --chown=grafana:root https://raw.githubusercontent.com/domainaware/parsedmarc/master/grafana/Grafana-DMARC_Reports.json /var/lib/grafana/dashboards/
RUN chmod 644 /etc/grafana/provisioning

COPY grafana-provisioning/ /etc/grafana/provisioning/

RUN sed -i 's/fixed_interval/interval/g' /var/lib/grafana/dashboards/Grafana-DMARC_Reports.json
4 changes: 2 additions & 2 deletions grafana/grafana-provisioning/datasources/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ datasources:
database: '[dmarc_aggregate-]YYYY-MM-DD'
isDefault: true
jsonData:
esVersion: 7.17.5
esVersion: 80
timeField: 'date_range'
interval: 'Daily'
version: 1
Expand All @@ -22,7 +22,7 @@ datasources:
database: '[dmarc_forensic-]YYYY-MM-DD'
isDefault: false
jsonData:
esVersion: 7.17.5
esVersion: 80
timeField: 'arrival_date'
interval: 'Daily'
version: 1
Expand Down
2 changes: 1 addition & 1 deletion parsedmarc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-alpine3.16
FROM python:3.11-alpine

RUN apk add --update --no-cache libxml2-dev libxslt-dev
RUN apk add --update --no-cache --virtual .build_deps build-base libffi-dev \
Expand Down