From d6c13c1680d6921eefc6e19c460d1c660bc9eed1 Mon Sep 17 00:00:00 2001
From: surfen <surfen@wp.pl>
Date: Thu, 12 Oct 2023 00:46:21 +0200
Subject: [PATCH 1/2] Downgrade python to 3.11

Python 3.12 produces ERROR: Could not build wheels for aiohttp
---
 parsedmarc/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parsedmarc/Dockerfile b/parsedmarc/Dockerfile
index 83f5ef6..0190e5b 100644
--- a/parsedmarc/Dockerfile
+++ b/parsedmarc/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:alpine
+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 \

From 3ded1ed59b61403220cd65812c419d3cc0b1b5e8 Mon Sep 17 00:00:00 2001
From: surfen <surfen@wp.pl>
Date: Thu, 12 Oct 2023 01:14:10 +0200
Subject: [PATCH 2/2] bump grafana and elasticsearch

 - use latest grafana (10.1.4 currently) and elasticsearch 8.10.2
 - add workaround related to date_histogram interval for the deprecated piechart-panel
---
 docker-compose.yml                               | 7 ++++++-
 grafana/Dockerfile                               | 4 +++-
 grafana/grafana-provisioning/datasources/all.yml | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5b20b30..18eb68e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,14 @@ services:
     restart: on-failure
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.9.1
+    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
 
   grafana:
     build: ./grafana/
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 6d7d2fd..ac91e1f 100644
--- a/grafana/Dockerfile
+++ b/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
diff --git a/grafana/grafana-provisioning/datasources/all.yml b/grafana/grafana-provisioning/datasources/all.yml
index e405b3f..14a5eef 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: 80
     timeField: 'date_range'
     interval: 'Daily'
   version: 1
@@ -22,7 +22,7 @@ datasources:
   database: '[dmarc_forensic-]YYYY-MM-DD'
   isDefault: false
   jsonData:
-    esVersion: 70
+    esVersion: 80
     timeField: 'arrival_date'
     interval: 'Daily'
   version: 1