Skip to content

Commit eb3ecb6

Browse files
author
Till Wiblishauser
committed
fixes from surfen
debricked#45
1 parent e4421fc commit eb3ecb6

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

grafana/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
FROM grafana/grafana:8.5.4
1+
FROM grafana/grafana:latest
22

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

66
COPY grafana-provisioning/ /etc/grafana/provisioning/
7+
8+
RUN sed -i 's/fixed_interval/interval/g' /var/lib/grafana/dashboards/Grafana-DMARC_Reports.json

grafana/grafana-provisioning/datasources/all.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ datasources:
99
database: '[dmarc_aggregate-]YYYY-MM-DD'
1010
isDefault: true
1111
jsonData:
12-
esVersion: 7.17.5
12+
esVersion: 80
1313
timeField: 'date_range'
1414
interval: 'Daily'
1515
version: 1
@@ -22,8 +22,8 @@ datasources:
2222
database: '[dmarc_forensic-]YYYY-MM-DD'
2323
isDefault: false
2424
jsonData:
25-
esVersion: 7.17.5
25+
esVersion: 80
2626
timeField: 'arrival_date'
2727
interval: 'Daily'
2828
version: 1
29-
editable: false
29+
editable: false

parsedmarc/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM python:3.9-alpine3.16
1+
FROM python:3.11-alpine
22

33
RUN apk add --update --no-cache libxml2-dev libxslt-dev
44
RUN apk add --update --no-cache --virtual .build_deps build-base libffi-dev \
55
&& pip install parsedmarc \
66
&& apk del .build_deps
77

88
COPY parsedmarc.ini /
9-
#COPY GeoLite2-Country.mmdb /usr/share/GeoIP/GeoLite2-Country.mmdb
9+
#COPY GeoLite2-Country.mmdb /usr/share/GeoIP/GeoLite2-Country.mmdb

0 commit comments

Comments
 (0)