fixes from surfen

debricked#45

Author: Till Wiblishauser

grafana/Dockerfile

@@ -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

grafana/grafana-provisioning/datasources/all.yml

@@ -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
@@ -22,8 +22,8 @@ datasources:
   database: '[dmarc_forensic-]YYYY-MM-DD'
   isDefault: false
   jsonData:
-    esVersion: 7.17.5
+    esVersion: 80
     timeField: 'arrival_date'
     interval: 'Daily'
   version: 1
-  editable: false
+  editable: false

parsedmarc/Dockerfile

@@ -1,9 +1,9 @@
-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 \
     && pip install parsedmarc \
     && apk del .build_deps
 
 COPY parsedmarc.ini /
-#COPY GeoLite2-Country.mmdb /usr/share/GeoIP/GeoLite2-Country.mmdb
+#COPY GeoLite2-Country.mmdb /usr/share/GeoIP/GeoLite2-Country.mmdb