From a50057f7114d077114629a19f200d10ea61d8276 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Mon, 27 Sep 2021 20:05:47 +0200
Subject: [PATCH 1/2] Update monitoring

---
 monitoring/docker-compose.yaml    | 4 +++-
 monitoring/telegraf/telegraf.conf | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index 2bdb920..910ea98 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3.3"
 services:
 
   grafana:
-    image: grafana/grafana:7.4.3
+    image: grafana/grafana:8.1.3
     restart: unless-stopped
     expose:
       - "3000"
@@ -93,6 +93,8 @@ services:
       - "docker.group=monitoring"
     depends_on:
       - influxdb
+    dns: 
+      - 9.9.9.9
 
 networks:
   monitoring:
diff --git a/monitoring/telegraf/telegraf.conf b/monitoring/telegraf/telegraf.conf
index 4e8ab25..297df15 100644
--- a/monitoring/telegraf/telegraf.conf
+++ b/monitoring/telegraf/telegraf.conf
@@ -251,7 +251,7 @@
     "https://wallabag.florianzirker.de/login",
     "https://gitea.florianzirker.de/api/v1/version/",
     "https://meet.florianzirker.de/",
-    "https://www.feuerwehr-kapsweyer.de",
+    #"https://www.feuerwehr-kapsweyer.de",
     "https://ping.feuerwehr-kapsweyer.de",
     "http://ping.feuerwehr-kapsweyer.de",
     "http://portainer.lan",

From 7c946ebbfcb95bb9d2dcce222296662e6beb0459 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Mon, 27 Sep 2021 20:07:20 +0200
Subject: [PATCH 2/2] Resolve confict with ports (pi-hole and deconz)

---
 proxy/extraProviders/pihole.yaml | 2 +-
 smartHome/docker-compose.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/extraProviders/pihole.yaml b/proxy/extraProviders/pihole.yaml
index 1528ca0..77ed268 100644
--- a/proxy/extraProviders/pihole.yaml
+++ b/proxy/extraProviders/pihole.yaml
@@ -7,4 +7,4 @@ http:
     pihole:
       loadbalancer: 
         servers:
-          - url: "http://192.168.16.5:8080/admin/"
+          - url: "http://192.168.16.5:8081/admin/"
diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml
index d34a9c7..e0f5fe9 100644
--- a/smartHome/docker-compose.yaml
+++ b/smartHome/docker-compose.yaml
@@ -3,7 +3,7 @@ version: "3.3"
 services:
 
   homeassistant:
-    image: homeassistant/odroid-xu-homeassistant:stable
+    image: ghcr.io/home-assistant/home-assistant:stable
     volumes:
       - ${VOLUMES_PATH}/homeassistent:/config
     environment: